|
655cccb5c1
|
add "AddBaseDbContextPool"
|
2022-08-12 15:06:49 +03:00 |
|
|
856c1a1266
|
Web: SelectFolderInput: Returned imports.
|
2022-08-12 13:53:12 +03:00 |
|
|
670fa09923
|
Returned settings.
|
2022-08-12 13:50:34 +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 |
|
|
c3252df9ec
|
Web: Added prop type.
|
2022-08-11 15:55:46 +03:00 |
|
|
c39451a531
|
Web: Added room selection.
|
2022-08-11 15:54:12 +03:00 |
|
|
e61b726a5d
|
Web: Fixed icons color.
|
2022-08-11 11:00:54 +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 |
|
|
d0ea9b4d7e
|
SSO: fix clear data
|
2022-08-10 13:47:45 +03:00 |
|
|
c0066f7eea
|
fix gitignore merge
|
2022-08-10 10:00:10 +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 |
|
|
ea2f03331b
|
refactoring
|
2022-08-09 19:13:07 +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 |
|
|
83e7ad25d2
|
SSO: fixed successful login
|
2022-08-09 17:14:35 +03:00 |
|
|
3dd880be41
|
Merge branch 'feature/sso' of https://github.com/ONLYOFFICE/AppServer into feature/sso
|
2022-08-09 16:53:53 +03:00 |
|
|
bfe43ebe96
|
SSO: fix login
|
2022-08-09 16:53:22 +03:00 |
|
Sergey Kirichenko
|
09be9c3907
|
Modify rabbit, redis docker running (#754)
* Modify rabbit, redis run
* Modify
STORAGE_ROOT
* Syntax modify
Co-authored-by: Alexey Golubev <alexey.golubev@onlyoffice.com>
|
2022-08-09 15:57:34 +03:00 |
|
|
717b1f899a
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into develop
|
2022-08-09 12:51:40 +03:00 |
|
|
6db28a8a86
|
warm up service: added logs
|
2022-08-09 12:51:32 +03:00 |
|
|
193c86c5a1
|
Merge pull request #755 from ONLYOFFICE/bugfix/room-list
Bugfix/room list
|
2022-08-09 12:02:41 +03:00 |
|
|
672a20fa7e
|
Merge branch 'develop' into bugfix/room-list
|
2022-08-09 11:56:20 +03:00 |
|
|
1313014659
|
Merge branch 'feature/sso' of github.com:ONLYOFFICE/AppServer into feature/sso
|
2022-08-09 11:46:13 +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 |
|
|
5f69b6bc0c
|
warm up services
|
2022-08-09 10:28:44 +03:00 |
|
|
f496771391
|
warm up services
|
2022-08-09 09:49:05 +03:00 |
|
|
588bb2f9d4
|
Merge branch 'feature/sso' of https://github.com/ONLYOFFICE/AppServer into feature/sso
|
2022-08-09 01:26:50 +03:00 |
|
|
562eb6144d
|
SSO: fix login
|
2022-08-09 01:26:27 +03:00 |
|
|
870c3cf3c4
|
warm up services
|
2022-08-08 19:25:22 +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 |
|
Eugene Kozyrev
|
6b1dc19992
|
Feature/Rename AppServer to DocSpace in windiows installation (#752)
* Rename AppServer to DocSpace
* Rename project
|
2022-08-08 11:01:15 +03:00 |
|
Eugene Kozyrev
|
f1e2a0b145
|
Edit StartMigrationRunner execution sequence (#753)
|
2022-08-08 10:48:46 +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 |
|
|
145fc1dbfa
|
Merge pull request #751 from ONLYOFFICE/feature/integration-system
Feature/integration system
|
2022-08-05 18:56:21 +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 |
|
|
65e7362ac8
|
Merge branch 'feature/sso' of github.com:ONLYOFFICE/AppServer into feature/sso
|
2022-08-05 17:49:27 +03:00 |
|
|
8d7de4ee8c
|
Merge branch 'feature/sso' of https://github.com/ONLYOFFICE/AppServer into feature/sso
|
2022-08-05 17:32:20 +03:00 |
|
|
8281b48006
|
SSO: fix SP action combo box
|
2022-08-05 17:32:04 +03:00 |
|
|
59160afcdc
|
SSO: fix template path
|
2022-08-05 17:29:17 +03:00 |
|
|
08d8b4a580
|
Web: Client: Fixed isFrame as computed property
|
2022-08-05 17:26:30 +03:00 |
|