Commit Graph

23380 Commits

Author SHA1 Message Date
ddc24796fe NavMenu: delete recover access 2022-08-16 12:26:42 +03:00
e08d1342c2 Login: fix style 2022-08-16 12:06:32 +03:00
34453e8cea Login: fix style 2022-08-16 11:47:54 +03:00
33574cfeb9 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/login-confirm-redesign 2022-08-16 11:43:01 +03:00
c03a12209e fixed total 2022-08-15 17:31:27 +03:00
92942fbcf6 People: fix 2022-08-15 14:30:50 +03:00
c79d5e5885 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/login-confirm-redesign
# Conflicts:
#	common/ASC.WebDav/.yarn/install-state.gz
2022-08-12 18:17:31 +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
c72a9b18e0 Login: comment signin with code 2022-08-12 14:40:25 +03:00
191f527028 Login: RoomsLogin: fix 2022-08-12 13:48:30 +03:00
d32cadc5e3 Login: RoomsLogin: add background pattern 2022-08-12 13:36:08 +03:00
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
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
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