Commit Graph

37 Commits

Author SHA1 Message Date
bfb9a096e6 Merge branch 'develop' into feature/optimization-queries
# Conflicts:
#	common/ASC.Core.Common/Billing/License/LicenseReader.cs
#	common/ASC.Core.Common/Billing/TariffService.cs
#	common/ASC.Core.Common/Data/DbAzService.cs
#	common/ASC.Core.Common/Data/DbQuotaService.cs
#	common/ASC.Core.Common/Data/DbSubscriptionService.cs
#	common/ASC.Core.Common/Data/DbTenantService.cs
#	common/ASC.Core.Common/Data/DbUserService.cs
#	common/ASC.Data.Backup.Core/Core/DbHelper.cs
#	common/ASC.Feed/Data/FeedAggregateDataProvider.cs
#	common/ASC.Feed/Data/FeedReadedDataProvider.cs
#	common/ASC.IPSecurity/Data/IPRestrictionsRepository.cs
#	common/ASC.Webhooks.Core/DbWorker.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs
#	products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs
2023-06-27 18:29:23 +03:00
986561d4e9 Merge branch 'develop' into feature/delete-portal
# Conflicts:
#	common/ASC.Core.Common/Billing/TariffService.cs
#	common/ASC.Core.Common/Caching/CachedQuotaService.cs
#	common/ASC.Core.Common/Caching/CachedTenantService.cs
#	common/ASC.Core.Common/Context/Impl/TenantManager.cs
#	common/ASC.Core.Common/Core/ITenantService.cs
#	common/ASC.Core.Common/Data/DbAzService.cs
#	common/ASC.Core.Common/Data/DbQuotaService.cs
#	common/ASC.Core.Common/Data/DbSubscriptionService.cs
#	common/ASC.Core.Common/Data/DbTenantService.cs
#	common/ASC.Core.Common/Data/DbUserService.cs
#	common/ASC.Core.Common/HostedSolution.cs
#	common/ASC.Data.Backup.Core/Core/DbHelper.cs
#	common/ASC.Data.Storage/TenantQuotaController.cs
#	common/ASC.Feed/Data/FeedAggregateDataProvider.cs
#	common/ASC.Feed/Data/FeedReadedDataProvider.cs
#	common/ASC.IPSecurity/Data/IPRestrictionsRepository.cs
#	common/services/ASC.ApiSystem/Controllers/PeopleController.cs
#	migrations/mysql/FilesDbContext/FilesDbContextModelSnapshot.cs
#	migrations/postgre/FilesDbContext/FilesDbContextModelSnapshot.cs
#	products/ASC.Files/Core/Configuration/FilesSpaceUsageStatManager.cs
#	products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs
#	products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs
#	products/ASC.People/Server/Api/ThirdpartyController.cs
#	web/ASC.Web.Api/Api/AuthenticationController.cs
#	web/ASC.Web.Api/Api/ConnectionsController.cs
#	web/ASC.Web.Api/Api/PortalController.cs
#	web/ASC.Web.Api/Api/Settings/LicenseController.cs
#	web/ASC.Web.Core/HttpHandlers/SsoHandler.cs
#	web/ASC.Web.Core/Sms/SmsManager.cs
#	web/ASC.Web.Core/Tfa/TfaManager.cs
2023-06-08 15:53:31 +03:00
75ebc4ce65 fix await using 2023-06-01 14:27:27 +03:00
1dce9ba876 refactoring 2023-06-01 13:54:19 +03:00
a6cfdc252e fix 2023-05-31 12:04:20 +03:00
9eeec5cc10 CompileAsyncQuery: FeedReadedDataProvider 2023-05-30 11:06:18 +03:00
8d7219c0e0 async refactoring 2023-05-19 14:42:02 +03:00
4a1e1a88e7 add dbTenant in models and rename "tenant" to "tenantid" 2023-04-25 00:17:29 +03:00
aac1896a0f remove CreateDbContextAsync and fix ExecuteAsync 2023-03-28 00:25:55 +03:00
a3800de721 TenantDbContext -async part1 2023-03-20 19:16:00 +03:00
e4acd2776c FeedDbContext - async 2023-03-15 13:04:34 +03:00
d0fe06052e Db: optimization 2022-12-21 15:57:32 +03:00
25ae19d601 Merge branch 'develop' into feature/remove-waste 2022-09-09 11:52:13 +03:00
02d4be8950 remove waste asc.feed 2022-09-08 10:52:51 +03:00
e966afb49a Feed: fix 2022-09-01 18:19:22 +03:00
dba122eb96 Common, files: added dbcontext pool 2022-07-28 21:00:49 +03:00
abae61f2db IDE1006 2022-03-25 19:26:06 +03:00
65db98f65c added new license headers 2022-03-15 21:00:53 +03:00
3d50d7977b removed past license headers 2022-03-15 19:59:24 +03:00
e6f111f651 Merge branch 'feature/backend-refactor' into feature/asc-core-common-refactor 2022-02-25 20:16:00 +03:00
ca7140186d Core: resolve properties for mapping, add mapping/projection 2022-02-15 13:30:05 +03:00
927352c637 Feed: used file-scoped namespaces 2022-02-10 21:39:04 +03:00
e9c52a232d Feed: add braces 2022-02-10 19:59:02 +03:00
ccd017a927 Feed: refactor properties and fields 2022-02-10 19:53:52 +03:00
cac7680343 refactoring: add globalUsings: feed 2022-01-26 15:38:14 +03:00
2d75554b0d DbContext: optimization 2021-07-15 13:07:47 +03:00
830c73a134 Scope: refactoring 2020-10-19 18:53:15 +03:00
SuhorukovAnton
df8b6fd8b0 private: firtst version 2020-08-12 12:58:08 +03:00
a5280a1694 Added DIHelper 2020-02-17 11:58:14 +03:00
f696558445 EF: AddOrUpdate 2019-12-17 16:01:59 +03:00
6466aa9fc4 EF: Feed 2019-12-10 13:01:45 +03:00
e82366a2cd DI: dbManager 2019-10-21 15:33:02 +03:00
2ebe431c98 DI: configuration 2019-10-10 11:52:21 +03:00
4e2c04c9f7 DI: TenantManager 2019-09-17 15:42:32 +03:00
e2a4311a29 Dependency injection
Packages updated
2019-09-09 15:56:33 +03:00
9e32ad4b6c IDE0063 2019-08-15 18:08:40 +03:00
377287570a Added ASC.Feed, ASC.IPSecurity
Added Resources
2019-06-14 19:14:24 +03:00