05b417f63d
Web: People: hidden the phone field
2021-03-22 15:31:42 +03:00
Alexey Kostenko
3524f3b6c6
Web: Client/Common: Fixed Route to homepage (Incorrect header on homepage)
2021-03-22 15:27:36 +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
83e9a8b4a4
Web: Add URL proxy on tryRedirectTo usage
2021-03-22 12:16:41 +03:00
b6a5249147
Web: Editor: Add URL proxy
2021-03-22 12:12:34 +03:00
9052fbdf21
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
...
# Conflicts:
# products/ASC.People/Client/src/components/Article/MainButton/index.js
2021-03-22 12:10:53 +03:00
f8a2b438a9
Web: People: Add URL proxy
2021-03-22 12:06:30 +03:00
Viktor Fomin
c74d156d23
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-22 11:57:21 +03:00
Viktor Fomin
d3fdc2d8a3
Web: Client: fixed greeting settings
2021-03-22 11:57:08 +03:00
TatianaLopaeva
d0f2d9871f
Web: People: Deleted useless code at icon path.
2021-03-22 11:46:31 +03:00
95786b9a25
Merge pull request #203 from ONLYOFFICE/feature/migrations
...
fix data in table core_settings
2021-03-22 11:42:40 +03:00
25bbd0cf2a
Merge branch 'develop' into feature/workspaces
2021-03-22 11:34:54 +03:00
e8f7a7eebd
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-22 00:34:35 +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
Viktor Fomin
4d22ea8f44
Web: Components: fixed icons positions in avatar editor
2021-03-21 23:25:24 +03:00
fc7bd11088
Fix getshortenlink
2021-03-21 18:29:35 +03:00
335cc31939
Notify: fix
2021-03-21 17:51:49 +03:00
a921bf3f71
Web: Fix elem == null in Settings
2021-03-21 11:51:19 +03:00
Viktor Fomin
30d7c7bd8f
Web: Files: fixed article width
2021-03-20 16:21:18 +03:00
Viktor Fomin
4fe20bdca9
Web: Common: fixed article width
2021-03-20 16:20:51 +03:00
126bbda1b1
Web: Files: refactoring
2021-03-20 13:17:17 +03:00
75859212ab
Web: People: Fix conversation of Filter to URL and back
2021-03-20 13:16:45 +03:00
deafba32a7
Web: Files: Fix conversation of Filter to URL and back
2021-03-20 12:51:08 +03:00
16738bf314
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-20 11:54:34 +03:00
1c4acb2842
Web: Fixed issue with Tree link first click
2021-03-20 11:54:21 +03:00
5f255d7aa4
Web: Files Fixed routing to third-party settings page
2021-03-20 11:45:41 +03:00
accd318dc0
Web: Fixed z-index of #ipl-progress-indicator
2021-03-20 11:24:33 +03:00
f25d8adbea
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-19 22:17:04 +03:00
40557ccedc
Web: Files: fixed filter
2021-03-19 22:16:47 +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
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