Commit Graph

41 Commits

Author SHA1 Message Date
Vashchuk Nikita
5aa99ec811 Merge branch 'develop' into feature/async
# Conflicts:
#	common/ASC.Common/Caching/KafkaCache.cs
#	common/ASC.Data.Backup.Core/Storage/BackupRepository.cs
#	common/services/ASC.AuditTrail/AuditEventsRepository.cs
#	common/services/ASC.AuditTrail/LoginEventsRepository.cs
#	products/ASC.Files/Core/ASC.Files.Core.csproj
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs
#	products/ASC.Files/Core/Utils/MailMergeTask.cs
#	products/ASC.Files/Server/ASC.Files.csproj
#	products/ASC.Files/Service/Thumbnail/FileDataProvider.cs
2022-02-04 16:04:52 +03:00
9ac985c2f2 crm: CurrencyProvider: fixed init in constructor 2022-01-21 20:32:55 +03:00
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
13e13f2303 Net: fix requests 2021-11-24 22:34:39 +03:00
Vashchuk Nikita
43e2a65081 Spreading async in Files 2021-11-15 14:31:47 +03:00
e310d5e655 net6: httpClient: add using 2021-10-21 17:56:31 +03:00
f6f317ec42 net6: refactoring and bugfix 2021-10-21 16:23:26 +03:00
b6461e46f4 net6: replacing System.Drawing with ImageSharp 2021-10-18 14:24:05 +03:00
735a9b60cf net6: warning CA1416
also remove unnecessary usings
2021-10-13 11:07:03 +03:00
ae9a3187bc net6: warning SYSLIB0014 2021-10-12 13:14:33 +03:00
Vashchuk Nikita
1896457adb added asynchrony to FileDao 2021-08-26 15:32:44 +03:00
b791586252 net6 2021-08-25 18:26:13 +03:00
cf87addaa3 Security: added new method 2021-08-18 17:04:16 +03:00
d783bd8ab4 crm: fixed warnings 2021-06-18 20:38:32 +03:00
58e7e41cdd crm: code cleanup 2021-06-04 17:38:42 +03:00
e75e048e49 crm: fixed build 2021-06-02 18:24:49 +03:00
d7e3e71194 crm: removed DataContract attribute. 2021-05-31 19:37:00 +03:00
ccd30b7b90 crm: refactoring. used JsonPropertyName instead of DataMember 2021-05-31 19:14:59 +03:00
a9a7c0a4b7 crm: refactoring 2021-05-28 20:20:12 +03:00
401c8ca2e2 crm: migrate from newtonsoft to system.text.json 2021-05-28 18:18:55 +03:00
c8e5c5a93c crm: migrate from ProgressQueue to DistributedTaskQueue 2021-05-24 12:56:49 +03:00
bbe1f1f205 crm: code refactoring 2021-05-17 17:50:55 +03:00
92ce702b28 crm: refactoring. bugfix 2021-05-05 17:09:05 +03:00
635d20580f crm: refactoring 2021-04-06 20:33:28 +03:00
393ada80fc crm: bugfix 2021-03-31 19:21:54 +03:00
4ee1cf80b5 crm: fixed reports query 2021-03-26 19:42:46 +03:00
ec05e8dc9a crm: refactoring & bugfix 2021-03-24 18:55:47 +03:00
11acb31f54 crm: refactoring 2021-03-23 18:41:56 +03:00
6da70a1449 crm: refactoring 2021-03-19 19:56:26 +03:00
30222afaa4 crm: refactoring 2021-03-13 21:00:08 +03:00
e061a6db9e crm: migrate from old project 2021-03-02 19:29:07 +03:00
8afbae082e crm: migrate from old project 2021-03-01 20:36:18 +03:00
083d25bcd6 CRM: продолжаю переносить проект 2021-02-24 19:50:07 +03:00
a6d618ce96 crm: migrate Api to EF Core 2020-04-22 23:46:49 +03:00
35762e45ee crm: migrate Api to EF Core 2020-04-16 22:41:37 +03:00
9928c9bc46 crm: migrate DAO to EF Core 2020-04-14 21:59:32 +03:00
f76724aa04 crm: migrate DAO to EF Core 2020-04-14 17:35:52 +03:00
4fb3f62086 crm: migrate DAO to EF Core 2020-04-14 10:59:07 +03:00
f8f3f09cc4 crm: migrate DAO to EF Core 2020-04-10 00:22:26 +03:00
6313464cdf crm: migrate DAO to EF Core 2020-04-02 22:42:03 +03:00
5783511366 ASC.CRM: first commit 2020-03-02 18:38:31 +03:00