Commit Graph

7675 Commits

Author SHA1 Message Date
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
f9bf1dc7d7 Web: Common: Removed useless code 2020-10-06 18:18:36 +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
Diana
5c2b6debac fix migrations 2020-10-06 14:39:44 +03:00
Diana
cc8b3e470d fix 2020-10-06 14:38:15 +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
fcc1ca32dd Web: Fixed showing Error404 before user not loaded 2020-10-06 11:53:56 +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
8f086d1183 Web: Fixed NavMenu crash on currentProduct equals null 2020-10-06 10:10:42 +03:00
1ba65b9c01 EF: new Migration scheme 2020-10-06 10:06:18 +03:00
c5f87f8200 Web: People: Fixed refresh page with Filter 2020-10-05 21:41:04 +03:00
TatianaLopaeva
d5dbebfe1e Web: Components: Refactoring 2020-10-05 21:22:03 +03:00
8d7cf4f2dc Web: Replaced getCurrentModule with getCurrentProduct selector 2020-10-05 20:56:36 +03:00
c336279bf1 Web: Files: Fixed IsAdmin issues 2020-10-05 20:38:45 +03:00
TatianaLopaeva
2b848be23d Web: Components: Change styles by layout 2020-10-05 20:38:13 +03:00
Artem Tarasov
16d70a4168 Web: People: added LeaveFormDialog to updateUserForm 2020-10-05 18:54:57 +03:00
5a4e8027a4 Merge branch 'feature/loading-acceleration' of github.com:ONLYOFFICE/AppServer into feature/loading-acceleration 2020-10-05 18:25:36 +03:00
b741d9c7d7 Web: Components: Remove debugger 2020-10-05 18:25:24 +03:00
a6bc650da6 Web: Common: NavMenu refactoring 2020-10-05 18:25:01 +03:00
Artem Tarasov
3493ec390a Web: People: added LeaveFormDialog to article, createUser 2020-10-05 18:13:33 +03:00
Artem Tarasov
a0873f6db2 Web: People: refactoring LeaveFormDialog 2020-10-05 18:12:32 +03:00
bf20339e47 Web: Files: fixed upload folder 2020-10-05 17:17:08 +03:00
Artem Tarasov
5765475684 Web: People: added check for editing a form when clicking on a tree 2020-10-05 17:13:52 +03:00
Artem Tarasov
09a91ba47f Web: People: refactoring LeaveFormDialog 2020-10-05 17:11:58 +03:00
Artem Tarasov
c44543e177 Web: People: deleted unusing variables 2020-10-05 17:10:28 +03:00
TatianaLopaeva
b3d82c1e25 Changed font-style and font-weight for EmptyScreenContainer 2020-10-05 16:20:33 +03:00
0add76cd16 Web: Components: Added fix of error displaying 2020-10-05 16:09:35 +03:00
63ee865d98 Merge branch 'feature/files' into feature/loading-acceleration
# Conflicts:
#	products/ASC.People/Client/src/components/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
#	products/ASC.People/Client/src/components/pages/Profile/Section/Body/index.js
#	web/ASC.Web.Common/package.json
#	web/ASC.Web.Common/src/pages/login/index.js
#	web/ASC.Web.Common/src/utils/index.js
2020-10-05 15:37:09 +03:00
Artem Tarasov
5159b5c5b1 Web: People: added component LeaveFormDialog 2020-10-05 15:01:10 +03:00
Ilya Oleshko
df7a8c6515 Web: People: Home : Fixed status display 2020-10-05 14:59:42 +03:00
978b67f7a7 Update yarn.lock files 2020-10-05 14:46:07 +03:00
3de5601671 web: common: bump version 2020-10-05 14:28:41 +03:00
4629dfd077 web: components: bump version 2020-10-05 14:28:30 +03:00
8e0dc5dda4 Web: Client: Fixed merge error 2020-10-05 14:26:31 +03:00
53365f4c27 Merge branch 'feature/loading-acceleration' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/loading-acceleration 2020-10-05 14:01:39 +03:00
9269465e59 Web: Files: moved upload to actions 2020-10-05 14:01:32 +03:00
d00d16ee02 Merge branch 'master' into feature/files
# Conflicts:
#	products/ASC.Files/Client/yarn.lock
#	products/ASC.People/Client/yarn.lock
#	web/ASC.Web.Client/src/components/pages/Wizard/index.js
#	web/ASC.Web.Client/yarn.lock
#	web/ASC.Web.Common/package.json
#	web/ASC.Web.Common/src/api/settings/index.js
#	web/ASC.Web.Common/src/pages/login/index.js
#	web/ASC.Web.Common/src/store/auth/reducer.js
#	web/ASC.Web.Common/src/utils/index.js
#	web/ASC.Web.Common/yarn.lock
2020-10-05 13:32:26 +03:00
Artem Tarasov
0a248e6f3b Web: People: fixed updating avatar in user list after creating new user 2020-10-05 13:29:14 +03:00