Commit Graph

7049 Commits

Author SHA1 Message Date
a44b4bc60a Web: Files: Fixed setIsLoading is undefined on triangle icon click 2020-09-11 22:38:50 +03:00
8045eecf1b Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
# Conflicts:
#	products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
#	products/ASC.Files/Client/src/components/Article/Body/index.js
2020-09-11 22:30:09 +03:00
c989eaf8a5 Web: Files: Changed default cursor in FolderTree on loading 2020-09-11 22:04:00 +03:00
2ccb4eebac Web: Files: Replaced title (People style) 2020-09-11 21:46:51 +03:00
4d97d6a7ac Web: Clients: Moved setup title to Article/Body 2020-09-11 21:45:46 +03:00
49ba2c96db Web: Files: Commented useless code 2020-09-11 20:43:40 +03:00
99a6fd523e Web: Client: Moved organizationName into authReducer 2020-09-11 18:03:40 +03:00
Alexey
804bb1553a Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-11 12:55:56 +03:00
Alexey
d457266fbc web: components: bump version 2020-09-11 12:55:47 +03:00
Alexey
564f1828ca Web: Components: Fixed icons in dropDownItem in mainButton 2020-09-11 12:55:30 +03:00
219ab9cac2 Web: Files: fixed Dnd display logic 2020-09-11 12:49:59 +03:00
a085b53cb8 Web: Files: refactoring isLoading 2020-09-11 12:22:18 +03:00
Artem Tarasov
6423362a0c Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-11 11:26:58 +03:00
Artem Tarasov
76ad46fed1 refactoring, moved onLoading and isLoading to redux 2020-09-11 11:25:47 +03:00
Alexey
2917b302c8 web: components: bump version 2020-09-11 10:27:58 +03:00
Alexey
b56605468c Web: Components: Fixed incorrect display when rendering long text 2020-09-11 10:27:41 +03:00
Alexey
ae4323ec64 web: components: bump version 2020-09-11 08:57:25 +03:00
Alexey
ae4bb0d01c Web: Components: Fix context menu (incorrect width when first opened) 2020-09-11 08:57:03 +03:00
77e1b42cc4 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-10 17:10:33 +03:00
188b20ff86 Merge branch 'master' into feature/files 2020-09-10 17:10:19 +03:00
3a85553504 Files: GetFolderUrl fix 2020-09-10 17:09:27 +03:00
ab75c4ba88 web: components: bump version 2020-09-10 16:34:43 +03:00
afc8a72402 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-09-10 16:34:26 +03:00
e4c359617f Web: Components: fixed link-with-dropdown maxHeight prop 2020-09-10 16:34:01 +03:00
ea16508688 Merge branch 'master' into feature/files 2020-09-10 16:32:12 +03:00
2413e22323 Files: GetFolderUrl fix 2020-09-10 16:31:32 +03:00
Artem Tarasov
6a219488e9 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-10 16:01:30 +03:00
Artem Tarasov
3c4562a03a removed passing onLoading and isLoading in ArticleBodyContent through properties 2020-09-10 16:00:02 +03:00
Vladislav Makhov
395b8b392c Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-10 15:55:06 +03:00
Vladislav Makhov
175b244cd2 Fix state bug 2020-09-10 15:54:50 +03:00
3e059081fe Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-09-10 15:22:54 +03:00
36a0bf12f4 Web: Files: fixed error handler create file/folder 2020-09-10 15:22:44 +03:00
Vladislav Makhov
b81f2e0dba Fix state bug 2020-09-10 15:01:56 +03:00
Vladislav Makhov
0496705714 Login Page: fix styles 2020-09-10 14:49:57 +03:00
Vladislav Makhov
c12ae9624b Avatar editor: add indication of loading process 2020-09-10 14:18:58 +03:00
Vladislav Makhov
11a94363de Update README.md 2020-09-10 14:14:46 +03:00
Vladislav Makhov
7e6fc0b600 Added new prop: saveButtonLoading 2020-09-10 14:12:05 +03:00
f724848195 Merge branch 'master' into feature/files 2020-09-10 13:45:15 +03:00
0a6c2fda18 Files: fix FileConverterQueueScope 2020-09-10 13:44:38 +03:00
9282ffbbf1 Merge branch 'master' into feature/files 2020-09-10 13:40:54 +03:00
f89af33b5b fix unhandled exception 2020-09-10 13:39:26 +03:00
7433eea815 Web: Clients: SW: Added code for updating SW lifecycle to update the app after user triggered refresh 2020-09-10 13:19:06 +03:00
Artem Tarasov
11844629d9 added Icons.DepartmensGroupIcon 2020-09-10 12:49:24 +03:00
23b2a310a0 Merge branch 'master' into feature/files 2020-09-10 12:35:55 +03:00
fb0dec0a16 Files: fix 2020-09-10 12:30:33 +03:00
3f37da9891 fix notify 2020-09-10 12:02:26 +03:00
323823981a Update yarn.lock files 2020-09-09 22:25:31 +03:00
e4a222b57b Web: People: Fixed redirect on Save/Cancel GroupAction page 2020-09-09 22:18:27 +03:00
718a6e2ebb web: common: bump version 2020-09-09 22:03:33 +03:00
e8f1d01aae Web: Common: PeopleSelector: hidden user tooltip (issue: too slow work) 2020-09-09 22:03:12 +03:00