Commit Graph

1666 Commits

Author SHA1 Message Date
Alexey Kostenko
3e4424b67b Web: People/Common: Refactoring 2021-03-25 16:10:10 +03:00
Alexey Kostenko
894449d95c Web: People: Unlink account from provider 2021-03-24 16:51:16 +03:00
Alexey Kostenko
17956f05c0 Web: People: Linking with providers 2021-03-24 14:20:59 +03:00
Alexey Kostenko
e1df253b22 Web: People/Components: Added login settings buttons to edit profile page, social button - style fix 2021-03-23 18:29:29 +03:00
TatianaLopaeva
7ef1429cb7 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-23 10:40:23 +03:00
TatianaLopaeva
cc707204d9 Web: Removed jumps of article when the page is loading. 2021-03-23 10:39:37 +03:00
0d6fcd6f52 Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-22 22:37:34 +03:00
051a69e5b5 Web: People: GroupAction: Fix translation loading 2021-03-22 22:37:21 +03:00
TatianaLopaeva
6bb12c9524 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-22 21:10:23 +03:00
TatianaLopaeva
21b6567f7a Web: People: Fix proxy route. 2021-03-22 21:10:15 +03:00
5dd30c9502 Web: Client: fixed owner change 2021-03-22 20:56:53 +03:00
d7981f3f53 Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-22 17:35:41 +03:00
a8a6121e59 Web: Proxy fixes 2021-03-22 17:35:33 +03:00
78fd4f632c Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-22 16:46:34 +03:00
879259f160 Web: People: fixed getting peopleList 2021-03-22 16:45:24 +03:00
Viktor Fomin
0da17ef641 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-22 16:15:07 +03:00
89f2431e1c Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-22 15:33:50 +03:00
05b417f63d Web: People: hidden the phone field 2021-03-22 15:31:42 +03:00
Viktor Fomin
5a9c782fc5 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-22 13:08:46 +03:00
Viktor Fomin
12f920047c Web: People: fixed translate 2021-03-22 13:08:40 +03:00
TatianaLopaeva
7dc1b80ab6 Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces 2021-03-22 13:00:35 +03:00
TatianaLopaeva
7c56caf2a6 Web: People: Fixed returned to the homepage after created group. 2021-03-22 12:59:06 +03:00
f8a2b438a9 Web: People: Add URL proxy 2021-03-22 12:06:30 +03:00
TatianaLopaeva
d0f2d9871f Web: People: Deleted useless code at icon path. 2021-03-22 11:46:31 +03:00
d568693154 Big Fix commit:
+ Added new Clients for CRM/Products
+ Removed old fake coming-soon pages
+ Added combineUrl and AppSettingsConfig with proxyUrl
+ Added new fields to modules info on Server
+ Fixed work with icon and image urls
+ Added CRM/Projects to nginx/onlyoffice.conf
+ Applied combineUrl in studio links
+ Added and applied "id" field in package.json of all Clients
+ Added new bat files CrmClient.bat and ProjectsClient.bat
+ Fixed ProductClassName for Files
2021-03-22 00:34:21 +03:00
75859212ab Web: People: Fix conversation of Filter to URL and back 2021-03-20 13:16:45 +03:00
1c4acb2842 Web: Fixed issue with Tree link first click 2021-03-20 11:54:21 +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
60b57e5535 Web: People: Fixed move to edit profile (double slash in URL) 2021-03-19 18:36:11 +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
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
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
9cfbc4f6a0 Web: People: fix position of email value in Profile 2021-03-19 11:17:36 +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