Commit Graph

9985 Commits

Author SHA1 Message Date
f6a5df4577 Web: Client: SSO: fix 2022-08-01 07:37:24 +03:00
0cb9753ab5 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/sso 2022-08-01 00:29:26 +03:00
18173e397e Web: Client: SSO: refactoring 2022-08-01 00:29:17 +03:00
Artem Tarasov
a649228525 Web: Doceditor: added React.Suspense 2022-07-29 16:16:17 +03:00
e09089b71c Web: Client: SSO: refactoring 2022-07-29 14:42:21 +03:00
c37c0ee078 Web: Client: fix translate 2022-07-29 14:42:06 +03:00
e16b3864ee Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/sso 2022-07-28 19:09:25 +03:00
9d4e107d6c Web: Client: SSO: fix store actions 2022-07-28 18:35:58 +03:00
Artem Tarasov
5496cdbe05 Web: Doceditor/build: changed deploy path for editor 2022-07-28 17:39:25 +03:00
Artem Tarasov
df74259b50 Web: Doceditor: added config to define port 2022-07-28 17:11:38 +03:00
Artem Tarasov
9921925bdb Web: Doceditor: express is included in server build, added required dependencies 2022-07-28 15:40:46 +03:00
cbb60432e6 Web: Client: SSO: refactoring 2022-07-28 15:29:05 +03:00
c4149beaab Web: Client: SSO: refactoring 2022-07-28 15:15:17 +03:00
832b6c9511 Web: Client: SSO: fix fill fields 2022-07-27 13:31:36 +03:00
6cf2d685ce Merge branch 'feature/sso' of https://github.com/ONLYOFFICE/AppServer into feature/sso 2022-07-27 11:11:44 +03:00
7ba0e002d2 Web: Client: SSO: fix upload metadata 2022-07-27 11:11:16 +03:00
0e0cc87aba Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/sso
# Conflicts:
#	public/locales/az/Common.json
#	public/locales/bg/Common.json
#	public/locales/cs/Common.json
#	public/locales/de/Common.json
#	public/locales/el/Common.json
#	public/locales/en/Common.json
#	public/locales/es/Common.json
#	public/locales/fi/Common.json
#	public/locales/fr/Common.json
#	public/locales/it/Common.json
#	public/locales/ja/Common.json
#	public/locales/ko/Common.json
#	public/locales/lo/Common.json
#	public/locales/lv/Common.json
#	public/locales/nl/Common.json
#	public/locales/pl/Common.json
#	public/locales/pt-BR/Common.json
#	public/locales/pt/Common.json
#	public/locales/ro/Common.json
#	public/locales/ru/Common.json
#	public/locales/sk/Common.json
#	public/locales/sl/Common.json
#	public/locales/tr/Common.json
#	public/locales/uk/Common.json
#	public/locales/vi/Common.json
#	public/locales/zh-CN/Common.json
2022-07-26 19:02:17 +03:00
6091fe7d2a Sso: fix 2022-07-26 18:14:53 +03:00
Artem Tarasov
2988838060 Merge branch 'develop' into bugfix/doceditor-fix 2022-07-26 12:32:41 +03:00
Artem Tarasov
2529a7a123 Web: Doceditor: fixed convert file 2022-07-26 12:32:04 +03:00
dc4f066b05 Merge branch 'develop' into feature/migrations-fix 2022-07-26 11:37:48 +03:00
Artem Tarasov
294cdf4881 Web: Files/Doceditor: fixed method call SharingPanel.convertSharingUsers (ssr) 2022-07-26 11:19:01 +03:00
Artem Tarasov
045c00b4ff Web: Common/Doceditor: fixed name of init state of editor 2022-07-26 10:56:25 +03:00
Artem Tarasov
42c42f19eb Merge branch 'develop' into bugfix/doceditor-fix 2022-07-25 18:05:08 +03:00
Artem Tarasov
d50a932443 Web: Doceditor: removed PreparePortalDialog and added a call to docEditor.showMessage when the portal is being restored 2022-07-25 17:57:44 +03:00
Artem Tarasov
eb352fd860 Web: Client/public: Moved PreparePortalTitle key from PreporationPortal.json to Common.json. 2022-07-25 17:54:51 +03:00
Artem Tarasov
64305a3c2c Web: Common/Doceditor: fixed request of build version and custom scheme 2022-07-25 17:10:38 +03:00
9062431197 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/sso 2022-07-25 17:02:18 +03:00
46a0d3f446 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into bugfix/article 2022-07-25 16:47:15 +03:00
Artem Tarasov
e701def2d7 Web: Common/Doceditor: fixed portal settings request 2022-07-25 16:24:10 +03:00
5e646b2992 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/sso 2022-07-25 16:20:47 +03:00
Artem Tarasov
ba40abd43e Web: Common/Doceditor: fixed user request when initializing auth state 2022-07-25 16:14:24 +03:00
Artem Tarasov
9dcff71504 Web: Doceditor/Client: fixed share settings request (ssr) 2022-07-25 14:52:18 +03:00
8acb550b08 files helpers moved to ASC.Files.Core 2022-07-25 14:03:31 +03:00
Artem Tarasov
57fb7ca7e1 Web: Doceditor: fixed api requests 2022-07-25 13:24:43 +03:00
57f797ab24 Merge branch 'develop' into feature/migrations-fix 2022-07-25 12:59:19 +03:00
c01edd78be Api: Capabilities fix 2022-07-25 12:57:03 +03:00
Artem Tarasov
06450fe804 Merge branch 'develop' into bugfix/doceditor-fix 2022-07-25 10:39:06 +03:00
Artem Tarasov
5656eb6072 Web: Doceditor: optimized dialog rendering 2022-07-25 10:37:57 +03:00
f2d0448670 Web: Client: Settings: fix header loader 2022-07-24 21:14:35 +03:00
473dcb4f74 Web: Client: Settings: add sso loader 2022-07-24 21:12:50 +03:00
61ec4a18da migrations moved to external projects 2022-07-24 16:02:00 +03:00
d92fb505b9 Web: Client: Settings: SSO: fix modal 2022-07-24 00:58:15 +03:00
ea74b77dcd Web: Client: move toast to shell 2022-07-24 00:50:19 +03:00
334d1d3969 Web: Client: move toast to shell 2022-07-24 00:45:33 +03:00
15c9b29d28 Web: Client: SSO: fix toast import 2022-07-24 00:44:05 +03:00
60469f901e Web: Client: Settings: SSO: fix disable save button 2022-07-24 00:31:29 +03:00
934dc28abe Web: Client: Settings: SSO: fix context scroll 2022-07-24 00:17:23 +03:00
a5ecd54dff Web: Client: Settings: SSO: fix generate cert 2022-07-24 00:16:35 +03:00
ce7e554927 Web: Client: Settings: SSO: fix metadata urls 2022-07-24 00:16:03 +03:00