pavelbannov f52f32a6af Merge branch 'develop' into feature/asc.apicache ... # Conflicts: # common/ASC.Core.Common/EF/Context/BaseDbContext.cs # common/ASC.Data.Backup.Core/Service/ProgressItems/BackupProgressItem.cs # common/ASC.Data.Backup.Core/Storage/ConsumerBackupStorage.cs # common/ASC.Data.Backup.Core/Storage/DocumentsBackupStorage.cs # common/ASC.Data.Backup.Core/Tasks/BackupPortalTask.cs # common/ASC.Data.Backup.Core/Tasks/PortalTaskBase.cs # common/Tools/ASC.Migration.Creator/Program.cs # common/Tools/ASC.Migration.Runner/Program.cs # common/Tools/ASC.MigrationPersonalToDocspace/MigrationCreator.cs # common/Tools/ASC.MigrationPersonalToDocspace/MigrationRunner.cs		2023-02-07 17:07:20 +03:00
..
nginx	Merge branch 'develop' into feature/asc.apicache	2023-02-07 17:07:20 +03:00
activemq.test.json	activemq: added configs	2022-10-24 14:48:53 +03:00
apicache.json	refactoring	2022-12-22 18:48:05 +03:00
apisystem.dev.json	Build: Docker: fix run api-system	2022-12-09 16:37:19 +03:00
apisystem.json	Update apisystem.json - remove "api-cache"	2023-01-10 14:40:00 +03:00
appsettings.dev.json	Config: Added blank appsettings.dev.json for docker containers	2022-11-22 12:05:39 +03:00
appsettings.json	Merge branch 'develop' into feature/asc.apicache	2023-02-07 17:07:20 +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: add regions	2022-09-05 14:27:38 +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
feed.json	discarded feed changes	2022-10-07 17:16:32 +03:00
kafka.json	Web: revert config	2022-07-05 23:37:56 +03:00
kafka.test.json
nlog.config	change format logs for CloudWatch	2022-11-08 15:37:52 +03:00
notify.json	Notify: removed schedulers. Fixed send	2023-01-19 23:13:29 +03:00
plugins.json	Plugins: add logs, config and change service start	2022-08-26 12:51:43 +03:00
rabbitmq.json	rabbitmq: extended config	2022-09-08 14:20:01 +03:00
rabbitmq.test.json	redditmq: fixed config setup	2022-09-09 15:56:24 +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
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	fixed StorageHandler class	2022-12-22 18:48:30 +03:00
thumb.json
thumb.test.json	Thumb: fix	2020-06-26 12:55:19 +03:00
urlshortener.test.json