Commit Graph

11341 Commits

Author SHA1 Message Date
Ilya Oleshko
983e689bbe Web: Components: Utils: Added class name combiner 2021-03-26 16:01:22 +03:00
f732f5fba6 Web: Moved sw-template to @appserver/common and removed api cache (translation issue) 2021-03-24 11:45:58 +03:00
00699a4304 fixed Jenkinsfile 2021-03-23 22:22:38 +03:00
b8d484e62f fixed locales 2021-03-23 21:10:47 +03:00
97fa6c82ab Web: Editor: webpack: disabled compression 2021-03-23 19:34:18 +03:00
dde8f97cfd Nginx: conf 2021-03-23 18:34:59 +03:00
848e5dc500
Merge pull request #204 from ONLYOFFICE/feature/workspaces
Feature/workspaces
2021-03-23 15:37:38 +03:00
7899ebe921 Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-23 15:23:30 +03:00
5930c30150 Build: Front-end: commented wipe 2021-03-23 15:21:40 +03:00
30b976f25f Web: Client: removed debugger, fixed onChangeOwner 2021-03-23 15:16:18 +03:00
acbe51d090 Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-23 14:21:37 +03:00
f8c2f20fe8
Merge branch 'develop' into feature/workspaces 2021-03-23 14:21:30 +03:00
d04659a9c7 Merge branch 'feature/workspaces' of https://github.com/ONLYOFFICE/AppServer into feature/workspaces 2021-03-23 14:18:45 +03:00
a94a87855a People: fix ChangeUserPassword 2021-03-23 14:18:44 +03:00
a50701e6da Build: Refactoring 2021-03-23 14:10:33 +03:00
af9cc87717 Merge branch 'develop' into feature/workspaces 2021-03-23 11:03:37 +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
0a9a1b1809 Files: fixed root method 2021-03-22 22:14:43 +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