Commit Graph

8008 Commits

Author SHA1 Message Date
Vladislav Makhov
897a9cc24b Fix folder creation 2020-10-20 09:09:25 +03:00
Vladislav Makhov
500ac20bdc Adding to recent then create file. 2020-10-19 18:56:35 +03:00
Vladislav Makhov
e0dacb3a60 Merge branch 'develop' into feature/files-recent
# Conflicts:
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTileContent.js
#	web/ASC.Web.Common/src/api/files/index.js
2020-10-19 18:20:36 +03:00
Alexey Kostenko
5adc0f8697 Web: People: Added loader when switching groups 2020-10-19 14:15:04 +03:00
Vladislav Makhov
fee23e5947 Fix code after merge 2020-10-19 10:58:24 +03:00
af1bf4a56e Refactoring: lazy 2020-10-18 22:00:38 +03:00
181ac04fd8 DI: register fix 2020-10-18 19:34:30 +03:00
5cddd2061d Files: fixed delete 2020-10-16 19:05:21 +03:00
79e07ed817 Files: fixed create folder 2020-10-16 17:39:13 +03:00
0b258114cc
Merge pull request #101 from ONLYOFFICE/feature/files
Feature/files
2020-10-16 17:15:24 +03:00
Vladislav Makhov
3578340bcd Merge branch 'feature/files' into feature/files-recent
# Conflicts:
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
#	products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js
2020-10-16 17:15:14 +03:00
18ef6e7cb6 Merge branch 'master' into feature/files
# Conflicts:
#	products/ASC.Files/Core/Core/FileStorageService.cs
2020-10-16 16:57:21 +03:00
38cd808b4e Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-10-16 16:44:18 +03:00
a6d9908d00 Web: Files: remove duplicate fetchFolder 2020-10-16 16:45:44 +03:00
70b736998b Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
# Conflicts:
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
2020-10-16 16:44:10 +03:00
ed50f3bc98 Update yarn.lock files 2020-10-16 16:38:11 +03:00
Ilya Oleshko
c8cfe099ce Web: Files : RowContent : Disable file actions inside recycle 2020-10-16 16:33:25 +03:00
fc20655f0a web: common: bump version 2020-10-16 16:27:42 +03:00
2ea8e5cf1c Web: Files: Applied prettier style fix 2020-10-16 16:27:22 +03:00
2ab62c351e Web: People: Applied prettier style fix 2020-10-16 16:23:51 +03:00
5eed00dd28 Removed sq bugs and code smells 2020-10-16 16:21:59 +03:00
00c5f40cf8 Web: Client: Applied prettier style fix 2020-10-16 16:20:12 +03:00
f78d6c14f3 web: components: bump version 2020-10-16 16:18:11 +03:00
142c6d5e07 Web: Common: Added prettier package 2020-10-16 16:17:49 +03:00
8058981447 Web: Components: Applied prettier style fix 2020-10-16 16:16:01 +03:00
Ilya Oleshko
312856acf1 Web: Files : RowContent : Auto formatting, disable file actions inside recycle 2020-10-16 16:12:37 +03:00
Ilya Oleshko
5c4df62c77 Web: Files : Body : Not render share button in recycle 2020-10-16 16:11:30 +03:00
d636c68ae6 Web: Files: fixed share translation 2020-10-16 16:09:59 +03:00
69bca43c6c web: common: bump version 2020-10-16 15:58:30 +03:00
dcb7556a63 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-10-16 15:56:43 +03:00
f2fcf077a2 Web: Common: Fixed start PageLayout story and README 2020-10-16 15:56:35 +03:00
0181514267 Web: Common: Fixed self link 2020-10-16 15:55:47 +03:00
Ilya Oleshko
d5d4418536 Web: Files : NewFilesPanel : Fixed file open 2020-10-16 15:42:07 +03:00
Ilya Oleshko
74cae29b38 Web: Files : Selectors : Fixed filesList selector 2020-10-16 15:41:21 +03:00
1a484f1805 Web: Common: Applied prettier style fix 2020-10-16 15:38:04 +03:00
996c74641f Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-10-16 15:24:45 +03:00
7251a1e4d8 Web: Common: Fixed error handling 2020-10-16 15:24:37 +03:00
d088475152 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-10-16 15:06:56 +03:00
30f301435e Web: Files: fixed the update of the badge in the tree 2020-10-16 15:06:49 +03:00
TatianaLopaeva
acfe89b4f4 Web: People: Fixed the error of returning to the list of users immediately after refreshing the page and switching to the profile view 2020-10-16 14:54:13 +03:00
Artem Tarasov
89b2ace28b Web: Files: treeFolders: fixed badge display 2020-10-16 14:33:54 +03:00
Ilya Oleshko
bdad54951a Web: Files : NewFilesPanel : Fixed mapState error, temporary disabled open file inside panel 2020-10-16 14:08:52 +03:00
Vladislav Makhov
3e3fce0638 Fix code after merge 2020-10-16 12:55:56 +03:00
4b2f687cab Web: Files: Skip useless API requests on Editor opening 2020-10-16 12:15:54 +03:00
99ae158992 Web: Files: Removed useless API request call 2020-10-16 12:09:17 +03:00
Vladislav Makhov
ccab1949d5 Merge branch 'feature/files' into feature/files-recent
# Conflicts:
#	products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
#	products/ASC.Files/Client/src/store/files/selectors.js
2020-10-16 11:28:31 +03:00
e6be6f5072 References updated 2020-10-16 10:27:44 +03:00
Alexey Kostenko
94a31036eb Fixed navigation (after create user did not work) 2020-10-16 08:55:44 +03:00
Alexey Kostenko
7230d2a48e Web: People: Fixed navigation (after saving profile changes did not work) 2020-10-16 07:17:58 +03:00
f69281a07d References updated 2020-10-15 21:30:16 +03:00