pavelbannov 868492b562 Merge branch 'develop' into feature/backend-refactor ... # Conflicts: # common/ASC.Common/Threading/DistributedTaskQueue.cs # common/ASC.Core.Common/Billing/BillingClient.cs # common/ASC.Core.Common/Billing/TariffService.cs # common/ASC.Core.Common/Notify/Context.cs # common/ASC.FederatedLogin/Helpers/OAuth20TokenHelper.cs # common/ASC.FederatedLogin/Helpers/RequestHelper.cs # common/ASC.FederatedLogin/LoginProviders/DocuSignLoginProvider.cs # common/ASC.FederatedLogin/LoginProviders/FacebookLoginProvider.cs # common/ASC.FederatedLogin/LoginProviders/GoogleLoginProvider.cs # common/ASC.FederatedLogin/LoginProviders/GosUslugiLoginProvider.cs # common/ASC.FederatedLogin/LoginProviders/LinkedInLoginProvider.cs # common/ASC.FederatedLogin/LoginProviders/MailRuLoginProvider.cs # common/ASC.FederatedLogin/LoginProviders/VKLoginProvider.cs # common/ASC.FederatedLogin/LoginProviders/WordpressLoginProvider.cs # common/ASC.FederatedLogin/LoginProviders/YandexLoginProvider.cs # common/services/ASC.ElasticSearch/Engine/BaseIndexer.cs # common/services/ASC.Studio.Notify/Program.cs # common/services/ASC.Webhooks.Service/WebhookSender.cs # products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs # products/ASC.Files/Core/Core/Thirdparty/Box/BoxProviderInfo.cs # products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveProviderInfo.cs # products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs # products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveProviderInfo.cs # products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs # products/ASC.Files/Core/Core/Thirdparty/ProviderAccountDao.cs # products/ASC.Files/Core/Helpers/DocuSignHelper.cs # products/ASC.Files/Core/Helpers/EasyBibHelper.cs # products/ASC.Files/Core/Helpers/WordpressHelper.cs # products/ASC.Files/Core/Services/NotifyService/NotifyClient.cs # products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs # products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs # products/ASC.Files/Core/ThirdPartyApp/Token.cs # products/ASC.Files/Server/Controllers/FilesController.cs		2022-03-19 22:16:03 +03:00
..
Api	Merge branch 'feature/backend-refactor' into feature/files-refactor	2022-03-10 12:31:05 +03:00
ApiModels	People: separated people controller	2022-02-28 22:23:39 +03:00
Classes	VoipService: refactor mapping	2022-03-04 19:35:12 +03:00
Configuration	CRM: fix build	2022-03-16 17:19:34 +03:00
Core	refactoring async methods	2022-02-16 15:57:37 +03:00
DocStore	ASC.CRM: first commit	2020-03-02 18:38:31 +03:00
InvoiceTemplates	ASC.CRM: first commit	2020-03-02 18:38:31 +03:00
Mapping/TypeConverter	Merge branch 'feature/backend-refactor' into feature/files-refactor	2022-03-05 11:50:42 +03:00
Middlewares	Merge branch 'develop' into feature/async	2022-02-12 00:51:48 +03:00
Properties	merge from develop	2021-04-28 19:50:59 +03:00
proto	refactoring *.proto files according to https://bit.ly/3KcZ0Ef	2022-01-11 19:28:48 +03:00
ReportTemplates	ASC.CRM: first commit	2020-03-02 18:38:31 +03:00
Resources	merge from develop	2021-04-01 16:28:36 +03:00
Services/NotifyService	analizators/U2U1023	2022-01-12 15:34:58 +03:00
Templates	ASC.CRM: first commit	2020-03-02 18:38:31 +03:00
Utils	refactoring async methods	2022-02-16 15:57:37 +03:00
appsettings.json	Added CRM	2021-01-26 20:36:03 +03:00
ASC.CRM.csproj	cache: return support kafka. refactoring	2022-01-27 15:20:51 +03:00
Program.cs	add *.dll for support redis + update Grpc.* dll	2021-12-23 16:17:31 +03:00
Startup.cs	analizators/U2U1025	2022-01-13 14:19:39 +03:00