Commit Graph

98 Commits

Author SHA1 Message Date
21f8dd92fd Web: Added disconnect button. 2022-08-15 16:26:27 +03:00
c729229e14 Web: Refactoring, added error handler when provider changed. 2022-08-15 14:27:24 +03:00
d941020ef3 Web: Added updating folder list when changed provider. 2022-08-15 11:02:07 +03:00
af491f2a53 Web: Added new prop for connect dialog. 2022-08-15 10:20:28 +03:00
e3d82a9f7a Web: Restore/ManualBackup: Refactoring, added file selection. 2022-08-14 16:11:07 +03:00
e5846be9ad Web: Refactoring, fixed bugs after merge. 2022-08-12 17:32:22 +03:00
055102cdac Web: Fixed bugs after merge. 2022-08-12 17:13:16 +03:00
856c1a1266 Web: SelectFolderInput: Returned imports. 2022-08-12 13:53:12 +03:00
6c2b49470c WEb: Fixed after merge. 2022-08-12 13:25:29 +03:00
4463fc6e8f Merge branch 'develop' into feature/docspace-backup
# Conflicts:
#	packages/asc-web-common/api/settings/index.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/auto-backup/sub-components/ButtonContainer.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/common-container/DirectConnectionContainer.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/common-container/DirectThirdPartyConnection.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/common-container/FormConnection.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/common-container/GetThirdPartyStoragesOptions.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/consumer-storage-settings/InputsMethods.js
#	packages/common/components/Loaders/AutoBackupLoader/StyledAutoBackup.js
#	packages/common/components/Loaders/AutoBackupLoader/index.js
#	packages/common/components/Loaders/DataBackupLoader/StyledDataBackup.js
#	packages/common/components/Loaders/DataBackupLoader/index.js
#	packages/common/components/Loaders/RestoreBackupLoader/StyledRestoreBackup.js
#	packages/common/components/Loaders/RestoreBackupLoader/index.js
#	products/ASC.Files/Client/src/components/panels/SelectFileDialog/index.js
#	products/ASC.Files/Client/src/components/panels/SelectFileInput/index.js
#	products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js
#	products/ASC.Files/Client/src/components/panels/SelectFolderInput/index.js
#	products/ASC.Files/Client/src/components/panels/SelectionPanel/SelectionPanelBody.js
#	products/ASC.Files/Server/GlobalUsings.cs
#	web/ASC.Web.Client/public/locales/en/Settings.json
#	web/ASC.Web.Client/public/locales/ru/Settings.json
#	web/ASC.Web.Client/src/components/pages/Settings/Layout/Article/Body/index.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/StyledBackup.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/auto-backup/index.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/auto-backup/sub-components/DocumentsModule.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/auto-backup/sub-components/ThirdPartyModule.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/auto-backup/sub-components/ThirdPartyStorageModule.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/consumer-storage-settings/AmazonSettings.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/consumer-storage-settings/GoogleCloudSettings.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/consumer-storage-settings/RackspaceSettings.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/consumer-storage-settings/SelectelSettings.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/index.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/sub-components/DocumentsModule.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/sub-components/ThirdPartyModule.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/sub-components/ThirdPartyStorageModule.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/sub-components/storages/AmazonStorage.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/sub-components/storages/GoogleCloudStorage.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/sub-components/storages/RackspaceStorage.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/sub-components/storages/SelectelStorage.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/index.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/sub-components/DocumentsModule.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/sub-components/ThirdPartyResourcesModule.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/sub-components/ThirdPartyStoragesModule.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/sub-components/storages/AmazonStorage.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/sub-components/storages/GoogleCloudStorage.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/sub-components/storages/RackspaceStorage.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/sub-components/storages/SelectelStorage.js
#	web/ASC.Web.Client/src/components/pages/Settings/index.js
#	web/ASC.Web.Client/src/components/pages/Settings/utils/settingsTree.js
#	web/ASC.Web.Client/src/store/BackupStore.js
2022-08-11 17:10:37 +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
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
e47e8ed4c1 SSO: fix padding 2022-08-05 03:07:41 +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
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