Commit Graph

119 Commits

Author SHA1 Message Date
ccbbc5499e Quota: MaxFileSizeChecker 2022-09-19 22:49:41 +03:00
4b0fc12efc Payment: rename 2022-09-19 18:03:25 +03:00
5848bf5cd3 Api: payments check 2022-09-19 17:56:45 +03:00
6f710be0c2 Quota: refactoring 2022-09-09 17:39:28 +03:00
83f4545f02 Quota: refactoring 2022-09-08 10:23:26 +03:00
58b9eb3172 Quota: refactoring 2022-09-07 16:26:03 +03:00
ddeb4157ad Quota: used field 2022-09-06 23:30:19 +03:00
2c758355bc Quota: added used field 2022-09-06 18:35:30 +03:00
941689b6ca Quota: refactoring 2022-09-06 12:14:08 +03:00
20dcd59616 Merge branch 'develop' into feature/push 2022-08-23 13:24:36 +03:00
9b5e966559 removed unused DisposableHttpContext 2022-08-19 13:56:32 +03:00
5b8374daa0 refactoring 2022-08-18 19:00:22 +03:00
46caff0b0c Push: post merge fixes 2022-08-15 01:00:11 +03:00
2314d6fc47 Merge branch 'develop' into feature/async-fix
# Conflicts:
#	common/ASC.Socket.IO/.yarn/install-state.gz
#	common/ASC.SsoAuth/.yarn/install-state.gz
#	common/ASC.UrlShortener/.yarn/install-state.gz
#	common/ASC.WebDav/.yarn/install-state.gz
2022-08-11 22:33:13 +03:00
ea2f03331b refactoring 2022-08-09 19:13:07 +03:00
baaec9dcef Merge branch 'develop' into feature/async-fix
# Conflicts:
#	common/ASC.Socket.IO/.yarn/install-state.gz
#	common/ASC.SsoAuth/.yarn/install-state.gz
#	common/ASC.UrlShortener/.yarn/install-state.gz
#	common/ASC.WebDav/.yarn/install-state.gz
2022-08-09 16:27:35 +03:00
870c3cf3c4 warm up services 2022-08-08 19:25:22 +03:00
d26eee0424 Async: fix webhook 2022-08-05 18:47:33 +03:00
fe5c8b0b13 fixed tests and tools 2022-07-29 20:23:19 +03:00
dba122eb96 Common, files: added dbcontext pool 2022-07-28 21:00:49 +03:00
8d89d8e8f2 Common: added dbcontext pool 2022-07-28 15:29:03 +03:00
74d238bde8 Merge branch 'release/v1.2' into develop
# Conflicts:
#	common/ASC.Common/Caching/KafkaCache.cs
#	common/ASC.Common/Logging/Log.cs
#	common/ASC.Core.Common/Notify/Engine/DispatchEngine.cs
#	common/ASC.Core.Common/Notify/Engine/NotifyEngine.cs
#	common/ASC.Data.Backup.Core/ASC.Data.Backup.Core.csproj
#	common/ASC.Data.Backup.Core/BackupResource.Designer.cs
#	common/ASC.Data.Storage/ChunkedUploader/CommonChunkedUploadSession.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/ASC.Notify.Textile.csproj
#	common/services/ASC.AuditTrail/ASC.AuditTrail.csproj
#	products/ASC.Files/Core/ASC.Files.Core.csproj
#	products/ASC.Files/Core/Core/Compress/CompressToArchive.cs
#	products/ASC.Files/Core/Core/Compress/CompressToTarGz.cs
#	products/ASC.Files/Core/Core/Compress/CompressToZip.cs
#	products/ASC.Files/Core/Core/Compress/ICompress.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs
#	products/ASC.Files/Core/Helpers/Global.cs
#	products/ASC.Files/Core/Resources/FilesJSResource.Designer.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/FileMarkAsReadOperation.cs
#	products/ASC.Files/Core/Utils/EntryManager.cs
#	web/ASC.Web.Api/ASC.Web.Api.csproj
#	web/ASC.Web.Core/Notify/StudioNotifyServiceHelper.cs
#	web/ASC.Web.Core/Notify/StudioNotifyServiceSender.cs
2022-06-30 16:13:31 +03:00
fe39f4d398 fix namespaces 2022-04-26 21:34:27 +03:00
13bbce8ea4 Custom logger replaced with Microsoft.Extensions.Logging 2022-04-26 20:53:48 +03:00
cb2580dd50 refactoring 2022-04-15 12:08:06 +03:00
6ecc8e7071 code cleanup 2022-04-14 22:42:15 +03:00
26947072c6 Merge branch 'feature/backend-refactor' into feature/warnings
# Conflicts:
#	common/ASC.Common/Threading/DistributedTaskProgress.cs
#	common/ASC.Common/Threading/DistributedTaskQueue.cs
#	common/ASC.Core.Common/Configuration/AmiPublicDnsSyncService.cs
#	common/ASC.Core.Common/Notify/Engine/NotifyRequest.cs
#	common/ASC.Core.Common/Notify/Model/NotifyClientImpl.cs
#	common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
#	common/ASC.Data.Reassigns/QueueWorker.cs
#	common/ASC.Data.Reassigns/ReassignProgressItem.cs
#	common/ASC.Data.Reassigns/RemoveProgressItem.cs
#	common/ASC.Data.Storage/StaticUploader.cs
#	products/ASC.Files/Core/ApiModels/ResponseDto/FileDto.cs
#	products/ASC.Files/Core/ApiModels/ResponseDto/FolderDto.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxDaoBase.cs
#	products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxDaoBase.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveDaoBase.cs
#	products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveDaoBase.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxDaoBase.cs
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Core/HttpHandlers/ThirdPartyAppHandler.ashx.cs
#	products/ASC.Files/Core/HttpHandlers/docusignhandler.ashx.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/FileOperation.cs
#	products/ASC.Files/Core/Utils/EntryManager.cs
#	web/ASC.Web.Core/CollaboratorSettings.cs
#	web/ASC.Web.Core/CustomNavigationSettings.cs
#	web/ASC.Web.Core/EmailActivationSettings.cs
#	web/ASC.Web.Core/Notify/NotifyConfiguration.cs
#	web/ASC.Web.Core/Notify/SpamEmailSettings.cs
#	web/ASC.Web.Core/Notify/StudioNotifyHelper.cs
#	web/ASC.Web.Core/Notify/StudioNotifyService.cs
#	web/ASC.Web.Core/Notify/StudioNotifyServiceSender.cs
#	web/ASC.Web.Core/Notify/StudioPeriodicNotify.cs
#	web/ASC.Web.Core/Notify/StudioWhatsNewNotify.cs
#	web/ASC.Web.Core/PersonalSettings.cs
#	web/ASC.Web.Core/PrivacyRoomSettings.cs
#	web/ASC.Web.Core/PromotionsSettings.cs
#	web/ASC.Web.Core/QuotaSync.cs
#	web/ASC.Web.Core/Sms/SmsSender.cs
#	web/ASC.Web.Core/Sms/StudioSmsNotificationSettings.cs
#	web/ASC.Web.Core/StudioAdminMessageSettings.cs
#	web/ASC.Web.Core/StudioDefaultPageSettings.cs
#	web/ASC.Web.Core/StudioTrustedDomainSettings.cs
#	web/ASC.Web.Core/TariffSettings.cs
#	web/ASC.Web.Core/Tfa/TfaAppAuthSettings.cs
#	web/ASC.Web.Core/Tfa/TfaAppUserSettings.cs
#	web/ASC.Web.Core/TipsSettings.cs
#	web/ASC.Web.Core/Users/CustomNamingPeople.cs
#	web/ASC.Web.Core/Users/UserHelpTourSettings.cs
#	web/ASC.Web.Core/Users/UserPhotoManager.cs
#	web/ASC.Web.Core/Users/UserPhotoThumbnailManager.cs
#	web/ASC.Web.Core/Users/UserPhotoThumbnailSettings.cs
#	web/ASC.Web.Core/Utility/ColorThemesSettings.cs
#	web/ASC.Web.Core/Utility/PasswordSettings.cs
#	web/ASC.Web.Core/Utility/Settings/TenantAccessSettings.cs
#	web/ASC.Web.Core/Utility/Settings/WebItemSettings.cs
#	web/ASC.Web.Core/Utility/Settings/WizardSettings.cs
#	web/ASC.Web.Core/Utility/TenantExtra.cs
#	web/ASC.Web.Core/WhiteLabel/AdditionalWhiteLabelSettings.cs
#	web/ASC.Web.Core/WhiteLabel/CompanyWhiteLabelSettings.cs
#	web/ASC.Web.Core/WhiteLabel/TenantInfoSettings.cs
#	web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
2022-04-14 15:21:06 +03:00
2f06b0a013 EventBus: refactoring 2022-04-01 19:12:53 +03:00
90623263e9 merge from feature/backend-refactor 2022-03-29 23:29:03 +03:00
df8b7182b6 merge feature/backend-refactor 2022-03-29 16:12:36 +03:00
4fe34215c9
Merge pull request #580 from ONLYOFFICE/feature/files-mapping
Feature/files mapping
2022-03-29 16:59:43 +04:00
81f3a1fb09 DistributedTaskQueue refactoring. set MaxThreadsCount to 1 2022-03-26 16:31:13 +03:00
cd1d3058ff DistributedTaskQueue refactoring 2022-03-25 19:15:28 +03:00
63e12f49ab merge from feature/backend-refactor 2022-03-23 14:56:18 +03:00
4e78af53f9 refactoring DistributedTaskQueue 2022-03-22 15:10:05 +03:00
62fbab1185 Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00
b4c44d1b09 Merge branch 'feature/backend-refactor' into feature/files-controller-refactor 2022-03-21 19:03:57 +03:00
cf8c1ba3ff Merge branch 'feature/backend-refactor' into feature/files-mapping 2022-03-21 18:52:09 +03:00
ff79769307 Files: improvements for automapping 2022-03-18 11:51:33 +03:00
389bb3024f added support ILog<T> interface 2022-03-17 23:09:45 +03:00
717456d71d CA1805 2022-03-17 17:33:16 +03:00
21f85e7260 logger refactoring. added resolver ILog/IOptionsMonitor<ILog> 2022-03-17 09:55:08 +03:00
65db98f65c added new license headers 2022-03-15 21:00:53 +03:00
882507496d added new routing mechanism 2022-03-14 13:57:59 +03:00
2585c22b3b merge from feature/backend-refactor 2022-03-09 12:10:30 +03:00
1b352c76f6 Added using AddControllers method 2022-03-03 14:04:17 +03:00
609427bf20 merge from feature/backend-refactor 2022-03-01 15:57:49 +03:00
9ca71764ef EventBus: added ASC.EventBus.MemoryCache for testing. Refactoring. 2022-02-28 17:48:55 +03:00
7e67e9a41c merge from develop 2022-02-24 17:33:02 +03:00
70ed0d72b7 added IntegrationEventLog from eShopOnContainers template. refactoring. 2022-02-14 14:18:58 +03:00