Commit Graph

3236 Commits

Author SHA1 Message Date
cc0e95adf1 PortalSettings: Branding: refactoring 2022-08-25 13:35:32 +03:00
543c6a222d Client: add translates 2022-08-25 13:35:15 +03:00
1354b95534 Client: delete useless translates 2022-08-25 13:00:22 +03:00
ceedc9a187 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/branding 2022-08-24 20:04:37 +03:00
Artem Tarasov
2b915db425 Web: Doceditor: applied nconf, logPath is now taken from appsettings.services.json 2022-08-24 16:30:37 +03:00
Artem Tarasov
ee757db2a8 Web: Doceditor: added nconf 2022-08-24 16:28:10 +03:00
Artem Tarasov
b8efdefbcd Web: Doceditor: fixed variable name for getting path to logs from environment 2022-08-24 13:35:57 +03:00
c470b590b9 PortalSettings: WhiteLabel: fix layout 2022-08-23 14:06:39 +03:00
44dd57910f PortalSettings: Branding: fix max width 2022-08-23 14:06:19 +03:00
5e3a65cce3 Client: add translates, remove duplicate 2022-08-23 14:05:56 +03:00
fb09b1e25a PortalSettings: move forbidden page 2022-08-23 13:22:05 +03:00
95a41119f6 Client: move translates 2022-08-23 13:21:37 +03:00
720b98c894 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/branding 2022-08-23 13:12:58 +03:00
5b5bc53c7a PortalSettings: add whitelabel loader 2022-08-17 11:27:59 +03:00
b65b7c75e5 Move translates from NavMenu to Login 2022-08-16 16:26:00 +03:00
36c52959e5 delete useless 2022-08-16 16:13:50 +03:00
a9591c875c Login: add recover access dialog 2022-08-16 12:51:28 +03:00
6ef8662ab3 Login: RecoverAccess: add logic 2022-08-16 12:50:35 +03:00
acd6ed8b57 Login: move recover access modal from client 2022-08-16 12:33:45 +03:00
fc12eb4873 NavMenu: delete useless 2022-08-16 12:33:09 +03:00
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
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
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
Artem Tarasov
649a9d5ed5 Web: Editor: fixed duplication of global styles on each request (production) 2022-08-12 11:26:54 +03:00
Artem Tarasov
7673750d41 Web: Editor: fixed duplication of global styles on each request 2022-08-12 10:02:41 +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
c2f5295b52 Confirm: fix style 2022-08-11 16:49:05 +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
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
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
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
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