Commit Graph

850 Commits

Author SHA1 Message Date
Artem Tarasov
3778ca9aea refactoring 2020-09-01 18:32:15 +03:00
Artem Tarasov
c876730130 added APIs methods 2020-09-01 11:44:43 +03:00
Artem Tarasov
ba42cdcb71 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-01 10:16:53 +03:00
Artem Tarasov
461cb53b4e added getFilesSettings 2020-09-01 01:05:28 +03:00
29d9f21d05 Merge branch 'master' into feature/files
# Conflicts:
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	web/ASC.Web.Core/Files/DocumentService.cs
2020-08-31 17:45:57 +03:00
5f7265931c Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-08-31 17:45:52 +03:00
062a3a793f Update yarn.lock files 2020-08-31 17:45:37 +03:00
9ee046bb1e Web: Files: fixed empty-screen-container to new article 2020-08-31 16:32:44 +03:00
f5348c3ccd Files: settings. Added settings, forcesave, thirdparty 2020-08-31 15:41:28 +03:00
d9f70df70a Update yarn.lock files 2020-08-31 12:42:36 +03:00
1c5402db37 Web: Files: Added Webpack-bundle-analyzer 2020-08-31 12:07:58 +03:00
1fb90663ee Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-08-31 10:04:45 +03:00
1f32e91d54 Web: Files: added widthProp to row 2020-08-31 10:03:48 +03:00
3da549264e Merge branch 'master' into feature/data-storage-migration 2020-08-28 18:46:20 +03:00
Artem Tarasov
0e32424313 refactoring 2020-08-28 17:42:01 +03:00
Artem Tarasov
4b9631597b Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-08-28 12:15:53 +03:00
Ilya Oleshko
ab16aa979d Web: Files: Home : Fixed auto scroll to body on mobile or tablet devices 2020-08-28 12:14:35 +03:00
Artem Tarasov
b859f35e5e implemented access to admin settings by checking the value of the isAdmin property in state.auth.user.isAdmin. Added api methods 2020-08-28 12:13:53 +03:00
17c4cf02fc Merge branch 'master' into feature/files 2020-08-27 18:06:05 +03:00
be5abb8cd3 Files: added settings methods 2020-08-27 18:05:21 +03:00
Artem Tarasov
551d171ac1 added error403 to Settings, when thirdParty is disabled 2020-08-27 18:00:20 +03:00
maksim
8282f3f658 fix 2020-08-27 17:01:37 +03:00
Artem Tarasov
69a54a0717 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-08-27 10:39:54 +03:00
Artem Tarasov
84d4446b23 added api methods for settings, refactoring 2020-08-27 10:38:46 +03:00
e1dbf344c7 Web: Files: fixed logout to files module 2020-08-26 16:26:38 +03:00
7fa6111cc3 Web: Files: fixed DragAndDrop 2020-08-26 15:21:22 +03:00
Artem Tarasov
95d5414718 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-08-26 13:55:49 +03:00
Artem Tarasov
872d0dae0d Fixed MainButton accessibility when going to Settings 2020-08-26 13:55:04 +03:00
3fce8d1027 Web: Files: fixed row click on mobile 2020-08-26 13:36:30 +03:00
82af63f80d Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-08-26 11:35:19 +03:00
78e62b36fc Web: Files: removed custom dropzone function, refactoring 2020-08-26 11:35:12 +03:00
Artem Tarasov
392896de1f Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-08-25 15:24:14 +03:00
Artem Tarasov
c584f75c4e fixed node selection when switching between TreeSettings and TreeFolders 2020-08-25 15:23:43 +03:00
8e88dd8239 Web: Files: fixed onLoading prop 2020-08-25 11:01:45 +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
ccf177bf7b Web: Files: fixed tree badge styles 2020-08-24 11:21:28 +03:00
Artem Tarasov
4cbfa4c6ae fixed routing SettingsTree 2020-08-24 10:33:16 +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
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
603a8bbbc5 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-08-20 17:40:52 +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
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
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