Commit Graph

2316 Commits

Author SHA1 Message Date
4059c94e34
Merge pull request #91 from ONLYOFFICE/feature/fix-redirect-after-update-profile
Feature/fix redirect after update profile
2020-10-08 13:20:31 +03:00
Artem Tarasov
3d60e9ac63 Web: People: fixed isEdit flag 2020-10-08 11:10:55 +03:00
Artem Tarasov
5806daa594 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-10-07 18:23:34 +03:00
Ilya Oleshko
be48e703b9 Web: Files : Home : Fixed context menu separator key 2020-10-07 17:31:59 +03:00
Artem Tarasov
17daf4e847 Web: Files: settings: fix warning 2020-10-07 17:15:40 +03:00
Artem Tarasov
c5dfb870b3 Web: People: deleted unusaed variables 2020-10-07 17:09:14 +03:00
Artem Tarasov
974ccdbf48 Merge branch 'feature/files' into feature/fix-redirect-after-update-profile
# Conflicts:
#	products/ASC.People/Client/src/components/Article/Body/index.js
#	products/ASC.People/Client/src/components/pages/GroupAction/Section/Body/index.js
#	products/ASC.People/Client/src/components/pages/Profile/Section/Header/index.js
#	products/ASC.People/Client/src/components/pages/Profile/index.js
#	products/ASC.People/Client/src/store/profile/actions.js
2020-10-07 16:56:36 +03:00
9d87b8de09
Merge pull request #94 from ONLYOFFICE/feature/empty-screen
Feature/empty screen
2020-10-07 16:52:54 +03:00
3bf8bd5103 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-10-07 16:41:24 +03:00
ca37d2134d Web: Files: Applied API changes on server in files filtering 2020-10-07 16:41:05 +03:00
TatianaLopaeva
da23f36f09 Merge branch 'feature/files' into feature/empty-screen 2020-10-07 16:02:18 +03:00
TatianaLopaeva
34506827b5 Update yarn.lock 2020-10-07 15:53:29 +03:00
TatianaLopaeva
449bc0e0b2 Web: Files: Deleted unnecessary fontSize 2020-10-07 15:32:03 +03:00
TatianaLopaeva
17b8a00a62 Web: Files: Deleted unnecessary box 2020-10-07 15:21:46 +03:00
TatianaLopaeva
de7e4fe062 Merge branch 'feature/files' into feature/empty-screen
# Conflicts:
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
2020-10-07 15:14:54 +03:00
Artem Tarasov
84bb49c0e3 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-10-07 15:14:26 +03:00
Ilya Oleshko
94d2ae1d07 Web: Files : Selectors : Added missing property 2020-10-07 14:46:59 +03:00
TatianaLopaeva
9ac0d6f73a Web: Files: Changed margin 2020-10-07 14:42:09 +03:00
Artem Tarasov
36158ded1d Web: Files: fixed inability to navigate from TreeSettings to TreeFolders 2020-10-07 14:12:45 +03:00
e76e50dc79 Web: ServiceWorkers: Turned off debug mode 2020-10-07 13:43:51 +03:00
7d958b7f9b Web: Files: Restored Suspense 2020-10-07 13:39:07 +03:00
Artem Tarasov
a49b2581d9 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
# Conflicts:
#	products/ASC.Files/Client/src/components/Article/Body/index.js
#	products/ASC.Files/Client/src/store/files/reducers.js
2020-10-07 13:24:20 +03:00
11348e5fba Update yarn.lock files 2020-10-07 12:58:38 +03:00
2e74a1bde3 Web: Replaced some code tot selectors 2020-10-07 12:47:55 +03:00
Ilya Oleshko
19f5206e3f Web: Files : Home : Fixed existing items check on add temp item on create 2020-10-07 11:45:20 +03:00
Ilya Oleshko
066a396dbd Web: Files : Home : Fixed double add temp item on create 2020-10-07 11:33:10 +03:00
TatianaLopaeva
ee6f71d6ae Web: Files: Refactoring 2020-10-07 11:03:19 +03:00
TatianaLopaeva
da9611bd4b Merge branch 'feature/files' into feature/empty-screen 2020-10-07 10:58:27 +03:00
TatianaLopaeva
650b5d076a Web: Files: Refactoring 2020-10-07 10:57:05 +03:00
ac7eda1b93 Web: Files: fixed filter 2020-10-06 22:56:22 +03:00
Ilya Oleshko
2632a0d3da Web: Files : Home : Fixed loopTree after create or update items at row 2020-10-06 21:48:55 +03:00
b8d2407530 Merge branch 'feature/loading-acceleration' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/loading-acceleration 2020-10-06 19:33:57 +03:00
201126834f Web: Files: fixed url filter, fixed selectedFolder error 2020-10-06 19:33:41 +03:00
42d7ffae45 Web: People: Fixed loading Profile info after change People filter fields 2020-10-06 19:26:01 +03:00
7fb3ce6c09 Web: People: Added groups for API people loading 2020-10-06 19:07:10 +03:00
6cd15ef176 Merge branch 'feature/loading-acceleration' of github.com:ONLYOFFICE/AppServer into feature/loading-acceleration 2020-10-06 18:18:46 +03:00
c2cd41f8f2 Web: People: Fixed working of GroupMenu after applied reselect 2020-10-06 18:18:01 +03:00
Artem Tarasov
ef602b578f Web: Files: fixed selected tree node on click in row 2020-10-06 17:07:58 +03:00
TatianaLopaeva
88d6a3ad07 Web: Files: Re-wrote styles for SectionBody and deleted unnecessary for EmptyFolderContainer widthProp 2020-10-06 16:04:33 +03:00
TatianaLopaeva
b76bf8f3a0 Web: Files: Re-wrote styles EmptyFoldersContainer 2020-10-06 15:39:28 +03:00
a664bc9795 Web: Files: fixed Home selectors, added new selectors 2020-10-06 15:35:46 +03:00
fa4f3d5d7b Web: Files: renamed setNewTreeFilesBadge action to setUpdateTree 2020-10-06 15:35:12 +03:00
5ae3b98548 Web: Files: fixed article body selectors, added redux to TreeFolders.js 2020-10-06 15:32:57 +03:00
Ilya Oleshko
2732f892da Web: Files : Home : Added events for rename and create, fixed loop folder data 2020-10-06 14:57:16 +03:00
Ilya Oleshko
a522433ed7 Web: Files : Home : Added selectors for fileRow 2020-10-06 14:56:31 +03:00
Artem Tarasov
0244d97007 Web: People: rename component LeaveFormDialog to DataLossWarningDialog, action setIsVisibleModalLeave to setIsVisibleDataLossDialog 2020-10-06 13:29:11 +03:00
3ad873f1c8 Web: People: Restored fields in filtering data 2020-10-06 12:46:10 +03:00
Artem Tarasov
045e618c3a Merge branch 'feature/files' into feature/fix-redirect-after-update-profile 2020-10-06 12:20:21 +03:00
Artem Tarasov
e0547caad7 Web: People: fix routing 2020-10-06 11:49:36 +03:00
af756a1e76 Web: Fixed opening @self profile view 2020-10-06 11:33:53 +03:00