Commit Graph

11325 Commits

Author SHA1 Message Date
a50701e6da Build: Refactoring 2021-03-23 14:10:33 +03:00
4c9e366f43 Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-23 10:43:31 +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
40567ed10b Web: Restore: remove remoteEntry script 2021-03-23 10:33:36 +03:00
d9e3e96ab8 Web: Fix: init Files 2021-03-23 10:33:05 +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
fd704ab12a Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-22 20:58:06 +03:00
5dd30c9502 Web: Client: fixed owner change 2021-03-22 20:56:53 +03:00
Ilya Oleshko
de8dc35fca Web: Files: Apply route proxy 2021-03-22 20:51:52 +03:00
a1eb540d9d Web: Files: Fixed routing from settings and folder 2021-03-22 20:34:02 +03:00
92530da98f Web: Files: Fix proxy 2021-03-22 20:26:35 +03:00
0847693c55 Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-22 20:02:03 +03:00
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
b0c430b7ba Merge branch 'develop' into feature/workspaces 2021-03-22 19:46:49 +03:00
12af2890dc Web: Files: fixed markAsRead 2021-03-22 19:21:36 +03:00
628f9c8d5c Web: Common: fixed getShortenedLink 2021-03-22 19:18:30 +03:00
e4897160a9 fixed SendEmailActivationInstructions 2021-03-22 18:56: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
44c4967f0f Files: indexes renamed 2021-03-22 18:43:51 +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