mushka
|
218b94b5b6
|
commented out unfinished room params
|
2022-08-15 19:07:59 +03:00 |
|
mushka
|
0a686b6731
|
added react-avatar-editor dependency
|
2022-08-15 19:06:46 +03:00 |
|
mushka
|
4379a34bcf
|
Merge branch 'develop' into feature/create-room
|
2022-08-15 16:01:20 +03:00 |
|
mushka
|
6b69ef62ea
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop
|
2022-08-15 15:59:04 +03:00 |
|
mushka
|
d772e1eb13
|
removed not needed data
|
2022-08-15 15:58:03 +03:00 |
|
mushka
|
ec286077c2
|
updated and fixed SetRoomParams
|
2022-08-15 15:57:33 +03:00 |
|
mushka
|
e86d45d88d
|
removed unwanted file
|
2022-08-15 15:56:54 +03:00 |
|
mushka
|
f99806f51e
|
update of ThirdPartyStorage
|
2022-08-15 15:56:28 +03:00 |
|
mushka
|
a2f32969e4
|
updatedCreateRoomEvent
|
2022-08-15 15:55:37 +03:00 |
|
mushka
|
2c2ae838b3
|
updatedEditRoomEvent
|
2022-08-15 15:55:24 +03:00 |
|
mushka
|
2acc22b17f
|
added roomLogo methods to filesStore
|
2022-08-15 15:55:04 +03:00 |
|
mushka
|
f0351ceec0
|
added roomLogo api methods
|
2022-08-15 15:54:46 +03:00 |
|
mushka
|
95be5666fd
|
updated tagInput and tagList
|
2022-08-15 15:54:24 +03:00 |
|
mushka
|
aad25382f2
|
moved privacy setting to own component and added warning banner
|
2022-08-15 15:53:47 +03:00 |
|
mushka
|
d79e7bf452
|
fixed translations in data & removed thhirdparties
|
2022-08-15 15:53:16 +03:00 |
|
mushka
|
5aa2147bf3
|
added permanent settings
|
2022-08-15 15:52:30 +03:00 |
|
mushka
|
78fe429124
|
restructured params to templates
|
2022-08-15 15:52:10 +03:00 |
|
mushka
|
5097d09a44
|
created iconEditorComponent
|
2022-08-15 15:51:11 +03:00 |
|
mushka
|
84f50bd4bd
|
updated state in EditRoom
|
2022-08-15 15:50:31 +03:00 |
|
mushka
|
307be1d4e5
|
updated state in CreateRoom
|
2022-08-15 15:50:18 +03:00 |
|
mushka
|
a2ef8d46b5
|
updated and edited translations
|
2022-08-15 15:49:43 +03:00 |
|
mushka
|
868ca37341
|
added svg for icon-croppper grid
|
2022-08-15 15:49:19 +03:00 |
|
mushka
|
ea5b92f1af
|
added func for getting cloudTypeIcon to filesUtils
|
2022-08-15 15:48:23 +03:00 |
|
|
|
92942fbcf6
|
People: fix
|
2022-08-15 14:30:50 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
