IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3e0910df17
DocSpace-client/common/ASC.Data.Storage
History
pavelbannov bc6b0d9e0d Merge branch 'hotfix/v1.1.2' into develop 
# Conflicts:
#	common/ASC.Core.Common/ASC.Core.Common.csproj
#	common/ASC.Core.Common/Billing/ITariffService.cs
#	common/ASC.Core.Common/Billing/TariffService.cs
#	common/ASC.Core.Common/Data/DbTenantService.cs
#	common/ASC.Core.Common/Notify/EmailSenderSink.cs
#	common/ASC.Core.Common/Notify/JabberSenderSink.cs
#	common/ASC.Core.Common/Notify/PushSenderSink.cs
#	common/ASC.Core.Common/Notify/Telegram/TelegramSenderSink.cs
#	common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
#	common/Tools/ASC.Migration.Creator/ASC.Migration.Creator.csproj
#	migrations/mysql/SaaS/BackupsContext/BackupsContextModelSnapshot.cs
#	migrations/mysql/SaaS/CoreDbContext/20230130103905_CoreDbContextMigrate.Designer.cs
#	migrations/mysql/SaaS/CoreDbContext/20230130103905_CoreDbContextMigrate.cs
#	migrations/mysql/SaaS/CoreDbContext/CoreDbContextModelSnapshot.cs
#	migrations/mysql/SaaS/FilesDbContext/FilesDbContextModelSnapshot.cs
#	migrations/mysql/SaaS/MessagesContext/MessagesContextModelSnapshot.cs
#	migrations/mysql/SaaS/TenantDbContext/TenantDbContextModelSnapshot.cs
#	migrations/mysql/SaaS/WebhooksDbContext/WebhooksDbContextModelSnapshot.cs
#	migrations/mysql/SaaS/WebstudioDbContext/WebstudioDbContextModelSnapshot.cs
#	migrations/postgre/SaaS/BackupsContext/BackupsContextModelSnapshot.cs
#	migrations/postgre/SaaS/CoreDbContext/CoreDbContextModelSnapshot.cs
#	migrations/postgre/SaaS/CustomDbContext/CustomDbContextModelSnapshot.cs
#	migrations/postgre/SaaS/FilesDbContext/FilesDbContextModelSnapshot.cs
#	migrations/postgre/SaaS/MessagesContext/MessagesContextModelSnapshot.cs
#	migrations/postgre/SaaS/TenantDbContext/TenantDbContextModelSnapshot.cs
#	migrations/postgre/SaaS/WebstudioDbContext/WebstudioDbContextModelSnapshot.cs
#	packages/client/src/helpers/constants.js
#	packages/client/src/pages/Files.jsx
#	packages/client/src/pages/PortalSettings/categories/common/Customization/language-and-time-zone.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/restore-backup/index.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/restore-backup/sub-components/backup-list/index.js
#	packages/client/src/pages/PortalSettings/categories/developer-tools/index.js
#	packages/client/src/pages/PortalSettings/categories/integration/index.js
#	packages/client/src/pages/PortalSettings/categories/security/index.js
#	packages/client/src/pages/Profile/Section/Header/index.js
#	packages/common/store/SettingsStore.js
#	packages/components/drop-down/index.js
#	products/ASC.Files/Core/Core/Security/FileSecurity.cs
#	products/ASC.Files/Server/Api/FoldersController.cs
#	products/ASC.Files/Server/Api/SecurityController.cs
#	products/ASC.Files/Server/Api/SettingsController.cs
#	products/ASC.Files/Server/Api/TagsController.cs
#	products/ASC.People/Server/Api/ThirdpartyController.cs
#	products/ASC.People/Server/Api/UserController.cs
#	web/ASC.Web.Api/Api/AuthenticationController.cs
#	web/ASC.Web.Api/Api/FeedController.cs
#	web/ASC.Web.Api/Api/PaymentsController.cs
#	web/ASC.Web.Api/Api/PortalController.cs
#	web/ASC.Web.Api/Api/SecurityController.cs
#	web/ASC.Web.Api/Api/Settings/SettingsController.cs
#	web/ASC.Web.Api/Core/DnsSettings.cs
#	web/ASC.Web.Api/Core/FirstTimeTenantSettings.cs
#	web/ASC.Web.Api/GlobalUsings.cs
#	web/ASC.Web.Core/CookiesManager.cs
#	web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
#	yarn.lock
2023-08-28 18:53:10 +03:00
..
ChunkedUploader fix await using 2023-06-01 14:27:27 +03:00
Configuration Merge remote-tracking branch 'remotes/origin/feature/api-descriptions' into feature/api-develop 2023-08-01 17:07:05 +03:00
DiscStorage Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
Encryption fix await using 2023-06-01 14:27:27 +03:00
GoogleCloud backend: updated some dll 2023-08-08 19:43:14 +03:00
Log fixed DeleteExpiredService 2023-03-10 22:32:30 +03:00
Migration refactoring 2022-04-15 12:08:06 +03:00
protos refactoring *.proto files according to https://bit.ly/3KcZ0Ef 2022-01-11 19:28:48 +03:00
RackspaceCloud Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
S3 Merge branch 'hotfix/v1.1.2' into develop 2023-08-28 18:53:10 +03:00
Selectel
ZipOperators fix await using 2023-06-01 14:27:27 +03:00
ASC.Data.Storage.csproj backend: updated some dll 2023-08-10 19:16:25 +03:00
BaseStorage.cs Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
Constants.cs Storage: Constants: added secure key header 2023-04-27 17:40:15 +03:00
CrossModuleTransferUtility.cs fix await using 2023-06-01 14:27:27 +03:00
DataList.cs added new license headers 2022-03-15 21:00:53 +03:00
GlobalUsings.cs chunk backup 2022-12-14 15:55:41 +03:00
IDataStore.cs Merge remote-tracking branch 'remotes/origin/feature/api-descriptions' into feature/api-develop 2023-08-01 17:07:05 +03:00
IQuotaController.cs Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
PathUtils.cs code cleanup 2022-04-14 22:42:15 +03:00
SecureHelper.cs Merge branch 'develop' into feature/public-room-backend 2023-06-02 16:42:16 +03:00
StaticUploader.cs fix await using 2023-06-01 14:27:27 +03:00
StorageFactory.cs fix migrations 2023-06-27 12:18:04 +03:00
StorageHandler.cs Merge branch 'develop' into feature/public-room-backend 2023-07-12 14:37:37 +03:00
StorageUploader.cs WebstudioDbContext -async 2023-03-24 19:24:59 +03:00
TenantPath.cs GetDataStore tenant string to int 2022-10-28 15:23:51 +03:00
TenantQuotaController.cs Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
WebPath.cs remove internal methods 2023-05-26 13:45:41 +03:00
Wildcard.cs code cleanup 2022-04-14 22:42:15 +03:00