Commit Graph

23355 Commits

Author SHA1 Message Date
TimofeyBoyko
4cd8e666ba Merge branch 'develop' into feature/system-plugin-v2 2022-08-15 10:31:57 +03:00
TimofeyBoyko
bf1d0b3b5c Web:Client:ContextOptionsStore: return item as function argument to plugin callbacks 2022-08-15 09:54:36 +03:00
TimofeyBoyko
698a34198d Web:Client:Plugin: fix deactivate method for plugin store 2022-08-15 09:53:46 +03:00
fa1258618a fixed warnings 2022-08-12 17:49:34 +03:00
299bed5559
Merge pull request #758 from ONLYOFFICE/bugfix/editor-ssr-production-fix
Web: Editor: fixed duplication of global styles on each request (prod…
2022-08-12 17:27:17 +03:00
a04c6b3533
Merge branch 'develop' into bugfix/editor-ssr-production-fix 2022-08-12 17:25:49 +03:00
0973f4e8d1 Files: removed .result 2022-08-12 16:26:57 +03:00
a941da35b4 removed ignored files 2022-08-12 16:11:25 +03:00
87ee619e09
Merge pull request #756 from ONLYOFFICE/feature/async-fix
Feature/async fix
2022-08-12 11:59:54 +03:00
Artem Tarasov
649a9d5ed5 Web: Editor: fixed duplication of global styles on each request (production) 2022-08-12 11:26:54 +03:00
296959b9ea
Merge pull request #757 from ONLYOFFICE/bugfix/editor-ssr-fix
Bugfix/editor ssr fix
2022-08-12 10:44:24 +03:00
Artem Tarasov
7673750d41 Web: Editor: fixed duplication of global styles on each request 2022-08-12 10:02:41 +03:00
23b059c0cc fix 2022-08-11 22:35:53 +03:00
2314d6fc47 Merge branch 'develop' into feature/async-fix
# Conflicts:
#	common/ASC.Socket.IO/.yarn/install-state.gz
#	common/ASC.SsoAuth/.yarn/install-state.gz
#	common/ASC.UrlShortener/.yarn/install-state.gz
#	common/ASC.WebDav/.yarn/install-state.gz
2022-08-11 22:33:13 +03:00
5b613b8078 Files: async fix 2022-08-11 22:25:29 +03:00
7d32616524 Files: fix 2022-08-11 19:02:52 +03:00
TimofeyBoyko
06ce57f1bd Plugins: add docspace-plugins and simple examples 2022-08-11 17:53:08 +03:00
TimofeyBoyko
bba15971de Web: add new workspace 'plugins' 2022-08-11 17:51:45 +03:00
44bd9f1d6d Files: fix 2022-08-11 16:55:35 +03:00
2936cb4ca2 Files: fix 2022-08-11 16:44:08 +03:00
e54617c275 Files: fix 2022-08-11 16:37:18 +03:00
TimofeyBoyko
0353092791 Web:Client:Plugins: delete useless code 2022-08-11 16:18:36 +03:00
TimofeyBoyko
ecf3da4668 Web:Components:DropDownItem: add available display icon as link 2022-08-11 16:14:14 +03:00
0ad8be0d1a Files: fix 2022-08-11 14:30:01 +03:00
c0bf10af9e Files: fix 2022-08-10 22:27:44 +03:00
a63ee39d36 Files: removed unused method 2022-08-10 21:23:46 +03:00
69e5665763 Files: async fix 2022-08-10 19:45:59 +03:00
TimofeyBoyko
7e16507b41 Web:Client:Plugins: refactoring plugin store and helplers 2022-08-10 17:47:15 +03:00
TimofeyBoyko
10e20b9f17 Web:Helplers:Plugins: add plugin type for contstants 2022-08-10 16:26:33 +03:00
TimofeyBoyko
d6f1f99d02 Web:Components:ContextMenu: add available show item icon from relative path 2022-08-10 16:21:00 +03:00
779c726e6d
Merge pull request #730 from ONLYOFFICE/feature/sso
Feature/sso
2022-08-10 16:00:35 +03:00
48d8e16d49 Merge branch 'feature/sso' of https://github.com/ONLYOFFICE/AppServer into feature/sso 2022-08-10 15:33:13 +03:00
97aee7f8c2 SSO: fix login 2022-08-10 15:33:02 +03:00
1c07363c48 SSO: fix edit 2022-08-10 15:30:41 +03:00
d0ea9b4d7e SSO: fix clear data 2022-08-10 13:47:45 +03:00
c0066f7eea fix gitignore merge 2022-08-10 10:00:10 +03:00
2e06c8fd58 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/sso
# Conflicts:
#	build/install/win/DocSpace.aip
2022-08-10 09:57:03 +03:00
39c7a8ac2c Files: fix 2022-08-09 23:23:36 +03:00
ea2f03331b refactoring 2022-08-09 19:13:07 +03:00
abe3f73cb6 SSO: auto set checkboxes 2022-08-09 18:36:35 +03:00
75a7553397 SSO: fix delete 2022-08-09 18:28:57 +03:00
83e7ad25d2 SSO: fixed successful login 2022-08-09 17:14:35 +03:00
05d5421ebc fix 2022-08-09 17:11:40 +03:00
3dd880be41 Merge branch 'feature/sso' of https://github.com/ONLYOFFICE/AppServer into feature/sso 2022-08-09 16:53:53 +03:00
bfe43ebe96 SSO: fix login 2022-08-09 16:53:22 +03:00
baaec9dcef Merge branch 'develop' into feature/async-fix
# Conflicts:
#	common/ASC.Socket.IO/.yarn/install-state.gz
#	common/ASC.SsoAuth/.yarn/install-state.gz
#	common/ASC.UrlShortener/.yarn/install-state.gz
#	common/ASC.WebDav/.yarn/install-state.gz
2022-08-09 16:27:35 +03:00
d679a3d9a7 Files: async fix 2022-08-09 16:09:14 +03:00
Sergey Kirichenko
09be9c3907
Modify rabbit, redis docker running (#754)
* Modify rabbit, redis run

* Modify
STORAGE_ROOT

* Syntax modify

Co-authored-by: Alexey Golubev <alexey.golubev@onlyoffice.com>
2022-08-09 15:57:34 +03:00
717b1f899a Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into develop 2022-08-09 12:51:40 +03:00
6db28a8a86 warm up service: added logs 2022-08-09 12:51:32 +03:00