pavelbannov a66c03aa86 Merge branch 'develop' into feature/logger-refactoring ... # Conflicts: # common/ASC.Common/Caching/AscCache.cs # common/ASC.Common/GlobalUsings.cs # common/ASC.Core.Common/Notify/Telegram/TelegramHelper.cs # common/ASC.Data.Backup.Core/Service/ProgressItems/RestoreProgressItem.cs # common/ASC.Data.Storage/GlobalUsings.cs # common/services/ASC.Data.Backup.BackgroundTasks/GlobalUsings.cs # common/services/ASC.Data.Backup.BackgroundTasks/IntegrationEvents/EventHandling/BackupDeleteScheldureRequestedIntegrationEventHandler.cs # common/services/ASC.Data.Backup.BackgroundTasks/Services/BackupSchedulerService.cs # common/services/ASC.Notify/GlobalUsings.cs # common/services/ASC.Notify/IntegrationEvents/EventHandling/NotifyInvokeSendMethodRequestedIntegrationEventHandler.cs # common/services/ASC.Notify/Services/NotifySenderService.cs # common/services/ASC.TelegramService/GlobalUsings.cs # common/services/ASC.TelegramService/TelegramHandler.cs # products/ASC.Files/Core/Core/FileStorageService.cs # products/ASC.Files/Core/GlobalUsings.cs # products/ASC.Files/Service/Thumbnail/IntegrationEvents/EventHandling/ThumbnailRequestedIntegrationEventHandler.cs # products/ASC.People/Server/Api/UserController.cs # web/ASC.Web.Api/Api/Settings/StorageController.cs		2022-05-24 23:13:57 +03:00
..
nginx	Merge branch 'develop' into feature/SSO-new	2022-04-28 15:45:11 +03:00
appsettings.json	Merge branch 'develop' into feature/logger-refactoring	2022-05-24 23:13:57 +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	renamed providers to lowercase	2021-09-24 17:36:46 +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	Modify elasticsearch configuration file (#290)	2021-06-25 10:14:53 +03:00
kafka.json	Merge branch 'develop' into feature/virtual-rooms-1.2	2022-04-21 18:54:28 +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
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	SsoAuth: 2e37dcd0	2021-05-31 11:35:42 +03:00
storage.json	refactoring	2022-01-13 22:17:56 +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
workbox-config.js	Web: SW: Added SW unregister + refactoring	2021-11-25 15:08:18 +03:00
workbox-dev-config.js	Fix sw.js creation	2021-07-21 18:28:56 +03:00