|
|
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 |
|
|
|
4a1e1a88e7
|
add dbTenant in models and rename "tenant" to "tenantid"
|
2023-04-25 00:17:29 +03:00 |
|
|
|
4dad1d6067
|
Merge branch 'develop' into feature/optimization-ef
|
2023-04-10 23:19:56 +03:00 |
|
|
|
5aacc82904
|
fixed room history
|
2023-03-30 18:36:22 +03:00 |
|
|
|
63ee0ca117
|
UserDbContext - async
|
2023-03-24 10:53:49 +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 |
|
|
|
405ed839bb
|
CoreDbContext -async
|
2023-03-14 23:44:44 +03:00 |
|
|
|
8a8143950d
|
replace CreateScope() => CreateScopeAsync()
|
2023-01-24 20:33:27 +03:00 |
|
|
|
8ad635ba25
|
merge from release/rc-v1.2.0. fixed problem and update dll
|
2023-01-19 15:47:09 +03:00 |
|
|
|
ddd791096d
|
Feed.Aggregator: changed socket client resolving
|
2022-12-09 12:38:02 +03:00 |
|
|
|
b693486b46
|
merge from develop
|
2022-12-01 14:52:46 +03:00 |
|
|
|
130532927b
|
Merge branch 'develop' into feature/socket-newtag
|
2022-11-24 17:56:32 +03:00 |
|
|
|
0fb1e343a5
|
fix
|
2022-11-16 11:34:21 +03:00 |
|
|
|
4432bf7d22
|
Socket: async, refactoring
Files: markasnew
|
2022-11-13 20:33:19 +03:00 |
|
|
|
a4fd81b404
|
migrate from .net6 to .net7
|
2022-11-10 13:10:18 +03:00 |
|
|
|
789ab8f956
|
Merge branch 'develop' into feature/refactoring-saveUserInfo
# Conflicts:
# common/ASC.Core.Common/Context/Impl/UserManager.cs
# products/ASC.Files/Core/GlobalUsings.cs
# products/ASC.Files/Service/Core/FilesModule.cs
# products/ASC.Files/Service/Core/FoldersModule.cs
# products/ASC.People/Server/Api/UserController.cs
# web/ASC.Web.Core/QuotaSync.cs
# web/ASC.Web.Core/Users/UserManagerWrapper.cs
|
2022-11-09 12:57:16 +03:00 |
|
|
|
fa9dd5bd94
|
rename singnalR to socket
|
2022-10-27 15:37:26 +03:00 |
|
|
|
ee3714795e
|
fix
|
2022-10-27 14:18:39 +03:00 |
|
|
|
deb0c5beb7
|
remove .wait and .result
|
2022-10-27 13:49:42 +03:00 |
|
|
|
d838c937cc
|
Feed: moved portion size to config
|
2022-09-09 13:38:13 +03:00 |
|
|
|
a585a425bc
|
fix
|
2022-05-20 17:02:09 +03:00 |
|
|
|
a47c33f950
|
fix
|
2022-05-20 15:53:38 +03:00 |
|
|
|
4ff9fcd55a
|
add loggers
|
2022-05-11 18:45:37 +03:00 |
|
|
|
89059cf32e
|
Structured Logging
|
2022-04-28 12:15:33 +03:00 |
|
|
|
13bbce8ea4
|
Custom logger replaced with Microsoft.Extensions.Logging
|
2022-04-26 20:53:48 +03:00 |
|
|
|
97b45d3bd5
|
ILog: refactoring
|
2022-04-25 21:02:18 +03:00 |
|
|
|
6ecc8e7071
|
code cleanup
|
2022-04-14 22:42:15 +03:00 |
|
|
|
abae61f2db
|
IDE1006
|
2022-03-25 19:26:06 +03:00 |
|
|
|
62fbab1185
|
Merge branch 'feature/backend-refactor' into feature/warnings
|
2022-03-22 13:20:43 +03:00 |
|
|
|
80eb1c8257
|
IDE0011
|
2022-03-17 18:01:39 +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 |
|
|
|
99378a027e
|
Csproj: ImplicitUsings
|
2022-03-05 11:20:05 +03:00 |
|
|
|
e6f111f651
|
Merge branch 'feature/backend-refactor' into feature/asc-core-common-refactor
|
2022-02-25 20:16:00 +03:00 |
|
|
|
7ad1462b81
|
Merge branch 'feature/backend-refactor' into feature/asc-core-common-refactor
|
2022-02-21 12:51:45 +03:00 |
|
|
|
5b5ed4a4e3
|
Merge branch 'feature/backend-refactor' into feature/asc-feed-refactor
|
2022-02-18 18:55:59 +03:00 |
|
|
|
9c08a5c52e
|
Feed: moved feed migrations to ASC.Feed, resolved usings
|
2022-02-18 18:30:53 +03:00 |
|
|
|
73bfe9ae4d
|
FeedAggregator: moved GetService() call
|
2022-02-18 13:47:55 +03:00 |
|
|
|
ad93df5934
|
FeedAggregated: TimedHostedService replaced by BackgroundService, removed scope, removed monitor
|
2022-02-18 12:48:06 +03:00 |
|
|
|
794f021914
|
FeedAggregator: IServiceProvider replaced by IServiceScopeFactory
|
2022-02-15 18:34:01 +03:00 |
|
|
|
ca7140186d
|
Core: resolve properties for mapping, add mapping/projection
|
2022-02-15 13:30:05 +03:00 |
|
|
|
3d4337a1ad
|
FeedAggregator: used file-scoped namespaces
|
2022-02-11 18:42:50 +03:00 |
|
|
|
c979d72430
|
FeedAggregator: refactor
|
2022-02-11 17:59:18 +03:00 |
|
|
|
05d211bc1c
|
FeedAggregator: changed logger name
|
2022-02-11 16:57:42 +03:00 |
|
|
|
ab58c28bbe
|
FeedAggreagator: Feed Aggregator Service is divided into Aggregator and Cleaner
|
2022-02-11 14:39:42 +03:00 |
|
|
|
85c883afe8
|
FeedAggregator: refactor properties and fileds
|
2022-02-11 12:49:49 +03:00 |
|
|
|
ef7c77b669
|
Feed: add mapping
|
2022-02-10 20:48:08 +03:00 |
|
|
|
320a1f2250
|
Merge branch 'develop' into feature/backend-refactor
# Conflicts:
# common/ASC.Api.Core/Core/BaseStartup.cs
# common/ASC.Common/Caching/AscCache.cs
# common/ASC.Common/Data/StreamExtension.cs
# common/ASC.Common/Utils/RandomString.cs
# common/ASC.Core.Common/Billing/CouponManager.cs
# common/ASC.Core.Common/Billing/License/LicenseReader.cs
# common/ASC.Core.Common/Core/UserGroupRef.cs
# common/ASC.Core.Common/Data/DbTenantService.cs
# common/ASC.Core.Common/Notify/Jabber/JabberServiceClientWcf.cs
# common/ASC.Core.Common/Notify/Telegram/Dao/CachedTelegramDao.cs
# common/ASC.Data.Backup.Core/Core/DbHelper.cs
# common/ASC.Data.Backup.Core/Storage/BackupRepository.cs
# common/ASC.Data.Backup.Core/Tasks/Data/TableInfo.cs
# common/ASC.Data.Storage/BaseStorage.cs
# common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
# common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
# common/ASC.Data.Storage/RackspaceCloud/RackspaceCloudStorage.cs
# common/ASC.Data.Storage/S3/S3Storage.cs
# common/ASC.Notify.Textile/JabberStyler.cs
# common/ASC.Textile/Blocks/GlyphBlockModifier.cs
# common/ASC.Textile/States/TableRowFormatterState.cs
# common/services/ASC.ApiSystem/Classes/CommonMethods.cs
# common/services/ASC.ApiSystem/Controllers/PortalController.cs
# common/services/ASC.ClearEvents/Program.cs
# common/services/ASC.TelegramService/Startup.cs
# common/services/ASC.UrlShortener.Svc/Program.cs
# products/ASC.Files/Core/Core/Entries/File.cs
# products/ASC.Files/Core/Core/Entries/FileEntry.cs
# products/ASC.Files/Core/Core/Entries/FileHelper.cs
# products/ASC.Files/Core/Core/Entries/Folder.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderDaoBase.cs
# products/ASC.Files/Core/Helpers/ThirdpartyConfiguration.cs
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Core/Services/DocumentService/Configuration.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceConnector.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileDownloadOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
# products/ASC.Files/Server/Startup.cs
# products/ASC.Files/Service/Thumbnail/Builder.cs
# products/ASC.Files/Service/Thumbnail/FileDataProvider.cs
# products/ASC.People/Server/Startup.cs
# web/ASC.Web.Core/Files/DocumentService.cs
# web/ASC.Web.Core/Files/DocumentServiceLicense.cs
# web/ASC.Web.Core/QuotaSync.cs
# web/ASC.Web.Core/Sms/SmsKeyStorage.cs
# web/ASC.Web.Core/Users/UserManagerWrapper.cs
# web/ASC.Web.HealthChecks.UI/Program.cs
# web/ASC.Web.Studio/Startup.cs
|
2022-02-10 13:16:33 +03:00 |
|
|
|
812241a69a
|
Analyzers: fix
|
2022-02-07 17:53:58 +03:00 |
|
