Commit Graph

31 Commits

Author SHA1 Message Date
6a4ebb9854 Files: exclude thumbnails from quota 2023-06-02 17:08:15 +03:00
34bda20eb0 Merge branch 'develop' into feature/recalculate-user-quota
# Conflicts:
#	products/ASC.People/Server/Api/UserController.cs
2022-11-02 13:40:53 +03:00
00d5c50c5e remove "new TenantQuotaController" 2022-10-21 16:40:20 +03:00
d2bc57cbb1 Quota: fixed deleting quota 2022-10-20 14:47:45 +03:00
ea47a3c31e Quota: fixed adding quota 2022-10-20 14:38:38 +03:00
4dbf1e70b7 Merge branch 'develop' into feature/stripe
# Conflicts:
#	common/ASC.ActiveDirectory/GlobalUsings.cs
#	common/ASC.Data.Storage/StorageFactory.cs
#	common/ASC.Data.Storage/TenantQuotaController.cs
#	migrations/mysql/CoreDbContext/CoreDbContextModelSnapshot.cs
#	migrations/postgre/CoreDbContext/CoreDbContextModelSnapshot.cs
#	packages/client/src/pages/PortalSettings/categories/common/settingsBranding/whitelabel.js
#	products/ASC.People/Server/Api/UserController.cs
#	products/ASC.People/Server/GlobalUsings.cs
#	web/ASC.Web.Api/Api/Settings/SettingsController.cs
#	web/ASC.Web.Core/PublicResources/Resource.resx
#	web/ASC.Web.Core/Sms/StudioSmsNotificationSettings.cs
2022-10-10 19:16:03 +03:00
c8e6578c11 fix 2022-10-07 16:48:06 +03:00
5b96dbdb55 removed DbUsersQuotaRow 2022-10-07 16:37:57 +03:00
ccbbc5499e Quota: MaxFileSizeChecker 2022-09-19 22:49:41 +03:00
23731e8eab UserQuota: fix 2022-09-10 18:07:50 +03:00
882445e371 Quota: add user quota 2022-09-08 17:42:36 +03:00
1008e1c47e Quota: added users quota row table 2022-09-07 02:10:58 +03:00
6ecc8e7071 code cleanup 2022-04-14 22:42:15 +03:00
62fbab1185 Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00
6a09cf47e9 IDE0044 2022-03-17 18:07:17 +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
43892a29c6 Merge branch 'feature/backend-refactor' into feature/asc-storage-refactor
# Conflicts:
#	common/ASC.Data.Storage/BaseStorage.cs
#	common/ASC.Data.Storage/ChunkedUploader/CommonChunkedUploadSession.cs
#	common/ASC.Data.Storage/Configuration/StorageSettings.cs
#	common/ASC.Data.Storage/Constants.cs
#	common/ASC.Data.Storage/CrossModuleTransferUtility.cs
#	common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
#	common/ASC.Data.Storage/Encryption/EncryptionOperation.cs
#	common/ASC.Data.Storage/Encryption/EncryptionServiceClient.cs
#	common/ASC.Data.Storage/Encryption/EncryptionWorker.cs
#	common/ASC.Data.Storage/Extensions.cs
#	common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
#	common/ASC.Data.Storage/Migration/MigrateServiceClient.cs
#	common/ASC.Data.Storage/PathUtils.cs
#	common/ASC.Data.Storage/ProgressStream.cs
#	common/ASC.Data.Storage/RackspaceCloud/RackspaceCloudStorage.cs
#	common/ASC.Data.Storage/S3/S3Storage.cs
#	common/ASC.Data.Storage/StaticUploader.cs
#	common/ASC.Data.Storage/StorageFactory.cs
#	common/ASC.Data.Storage/StorageHandler.cs
#	common/ASC.Data.Storage/StorageUploader.cs
#	common/ASC.Data.Storage/TenantPath.cs
#	common/ASC.Data.Storage/TenantQuotaController.cs
#	common/ASC.Data.Storage/WebPath.cs
#	common/ASC.Data.Storage/Wildcard.cs
2022-02-16 12:47:11 +03:00
cc8b1ca7c5 Storage: used file-scoped namespaces 2022-02-10 14:24:16 +03:00
7a12c6cb13 Storage: add braces 2022-02-10 14:06:37 +03:00
460d054156 Storage: reordered methods according to access modifier, cosmetic changes 2022-02-10 13:43:28 +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
feb147590f Storage: privare properties replaced by private fields, used keyword readonly 2022-02-10 12:36:42 +03:00
7dfdde380d refactoring: add globalUsing: data.storage 2022-01-26 14:33:32 +03:00
4bf841581f Analizators/U2U1104 2022-01-14 16:12:37 +03:00
c1b7ea5a9a Storage: moved from 08a01422 2021-05-21 16:26:42 +03:00
bfa73ec5c2 moved from 2e37dcd0 2020-12-28 16:22:08 +03:00
f71d59df53 TenantQuotaController: optimization 2020-11-24 13:56:24 +03:00
maksim
326d352a7c Migration: registering dependencies in program 2020-08-20 16:53:39 +03:00
SuhorukovAnton
df8b6fd8b0 private: firtst version 2020-08-12 12:58:08 +03:00
2722dfd693 moved from hotfix/10.5.2 2020-01-21 15:44:05 +03:00