Commit Graph

8202 Commits

Author SHA1 Message Date
Vladislav Makhov
e58a88af29 Fix code after merge 2020-10-16 16:16:51 +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
Vladislav Makhov
3491938aa4 Merge branch 'feature/files' into feature/files-favorites
# Conflicts:
#	products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTileContent.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js
#	products/ASC.Files/Client/src/components/pages/Home/index.js
#	products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js
#	products/ASC.Files/Client/src/store/files/selectors.js
#	web/ASC.Web.Common/src/api/files/index.js
2020-10-16 14:33:20 +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
11c2efde81 Web: Client: Removed old loader and toast 2020-10-15 19:28:31 +03:00
fa54990786 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-10-15 19:04:19 +03:00
fe708b9793
Merge pull request #98 from ONLYOFFICE/feature/selectors-refactoring
Feature/selectors refactoring
2020-10-15 19:04:04 +03:00
f7c9c62adf web: components: bump version 2020-10-15 19:03:05 +03:00
db6b0c7c65 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-10-15 19:02:44 +03:00
e7b02a0782 Web: Components: fixed text-input ios styles 2020-10-15 19:02:33 +03:00
6e7e09b91b Revert "Web: Files: moved SimpleFilesRow to a separate file, removed the bind"
This reverts commit 43dc6d81a5.
2020-10-15 18:08:09 +03:00
ff1c1765b5 Web: Clients: Turned off Suspense fallback 2020-10-15 18:07:23 +03:00
43dc6d81a5 Web: Files: moved SimpleFilesRow to a separate file, removed the bind 2020-10-15 14:40:17 +03:00
Alexey Kostenko
df4c926436 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-10-15 13:50:05 +03:00
Alexey Kostenko
5bd7a3b29c Web: People: Fix loading main People page, after switching from profile 2020-10-15 13:49:55 +03:00
Ilya Oleshko
3e66f95546 Merge branch 'feature/files' into feature/selectors-refactoring 2020-10-15 13:39:31 +03:00
b59a5a5069
Merge pull request #92 from ONLYOFFICE/features/ASC.AuditTrail
Features/asc.audit trail
2020-10-15 11:42:38 +03:00
cb896530b7 Merge branch 'master' into features/ASC.AuditTrail 2020-10-15 11:34:37 +03:00
TatianaLopaeva
14bb36900c Update yarn.lock files 2020-10-15 11:22:58 +03:00
0405989167 LoginEvents: fix 2020-10-15 11:04:06 +03:00
Artem Tarasov
165b5b907f Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-10-15 10:57:19 +03:00
Artem Tarasov
3ee236c25b Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-10-15 10:56:57 +03:00
TatianaLopaeva
917cbe8a38 web: common: bump version 2020-10-15 10:56:17 +03:00
TatianaLopaeva
d4d7c9db0d Web: Common: fixed changing language of title toastr 2020-10-15 10:55:47 +03:00
Artem Tarasov
6967267341 web: components: bump version 2020-10-15 10:55:38 +03:00
Artem Tarasov
6e6bcbd92f Web: Files: TreeFolders: badge for showing new elements moved to component TreeMenu 2020-10-15 10:55:01 +03:00