IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
670fa09923
DocSpace-client/config
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
..
nginx Nginx: Restored files handlers 2022-08-01 17:53:57 +03:00
appsettings.json Web: revert config 2022-07-05 23:37:56 +03:00
appsettings.services.json bugfix and refactoring urlShortener 2022-02-24 14:45:52 +03:00
appsettings.test.json fix test config 2022-03-30 16:20:50 +03:00
autofac.consumers.json backup s3 2022-07-25 16:13:36 +03:00
autofac.json logger refactoring. added resolver ILog/IOptionsMonitor<ILog> 2022-03-17 09:55:08 +03:00
autofac.products.json Added solution filter 2021-10-25 14:29:36 +03:00
backup.json Backup: refactoring 2020-06-03 12:15:05 +03:00
elastic.json ElasticSearch: disabled by default 2022-07-01 12:53:18 +03:00
elastic.test.json ElasticSearch: disabled by default 2022-07-01 12:53:18 +03:00
kafka.json Web: revert config 2022-07-05 23:37:56 +03:00
kafka.test.json kafka disabled by default 2019-08-23 15:49:23 +03:00
nlog.config Nlog: removed default settings. 2022-05-24 21:58:15 +03:00
notify.json Notify: added email sender 2019-09-25 13:36:22 +03:00
rabbitmq.json merge from feature/backend-refactor 2022-03-29 23:29:03 +03:00
rabbitmq.test.json add support rabbitmq. split ASC.Data.Backup service on two services 2022-02-04 20:44:03 +03:00
radicale.config moved from ddf515b8 2022-06-17 18:46:16 +03:00
radicale.log.config moved from ddf515b8 2022-06-17 18:46:16 +03:00
radicale.rights moved from ddf515b8 2022-06-17 18:46:16 +03:00
redis.json merge from feature/backend-refactor 2022-03-29 23:29:03 +03:00
redis.test.json refactoring: ICacheNotify<T> map to MemoryCacheNotify by default then RedisConfiguration is null 2022-01-12 12:58:07 +03:00
socket.json Socket.IO: Move pingInterval and reconnectAttempts to config 2022-02-09 12:11:39 +03:00
socket.test.json socket: fix 2022-03-30 22:26:44 +03:00
ssoauth.json Cosmetic modify 2022-07-05 18:09:51 +03:00
storage.json Files: added logos for rooms 2022-06-02 21:41:16 +03:00
thumb.json Thumbnails: fix 2020-06-17 14:00:28 +03:00
thumb.test.json Thumb: fix 2020-06-26 12:55:19 +03:00
urlshortener.test.json fix log, added UrlShortenerService config 2020-05-21 11:03:35 +03:00