IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4463fc6e8f
DocSpace-buildtools/common
History
Tatiana Lopaeva 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
..
ASC.ActiveDirectory removed BaseDbContext 2022-07-29 15:53:29 +03:00
ASC.Api.Core refactoring 2022-08-09 19:13:07 +03:00
ASC.Common Merge branch 'feature/sso' of https://github.com/ONLYOFFICE/AppServer into feature/sso 2022-08-10 15:33:13 +03:00
ASC.Core.Common packages updated 2022-08-01 13:58:12 +03:00
ASC.Data.Backup.Core Merge branch 'develop' into feature/docspace-backup 2022-08-11 17:10:37 +03:00
ASC.Data.Encryption Merge branch 'develop' into feature/12.0 2022-06-17 19:19:00 +03:00
ASC.Data.Reassigns Renaming folders for contexts and models 2022-07-01 14:23:07 +03:00
ASC.Data.Storage Merge branch 'develop' into feature/docspace-backup 2022-08-11 17:10:37 +03:00
ASC.EventBus Merge branch 'develop' into feature/docspace-backup 2022-08-11 17:10:37 +03:00
ASC.EventBus.Extensions.Logger fixed tests and tools 2022-07-29 20:23:19 +03:00
ASC.EventBus.RabbitMQ packages updated 2022-08-01 13:58:12 +03:00
ASC.FederatedLogin packages updated 2022-08-01 13:58:12 +03:00
ASC.Feed fixed tests and tools 2022-07-29 20:23:19 +03:00
ASC.IPSecurity packages updated 2022-08-01 13:58:12 +03:00
ASC.MessagingSystem Common, files: added dbcontext pool 2022-07-28 21:00:49 +03:00
ASC.Migration warm up services 2022-08-08 19:25:22 +03:00
ASC.Notify.Textile Merge branch 'release/v1.2' into develop 2022-06-30 16:13:31 +03:00
ASC.Resource.Manager refactoring 2022-07-15 12:48:15 +03:00
ASC.Socket.IO Added install-state.gz to .gitignore 2022-08-03 17:22:10 +03:00
ASC.SsoAuth SSO: fix login 2022-08-09 01:26:27 +03:00
ASC.Textile refactoring 2022-04-15 12:08:06 +03:00
ASC.Thumbnails moved from ddf515b8 2022-06-09 18:36:57 +03:00
ASC.UrlShortener Added install-state.gz to .gitignore 2022-08-03 17:22:10 +03:00
ASC.WebDav Added install-state.gz to .gitignore 2022-08-03 17:22:10 +03:00
ASC.Webhooks.Core packages updated 2022-08-01 13:58:12 +03:00
services refactoring 2022-08-09 19:13:07 +03:00
Tests Merge branch 'develop' into refactoring/client 2022-08-01 15:59:18 +03:00
Tools fixed tests and tools 2022-07-29 20:23:19 +03:00