Commit Graph

4203 Commits

Author SHA1 Message Date
5f255d7aa4 Web: Files Fixed routing to third-party settings page 2021-03-20 11:45:41 +03:00
27afa22f85 Web: Files: Fixed Filter translations loading 2021-03-19 21:19:05 +03:00
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
TatianaLopaeva
c1e53e3c6e Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-19 19:21:20 +03:00
Artem Tarasov
aebb3c479f Web: fix after merge 2021-03-19 19:24:16 +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
741fca254f Web: Fixed usage of auth.settingsStore 2021-03-19 19:02:43 +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
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
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
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
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
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
c862bbc7ef Web: People: Fixed loading translations 2021-03-19 10:49:50 +03:00
78140c0739 Web: People: Fixed double init 2021-03-19 10:46:49 +03:00
3b340396a7 Web: Fixed jumping of NavMenu 2021-03-19 10:45:34 +03:00
TatianaLopaeva
7299252d8f Web: People: PeopleSelector: Fixed load path of translations. 2021-03-19 10:01:42 +03:00
Artem Tarasov
d3d9234d40 Web: fix direct to VersionHistory and back (mobile) 2021-03-18 23:12:19 +03:00
8e6b2c78d8 Web: Moved ipl-progress-indicator to NavMenu 2021-03-18 22:26:52 +03:00
TatianaLopaeva
6e96c56916 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-18 18:09:34 +03:00
Alexey Kostenko
42d062f0d2 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-18 17:49:09 +03:00
Alexey Kostenko
6f2d927e57 Web: Files: Fixed navigating between folders through the tree 2021-03-18 17:48:57 +03:00
Vladislav Makhov
12dc227d03 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-18 17:47:44 +03:00
TatianaLopaeva
0281e18e20 Web: Files: Fixed color. 2021-03-18 16:39:58 +03:00
TatianaLopaeva
c8d40e698e Web: People/Files: Fixed color of icons. 2021-03-18 16:30:45 +03:00
Vladislav Makhov
a16a0a833d web: people: fix cancel btn 2021-03-18 14:19:42 +03:00
Artem Tarasov
66c346b40d Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-18 13:40:16 +03:00