Commit Graph

6763 Commits

Author SHA1 Message Date
Artem Tarasov
c584f75c4e fixed node selection when switching between TreeSettings and TreeFolders 2020-08-25 15:23:43 +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
Artem Tarasov
4cbfa4c6ae fixed routing SettingsTree 2020-08-24 10:33:16 +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
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
Artem Tarasov
503acfeea1 fixed translate SettingsTree 2020-08-21 13:38:55 +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
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
15ba6828c5 Merge branch 'master' into feature/files
# Conflicts:
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
2020-08-20 12:43:12 +03:00
f2a50f60e2 Settings: fix 2020-08-20 12:41:03 +03:00
6ce83a9d3f Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-08-20 12:17:46 +03:00
d5942241e8 Web: Clients: Parallelized initial API queries 2020-08-20 12:17:36 +03:00
Artem Tarasov
4eace9bae1 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-08-20 11:27:47 +03:00
Artem Tarasov
f2c39cd592 added common settings, translation 2020-08-20 11:27:00 +03:00
96ec887ffa Web: Files: fixed sharing panel styles 2020-08-20 11:19:54 +03:00
05bc905831 Web: Clients: Fixed regex to transltaion.json files for serviceWorker 2020-08-19 21:18:23 +03:00
27f52a2dc2 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-08-19 20:00:57 +03:00
8d11e1b0c8 Web: Clients: Changed interaction with serviceWorker 2020-08-19 20:00:41 +03:00
Artem Tarasov
d7133d88d2 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-08-19 18:17:02 +03:00
Artem Tarasov
cdbeea4741 added translation, admin settings 2020-08-19 18:16:31 +03:00
b7b7cfeeb7 web: components: bump version 2020-08-19 17:45:26 +03:00
0f1ecd1ae2 Web: Components: update ContextMenuButton styles 2020-08-19 17:45:06 +03:00
Artem Tarasov
6130af291e Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-08-19 16:14:59 +03:00
Artem Tarasov
4754a84483 fixed routing 2020-08-19 16:14:21 +03:00
Ilya Oleshko
c34ecd5ecb web: components: bump version 2020-08-19 15:38:52 +03:00
Ilya Oleshko
53da5042f8 Web: Components: GroupButtonsMenu : Added orientationchange event listener 2020-08-19 15:38:46 +03:00