Commit Graph

6942 Commits

Author SHA1 Message Date
9f3413841e web: common: bump version 2020-08-25 14:09:32 +03:00
366821d868 Web: Common: fixed filter 2020-08-25 14:03:49 +03:00
Ilya Oleshko
1975943d9b Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-08-25 13:07:46 +03:00
Ilya Oleshko
46425cd159 web: common: bump version 2020-08-25 13:07:38 +03:00
Ilya Oleshko
a003d65f66 Web: People: FilterBlock : Fixed showItem condition for simple selector 2020-08-25 13:07:22 +03:00
8e88dd8239 Web: Files: fixed onLoading prop 2020-08-25 11:01:45 +03:00
maksim
1e97a26847 MigrationService: changing subscription 2020-08-25 10:48:18 +03:00
Artem Tarasov
5a494b3c2c refactoring. moved the onLoading function to redux 2020-08-24 17:25:41 +03:00
Artem Tarasov
35c1b08547 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-08-24 12:50:52 +03:00
Artem Tarasov
c385fd3b34 fixed selected node SettingsTree 2020-08-24 12:50:27 +03:00
ded117d37a web: components: bump version 2020-08-24 11:21:57 +03:00
ccf177bf7b Web: Files: fixed tree badge styles 2020-08-24 11:21:28 +03:00
232da628f8 Web: Components: fixed tree styles, fixed main button styles 2020-08-24 11:20:40 +03:00
maksim
6cfd945b3e ASC.Data.Storage.Migration: fix 2020-08-24 11:04:43 +03:00
maksim
a4744ec173 Merge branch 'feature/data-storage-migration' of https://github.com/ONLYOFFICE/AppServer into feature/data-storage-migration 2020-08-24 10:46:52 +03:00
maksim
eb58c24d2e LaunchSettings: fix 2020-08-24 10:45:51 +03:00
Artem Tarasov
4cbfa4c6ae fixed routing SettingsTree 2020-08-24 10:33:16 +03:00
maksim
eecf23f214 ASC.Data.Storage.Migration: bugfix 2020-08-24 09:52:17 +03:00
6b2168e153 Merge branch 'master' into feature/data-storage-migration 2020-08-23 16:32:21 +03:00
fd64100fa7
Merge pull request #68 from ONLYOFFICE/feature/socket.io
Feature/socket.io
2020-08-21 17:49:34 +03:00
e9b0775605 web: common: bump version 2020-08-21 17:38:38 +03:00
42927df84d Web: Common: fixed selector selected group 2020-08-21 17:38:11 +03:00
3d09efd307 fix 2020-08-21 17:33:58 +03:00
10376475e9 Sln: removed *_ubuntu 2020-08-21 17:15:13 +03:00
b372705c3f web: components: bump version 2020-08-21 16:20:15 +03:00
f29fad894f web: common: bump version 2020-08-21 16:20:01 +03:00
fd587b7f6b Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-08-21 16:19:52 +03:00
7982449828 Web: Components: fixed the display of the context-menu-button 2020-08-21 16:19:09 +03:00
76d48fabdd Web: Common: fixed the display and closing of the filter 2020-08-21 16:18:17 +03:00
b06a4b4991 Merge branch 'master' into feature/socket.io
# Conflicts:
#	ASC.Web.sln
#	thirdparty.sln
#	thirdparty/AppLimit.CloudComputing.SharpBox/AppLimit.CloudComputing.SharpBox.csproj
2020-08-21 15:25:07 +03:00
Artem Tarasov
503acfeea1 fixed translate SettingsTree 2020-08-21 13:38:55 +03:00
maksim
280604e41d ASC.Data.Storage.Migration: adding protocol buffers and event listening 2020-08-21 11:05:27 +03:00
cff1a01f70 Docker: fix build 2020-08-20 19:04:13 +03:00
Artem Tarasov
d01dfb0aae Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-08-20 18:43:20 +03:00
af9166d5ec Merge branch 'master' into feature/files 2020-08-20 18:20:42 +03:00
51ed3a8089 ASC.Resource.Manager.sln 2020-08-20 18:16:41 +03:00
fd5a9a74f0 Merge branch 'master' into feature/files 2020-08-20 17:51:14 +03:00
4501d3229a Nuget: replaced thirdparty 2020-08-20 17:50:08 +03:00
c480404b22 web: components: bump version 2020-08-20 17:42:09 +03:00
28b6f56aee web: common: bump version 2020-08-20 17:41:50 +03:00
603a8bbbc5 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-08-20 17:40:52 +03:00
2c17848368 Web: Components: fixed context menu displayType state 2020-08-20 17:40:35 +03:00
d58cdc3cc5 Web: Common: fixed selector styles 2020-08-20 17:39:57 +03:00
2fc42a79e5 Web: Files: fixed sharing panels styles 2020-08-20 17:39:23 +03:00
maksim
326d352a7c Migration: registering dependencies in program 2020-08-20 16:53:39 +03:00
Artem Tarasov
141e4ffaec fix style 2020-08-20 16:09:46 +03:00
49f77646a5 web: common: bump version 2020-08-20 12:46:31 +03:00
9620f56594 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-08-20 12:46:06 +03:00
14abe9c3f4 Web: Common: fixed profile menu 2020-08-20 12:45:59 +03:00
22a2cd3e4b Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-08-20 12:43:27 +03:00