pavelbannov d181d43b36 Merge branch 'develop' into feature/async ... # Conflicts: # common/services/ASC.Data.Backup/ASC.Data.Backup.csproj # products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs # products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs # products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs # products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs # products/ASC.Files/Core/Utils/EntryManager.cs # products/ASC.Files/Server/ASC.Files.csproj		2021-12-02 12:02:50 +03:00
..
Api	Merge branch 'develop' into feature/async	2021-12-02 12:02:50 +03:00
ApiModels	net6: refactoring and bugfix	2021-10-21 16:23:26 +03:00
Classes	Net: fix requests	2021-11-24 22:34:39 +03:00
Configuration	added Linq.Async to ASC.Files.Core	2021-11-02 15:12:28 +03:00
Core	Merge branch 'develop' into feature/async	2021-12-02 12:02:50 +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	net6: refactoring and bugfix	2021-10-21 16:23:26 +03:00
Middlewares	Security: added new method	2021-08-18 17:04:16 +03:00
Properties	merge from develop	2021-04-28 19:50:59 +03:00
proto	crm: migrate from old project	2021-03-01 20:36:18 +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	net6: refactoring and bugfix	2021-10-21 16:23:26 +03:00
Templates	ASC.CRM: first commit	2020-03-02 18:38:31 +03:00
Utils	Merge branch 'develop' into feature/async	2021-12-02 12:02:50 +03:00
appsettings.json	Added CRM	2021-01-26 20:36:03 +03:00
ASC.CRM.csproj	Removed unused dependencies. Fixed tests	2021-11-24 12:39:39 +03:00
Program.cs	net 6: remove TryUseWindowsService	2021-11-25 16:48:08 +03:00
Startup.cs	crm: refactoring	2021-06-04 19:27:44 +03:00