|
|
12a83327b0
|
Web: Added payments page.
|
2022-08-16 10:49:34 +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 |
|
|
|
be3fc664ca
|
Web: Integration: Fixed methods names: getItems -> getList, setItemsView -> setListView. Changed openCrateFileModal, openCrateFolderModal, openCrateRoomModal to openModal(type, options)
|
2022-08-05 15:02:49 +03:00 |
|
|
|
3babfa0f99
|
Client: PortalIntegration: Fixed message event binding
|
2022-08-05 13:47:54 +03:00 |
|
|
|
b1e65a25b0
|
SSO: wait tReady
|
2022-08-05 13:12:20 +03:00 |
|
|
|
b5f05f73d3
|
SSO: fix modal buttons
|
2022-08-05 13:03:35 +03:00 |
|
|
|
ecd1ca05d9
|
SSO: add loader, fix double error
|
2022-08-05 13:00:29 +03:00 |
|
|
|
3de884d0f9
|
Merge branch 'develop' into feature/integration-system
|
2022-08-05 11:12:32 +03:00 |
|
|
|
3ac5550727
|
SSO: fix style
|
2022-08-05 10:30:27 +03:00 |
|
|
|
0cdbaa4a83
|
SSO: fix style
|
2022-08-05 03:26:50 +03:00 |
|
|
|
077daa7d1d
|
Components: Themes: fix
|
2022-08-05 03:26:28 +03:00 |
|
|
|
e47e8ed4c1
|
SSO: fix padding
|
2022-08-05 03:07:41 +03:00 |
|
|
|
c7b0b4addd
|
Components: HelpButton: fix size
|
2022-08-05 03:07:29 +03:00 |
|
|
|
bf90c710be
|
Components: Submenu: fix style
|
2022-08-05 02:54:39 +03:00 |
|
|
|
9101f90f18
|
SSO: fix modal style
|
2022-08-05 02:44:05 +03:00 |
|
|
|
a254ced4c3
|
SSO: fix table style
|
2022-08-05 01:43:23 +03:00 |
|
|
|
db75f31e28
|
SSO: add help btn
|
2022-08-05 01:43:07 +03:00 |
|
|
|
c09751c8a0
|
SSO: fix icon
|
2022-08-05 00:59:28 +03:00 |
|
|
|
746d5f3795
|
SSO: add copy link
|
2022-08-05 00:59:16 +03:00 |
|
|
|
acbcd337f6
|
Components: InputBlock: fix icon
|
2022-08-05 00:58:50 +03:00 |
|
|
|
fa9f50d1b7
|
Web: Fix many keys translation issues (prefix Home -> Files)
|
2022-08-04 18:35:32 +03:00 |
|
|
|
1230674026
|
Web: Fix 'ContainsSpecCharacter' key translation
|
2022-08-04 18:31:27 +03:00 |
|
|
|
33220f701b
|
Web: Fix 'NewRoom' key translation
|
2022-08-04 18:29:45 +03:00 |
|
|
|
9215ec53fc
|
Web: Fix 'EmptyFolderHeader' key translation
|
2022-08-04 18:27:41 +03:00 |
|
|
|
1b5ae746ac
|
Web: Fix 'FileRemoved' key translation
|
2022-08-04 18:26:17 +03:00 |
|
|
|
b28915462b
|
Web: Fix login and logout
|
2022-08-04 18:23:19 +03:00 |
|
|
|
7741d235f7
|
Web: Optimization of store
|
2022-08-04 17:34:53 +03:00 |
|
|
|
b0039e6c4f
|
SSO: fix styles
|
2022-08-04 14:43:12 +03:00 |
|
|
|
cf0e9e05a1
|
SSO: fix translate
|
2022-08-04 14:42:59 +03:00 |
|
|
|
1926a9c4b3
|
Client: PortalSettings: Fixed integration api script path
|
2022-08-04 13:32:19 +03:00 |
|
|
|
ffd01f52c2
|
Common: SettingsStore: Removed base integration frame config
|
2022-08-04 13:31:35 +03:00 |
|
|
|
87909ca9ed
|
Client: Home: Added base integration frame init after load client inside frame
|
2022-08-04 13:30:42 +03:00 |
|
|
|
11098da084
|
Common: Utils: Added methods for interacting with integration frame: frameCallbackData, frameCallCommand
|
2022-08-04 13:29:42 +03:00 |
|
|
|
c879c78dd5
|
SSO: fix set action
|
2022-08-04 12:52:00 +03:00 |
|
|
|
f7b24248da
|
Section: fix settings style
|
2022-08-04 01:36:19 +03:00 |
|
|
|
8767e532b7
|
SSO: fix style
|
2022-08-04 01:36:02 +03:00 |
|
|
|
ed67603126
|
Web: SSO: Fix setFields by api response config
|
2022-08-03 14:52:13 +03:00 |
|
|
|
4af1247136
|
Web: Integration: Restored after merge develop
|
2022-08-03 14:48:54 +03:00 |
|
|
|
bf99da04bf
|
SSO: fix style
|
2022-08-02 18:22:34 +03:00 |
|
|
|
28698beeee
|
SSO: fix placeholders
|
2022-08-02 18:04:10 +03:00 |
|
|
|
928ee509ad
|
Components: Headline: fix size
|
2022-08-02 18:03:25 +03:00 |
|
|
|
bb49d50560
|
SSO: fix style
|
2022-08-02 17:46:50 +03:00 |
|
|
|
2ee692d007
|
SSO: fix validate error
|
2022-08-02 17:41:02 +03:00 |
|
|
|
c8c4395d4c
|
SSO: fix modal style
|
2022-08-02 17:35:19 +03:00 |
|
|
|
18bb507835
|
SSO: fix style
|
2022-08-02 16:51:25 +03:00 |
|
|
|
8fff10bb1a
|
SSO: add disable
|
2022-08-02 16:20:19 +03:00 |
|
|
|
dcd559d560
|
SSO: fix
|
2022-08-02 16:16:59 +03:00 |
|
|
|
5d057906b3
|
SSO: fix styles
|
2022-08-02 16:14:07 +03:00 |
|
|
|
ad75ae40d3
|
SSO: show metadata if enable
|
2022-08-02 12:36:05 +03:00 |
|
|
|
3514d1a60f
|
SSO: fix modal
|
2022-08-02 12:33:41 +03:00 |
|
|
|
03b03ed910
|
Merge branch 'develop' into feature/sso
# Conflicts:
# packages/client/public/images/actions.upload.react.svg
# packages/client/public/images/empty_screen_privacy.png
# packages/client/public/locales/en/SingleSignOn.json
# packages/client/public/locales/ru/SingleSignOn.json
# packages/client/src/helpers/constants.js
# packages/client/src/pages/PortalSettings/categories/integration/index.js
# packages/client/src/pages/PortalSettings/categories/integration/sub-components/consumerItem.js
# packages/client/src/pages/PortalSettings/categories/integration/sub-components/consumerModalDialog.js
# packages/client/src/pages/PortalSettings/categories/integration/sub-components/consumerToggle.js
# packages/client/src/pages/PortalSettings/categories/integration/sub-components/modalDialogContainer.js
# packages/client/src/pages/PortalSettings/categories/integration/sub-components/ssoLoader.js
# packages/client/src/pages/PortalSettings/categories/integration/thirdPartyServicesSettings.js
# packages/client/src/store/SsoFormStore.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/ThirdPartyServicesSettings/index.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/ThirdPartyServicesSettings/sub-components/consumerItem.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/ThirdPartyServicesSettings/sub-components/consumerModalDialog.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/ThirdPartyServicesSettings/sub-components/consumerToggle.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/ThirdPartyServicesSettings/sub-components/modalDialogContainer.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/sub-components/consumerItem.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/sub-components/consumerModalDialog.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/sub-components/consumerToggle.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/sub-components/modalDialogContainer.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/thirdPartyServicesSettings.js
|
2022-08-02 12:05:15 +03:00 |
|
|
|
27fa822017
|
Web: Commented useless code
|
2022-08-01 19:47:29 +03:00 |
|
|
|
72878d5ca8
|
Web: Fix open NavMenu on Mobile
|
2022-08-01 18:47:11 +03:00 |
|
|
|
ac3683d7ab
|
Web: Fix i18n ns name for Files.json
|
2022-08-01 18:12:15 +03:00 |
|
|
|
af5cfe6553
|
Web: Rename translation file on 'en'
|
2022-08-01 18:03:27 +03:00 |
|
|
|
ebc6ce1d67
|
Web: Commented console logs
|
2022-08-01 17:53:26 +03:00 |
|
|
|
7000cd55f6
|
Merge branch 'develop' into refactoring/client
|
2022-08-01 15:59:18 +03:00 |
|
|
|
d093c97b97
|
Web: Renamed 'studio' to 'client' (bat-files, nginx configs, react, MF, themes)
|
2022-08-01 15:37:33 +03:00 |
|
|
|
fd21ad788c
|
Web: Portal-Settings: Hide security/admins
|
2022-08-01 14:53:26 +03:00 |
|
|
|
3ed5ca8706
|
Web: Fix old url to /filter
|
2022-08-01 14:52:18 +03:00 |
|
|
|
fa04e92286
|
Web: Added TODO: Change url by category
|
2022-08-01 13:30:26 +03:00 |
|
|
|
ec70758d79
|
Web: Fix some old urls to /filter
|
2022-08-01 13:29:27 +03:00 |
|
