|
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 |
|
TimofeyBoyko
|
c680c90580
|
Web:Components:add support dark-theme for tag component
|
2022-08-09 11:15:01 +03:00 |
|
TimofeyBoyko
|
012d347ca2
|
Web:Client: fix column width after switching from files to rooms
|
2022-08-09 10:57:30 +03:00 |
|
|
e6651821ce
|
SSO: fix exist certificate
|
2022-08-08 13:55:38 +03:00 |
|
|
b252732ed2
|
SSO: add translate
|
2022-08-08 13:55:23 +03:00 |
|
|
05ab23b63a
|
PortalSettings: fix after merge
|
2022-08-06 23:18:30 +03:00 |
|
|
28e0d02b28
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/sso
# Conflicts:
# packages/client/src/pages/PortalSettings/categories/integration/index.js
# packages/client/src/pages/PortalSettings/index.js
|
2022-08-06 23:12:39 +03:00 |
|
|
526b9ab82b
|
Web: Client: PortalSettings: Reworked preview page
|
2022-08-05 18:51:25 +03:00 |
|
|
72ea160e18
|
Web: Client: PortalSettings: Fixed portal integration page header
|
2022-08-05 18:50:39 +03:00 |
|
|
e972d28f87
|
SSO: fix
|
2022-08-05 18:10:45 +03:00 |
|
|
8c234ee0aa
|
SSO: fix forbidden image
|
2022-08-05 18:04:30 +03:00 |
|
|
08d8b4a580
|
Web: Client: Fixed isFrame as computed property
|
2022-08-05 17:26:30 +03:00 |
|
|
fce5867471
|
Web: Client: Fixed frameConfig property`s usage
|
2022-08-05 17:03:47 +03:00 |
|