Commit Graph

23511 Commits

Author SHA1 Message Date
938b34bcdc Login: redesign 2022-08-12 13:33:38 +03:00
4638c8dca5 Login: add translates 2022-08-12 13:33:20 +03:00
f60aaef514 Login: CodeLogin: add logo 2022-08-12 13:32:58 +03:00
ba66b55d4d Login: fix register height 2022-08-12 13:07:42 +03:00
3bbd457505
Merge branch 'develop' into feature/login-confirm-redesign 2022-08-12 12:05:40 +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
Artem Tarasov
045850f3a9 Web: Login: fixed types, client preparation 2022-08-11 18:31:06 +03:00
Artem Tarasov
c185c07030 Web: Login: migrated StyledLogin 2022-08-11 18:11:19 +03:00
Artem Tarasov
f211b5a771 Web: Login: fixed duplicate global styles on every request 2022-08-11 17:45:13 +03:00
484d1867e6 Confirm: fix style 2022-08-11 17:43:39 +03:00
eea2c0c656 Components: FormWrapper: fix min-width 2022-08-11 17:43:30 +03:00
6316de2937 Components: FormWrapper: fix width 2022-08-11 17:17:21 +03:00
962ebd4e9c Confirm: fix style 2022-08-11 17:16:20 +03:00
44bd9f1d6d Files: fix 2022-08-11 16:55:35 +03:00
c2f5295b52 Confirm: fix style 2022-08-11 16:49:05 +03:00
2936cb4ca2 Files: fix 2022-08-11 16:44:08 +03:00
e54617c275 Files: fix 2022-08-11 16:37:18 +03:00
f4caa90745 Confirm: fix style 2022-08-11 16:36:17 +03:00
1f035e9556 Confirm: fix style 2022-08-11 16:30:11 +03:00
6a386f9be0 Confirm: fix style 2022-08-11 15:22:44 +03:00
8c3bc03f6d Components: FormWrapper: fix width 2022-08-11 15:22:30 +03:00
18863258a0 Confirm: fix style 2022-08-11 14:53:43 +03:00
0ad8be0d1a Files: fix 2022-08-11 14:30:01 +03:00
Artem Tarasov
64cf09eed0 Web: Login: added I18nextProvider 2022-08-11 13:41:31 +03:00
Artem Tarasov
f196e9f47c Web: Login: added initialization window.i18n 2022-08-11 13:26:48 +03:00
Artem Tarasov
0241a9f5e8 Web: Login: added transfer of initializing state and i18n on the server 2022-08-11 11:33:38 +03:00
Artem Tarasov
abaccc3074 Web: Login: added getting state on the client 2022-08-11 11:31:52 +03:00
Artem Tarasov
61ed72d647 Web: Login: added types 2022-08-11 11:30:43 +03:00
Artem Tarasov
cb6b8fcc7a Web: Login: fix mf config 2022-08-11 11:29:43 +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
2aed8eb3a0 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/login-confirm-redesign
# Conflicts:
#	packages/asc-web-components/index.js
#	packages/client/src/DocspaceLogo/index.js
#	packages/client/src/pages/Confirm/ConfirmWrapper.js
#	packages/components/form-wrapper/index.js
#	web/ASC.Web.Client/src/Shell.jsx
#	web/ASC.Web.Client/src/components/NavMenu/sub-components/header-unauth.js
#	web/ASC.Web.Client/src/components/pages/Confirm/index.js
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/StyledConfirm.js
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changeOwner.js
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changePassword.js
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changePhone.js
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/createUser.js
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/profileRemove.js
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/tfaActivation.js
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/tfaAuth.js
#	web/ASC.Web.Login/src/Login.jsx
#	web/ASC.Web.Login/src/StyledLogin.js
2022-08-10 16:16:43 +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