efcf36a1b0
Web: Common: Revert proxy.url
2021-03-22 20:01:28 +03:00
4ce205fe9a
Web: Client: Commented not used code
2021-03-22 20:00:38 +03:00
577464933b
Web: Files: Fixed proxy
2021-03-22 20:00:04 +03:00
f19ee78c0f
Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces
2021-03-22 18:52:33 +03:00
dea3f3bb20
Web: Fixed login redirect
2021-03-22 18:52:25 +03:00
TatianaLopaeva
26ef7bdd65
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-22 18:31:41 +03:00
e279ece3c4
Removed commented code
2021-03-22 18:24:19 +03:00
ce86b6014b
Web: Settings: Add URL proxy
2021-03-22 18:24:03 +03:00
TatianaLopaeva
9baae539d2
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-22 18:11:45 +03:00
TatianaLopaeva
24cc620904
Web: Fixed displaying of shared files at aside & Deleted useless code.
2021-03-22 18:11:39 +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
Artem Tarasov
0fcdbd3fd7
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-22 16:16:03 +03:00
Artem Tarasov
a616d79ccf
Web: Files: fixed folder selection when clicking from settings
2021-03-22 16:15:18 +03:00
Viktor Fomin
74e5686a0e
Web: Client: fixed language-timezone settings
2021-03-22 16:14:41 +03:00
Ilya Oleshko
c689b59a03
Web: Files: Added missing ErrorBoundary import
2021-03-22 15:57:44 +03:00
Ilya Oleshko
70187ebd96
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-22 15:56:05 +03:00
Ilya Oleshko
49e28e53a4
Web: Files: Apply route proxy
2021-03-22 15:55:56 +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
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
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
