Commit Graph

11248 Commits

Author SHA1 Message Date
1908c2d608 Web: Files: Refactoring 2021-03-19 21:11:22 +03:00
e797d01bee Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-19 21:07:16 +03:00
efe94a4589 Web: People: Fixed Filter translations loading 2021-03-19 21:07:10 +03:00
Artem Tarasov
bd0ea45f19 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-19 20:54:19 +03:00
Artem Tarasov
117c9f4c0e Web: Components: fix position and size icons in treeNode 2021-03-19 20:53:26 +03:00
6d29a82d26 Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-19 20:46:06 +03:00
97ec05e8ff Web: People: fixed filter 2021-03-19 20:45:57 +03:00
Artem Tarasov
aebb3c479f Web: fix after merge 2021-03-19 19:24:16 +03:00
TatianaLopaeva
c1e53e3c6e Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-19 19:21:20 +03:00
Artem Tarasov
6418c3af89 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
# Conflicts:
#	products/ASC.People/Client/src/pages/Profile/Section/Header/index.js
#	products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
2021-03-19 19:21:16 +03:00
TatianaLopaeva
7f193e003c Web: People: Fix color of icon. 2021-03-19 19:11:16 +03:00
Artem Tarasov
4d9920a4d0 Web: People: fixed updating of user information after editing 2021-03-19 19:06:55 +03:00
ec1fc00b90 Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-19 19:02:50 +03:00
741fca254f Web: Fixed usage of auth.settingsStore 2021-03-19 19:02:43 +03:00
Viktor Fomin
cfdcd5bdd9 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-19 18:46:20 +03:00
Viktor Fomin
ab84569dcf Web: Common: fixed article width 2021-03-19 18:46:05 +03:00
b42eb03270 Web: People: Hide reasign button 2021-03-19 18:41:22 +03:00
403487b7de Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-19 18:36:17 +03:00
60b57e5535 Web: People: Fixed move to edit profile (double slash in URL) 2021-03-19 18:36:11 +03:00
04d1642fac Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-19 18:24:33 +03:00
fc7d6e170a Web: Files: added select items to shareButton click 2021-03-19 18:24:14 +03:00
bb898e24cd Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-19 18:23:19 +03:00
2df2b6809e Web: People: Fixed primary link redirect to default filter 2021-03-19 18:23:14 +03:00
6b8d644aab Web: Replaced all homepages to config variant 2021-03-19 18:22:35 +03:00
TatianaLopaeva
edb57b61d3 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-19 18:08:41 +03:00
TatianaLopaeva
3105f31950 Web: components: Fixed backdrop. 2021-03-19 18:08:10 +03:00
1627e94ae9 Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-19 18:07:25 +03:00
02c147bd92 Web: Files: added select files on right click event 2021-03-19 18:07:16 +03:00
Vladislav Makhov
425f182b8d Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-19 18:04:43 +03:00
Vladislav Makhov
62991e25f9 web: files: third party: fix blinking 2021-03-19 18:04:30 +03:00
TatianaLopaeva
e668407d63 Web: Files: Fixed settings styles of connected clouds. 2021-03-19 17:56:01 +03:00
Ilya Oleshko
ac6f35db42 Web: Components: Row: Added onRowContextClick callback 2021-03-19 17:33:58 +03:00
Ilya Oleshko
d8be47b1d1 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-19 16:56:55 +03:00
Ilya Oleshko
ad7a9f6827 Web: Components: ContextMenuButton: Backdrop now open only on mobile 2021-03-19 16:56:46 +03:00
06621ca2cb Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-19 16:31:48 +03:00
e63fc30a2e Web: People: Fixed move to direct link 2021-03-19 16:31:41 +03:00
TatianaLopaeva
5573192d73 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-19 14:18:32 +03:00
Artem Tarasov
51b978f6a3 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-19 14:13:56 +03:00
Artem Tarasov
7c7e7e8c05 Web: People: fixed transition from profile editing 2021-03-19 14:13:22 +03:00
TatianaLopaeva
eee9213cad Web: Components: Fixed styles of action menu of people. 2021-03-19 14:05:51 +03:00
26cb9bf60c Web: Files: fixed onClickLinkForPortal 2021-03-19 12:18:17 +03:00
9fc950665b Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-19 11:22:36 +03:00
e87709dc70 Web: People: fixed InviteDialog styles 2021-03-19 11:22:25 +03:00
Artem Tarasov
a6c21657a1 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-19 11:18:21 +03:00
Artem Tarasov
3ab382cb5b Web: Files: fix position of label ToggleButton in Settings 2021-03-19 11:18:06 +03:00
Artem Tarasov
9cfbc4f6a0 Web: People: fix position of email value in Profile 2021-03-19 11:17:36 +03:00
1e02f165ca Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
# Conflicts:
#	products/ASC.People/Client/src/components/PeopleSelector/i18n.js
2021-03-19 10:55:22 +03:00
33281d9260 Web: Files: commented debug in i18n config 2021-03-19 10:53:13 +03:00
e1a477bc64 Web: Common: Restored Selectors in Filter 2021-03-19 10:50:28 +03:00
c862bbc7ef Web: People: Fixed loading translations 2021-03-19 10:49:50 +03:00