IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
33,733 Commits 40 Branches 22 Tags 420 MiB
f184fa61c6
Commit Graph

98 Commits

Author SHA1 Message Date
SuhorukovAnton
44c6178ebd Bug 62403 - Settings:Restore. backup tenants_tariffrow 2023-05-06 00:02:00 +03:00
SuhorukovAnton
0b929fe1d9 writer.WriteEntry outside ActionInvoker.Try 2023-04-07 17:57:56 +03:00
MaksimChegulov
b160e00dae Backup: added collaborator group 2023-02-17 11:27:48 +03:00
pavelbannov
f52f32a6af Merge branch 'develop' into feature/asc.apicache 
# Conflicts:
#	common/ASC.Core.Common/EF/Context/BaseDbContext.cs
#	common/ASC.Data.Backup.Core/Service/ProgressItems/BackupProgressItem.cs
#	common/ASC.Data.Backup.Core/Storage/ConsumerBackupStorage.cs
#	common/ASC.Data.Backup.Core/Storage/DocumentsBackupStorage.cs
#	common/ASC.Data.Backup.Core/Tasks/BackupPortalTask.cs
#	common/ASC.Data.Backup.Core/Tasks/PortalTaskBase.cs
#	common/Tools/ASC.Migration.Creator/Program.cs
#	common/Tools/ASC.Migration.Runner/Program.cs
#	common/Tools/ASC.MigrationPersonalToDocspace/MigrationCreator.cs
#	common/Tools/ASC.MigrationPersonalToDocspace/MigrationRunner.cs
 2023-02-07 17:07:20 +03:00
pavelbannov
c89b8ca427 Merge branch 'master' into develop 
# Conflicts:
#	common/ASC.Data.Backup.Core/Core/FileBackupProvider.cs
#	common/ASC.Data.Backup.Core/Service/ProgressItems/BackupProgressItem.cs
#	common/ASC.Data.Backup.Core/Service/ProgressItems/RestoreProgressItem.cs
#	common/ASC.Data.Backup.Core/Storage/BackupStorageFactory.cs
#	common/ASC.Data.Backup.Core/Storage/DataStoreBackupStorage.cs
#	common/ASC.Data.Backup.Core/Storage/DocumentsBackupStorage.cs
#	common/ASC.Data.Backup.Core/Tasks/BackupPortalTask.cs
#	common/ASC.Data.Backup.Core/Tasks/PortalTaskBase.cs
#	common/ASC.Data.Backup.Core/Tasks/TransferPortalTask.cs
#	products/ASC.Files/Core/ASC.Files.Core.csproj
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs
 2023-02-07 14:31:22 +03:00
SuhorukovAnton
4f60f9f8b9 add column removed in backup_backup 2023-01-27 18:12:02 +03:00
pavelbannov
40b15cc06e Merge branch 'develop' into feature/asc.apicache 
# Conflicts:
#	common/ASC.Data.Backup.Core/Core/FileBackupProvider.cs
#	common/ASC.Data.Backup.Core/Service/ProgressItems/BackupProgressItem.cs
#	common/ASC.Data.Backup.Core/Storage/BackupStorageFactory.cs
#	common/ASC.Data.Backup.Core/Storage/DataStoreBackupStorage.cs
#	common/ASC.Data.Backup.Core/Storage/DocumentsBackupStorage.cs
#	common/ASC.Data.Backup.Core/Tasks/BackupPortalTask.cs
#	common/ASC.Data.Backup.Core/Tasks/PortalTaskBase.cs
#	common/ASC.Data.Backup.Core/Tasks/TransferPortalTask.cs
 2023-01-26 22:31:26 +03:00
SuhorukovAnton
403e993a3f bugfix backup tenants_tariff 2023-01-26 11:49:17 +03:00
SuhorukovAnton
db951d00e6 asc.apicache 2022-12-16 15:41:09 +03:00
SuhorukovAnton
02c9adc57b chunk backup 2022-12-14 15:55:41 +03:00
Alexey Safronov
426a11d080 Merge branch 'develop' into release/rc-v1.2.0 2022-12-12 19:33:41 +03:00
pavelbannov
143a4d01ec removed unused variables 2022-12-09 17:47:46 +03:00
pavelbannov
6e45bc5aa8 removed unused variables 2022-12-09 16:34:00 +03:00
SuhorukovAnton
3068359636 refactoring 2022-11-29 16:38:44 +03:00
pavelbannov
b9f45035b9 Merge branch 'release/rc-v1.2.0' into feature/migration_personal 
# Conflicts:
#	common/ASC.Data.Backup.Core/Contracts/IBackupService.cs
#	common/ASC.Data.Backup.Core/Core/FileBackupProvider.cs
#	common/ASC.Data.Backup.Core/Storage/DocumentsBackupStorage.cs
 2022-11-29 13:07:12 +03:00
pavelbannov
ca5e0e4d1e fix 2022-11-16 11:18:24 +03:00
SuhorukovAnton
3b6eece8c7 add cache in DbFactory 2022-11-14 12:05:54 +03:00
SuhorukovAnton
d7c1787442 dbContext from regions 2022-11-13 00:44:57 +03:00
SuhorukovAnton
141bed97b4 Merge branch 'develop' into feature/refactoring-saveUserInfo 2022-11-02 11:16:29 +03:00
pavelbannov
624391ab26 Merge branch 'develop' into feature/migration_personal 
# Conflicts:
#	common/ASC.Data.Backup.Core/BackupAjaxHandler.cs
#	common/ASC.Data.Backup.Core/Core/FileBackupProvider.cs
#	common/ASC.Data.Backup.Core/Storage/DataStoreBackupStorage.cs
#	common/ASC.Data.Backup.Core/Storage/DocumentsBackupStorage.cs
#	common/ASC.Data.Backup.Core/Tasks/BackupPortalTask.cs
#	common/ASC.Data.Backup.Core/Tasks/DeletePortalTask.cs
#	common/ASC.Data.Backup.Core/Tasks/PortalTaskBase.cs
#	common/ASC.Data.Backup.Core/Tasks/RestorePortalTask.cs
#	common/ASC.Data.Backup.Core/Tasks/TransferPortalTask.cs
#	common/ASC.Data.Storage/Encryption/EncryptionOperation.cs
#	common/ASC.Data.Storage/StorageFactory.cs
#	common/ASC.Data.Storage/StorageUploader.cs
 2022-10-31 21:15:23 +03:00
SuhorukovAnton
0baa36c1c0 GetDataStore tenant string to int 2022-10-28 15:23:51 +03:00
pavelbannov
a414d68182 Merge branch 'develop' into feature/migration_personal 
# Conflicts:
#	common/ASC.Data.Backup.Core/Service/BackupWorker.cs
#	common/ASC.Data.Backup.Core/Service/ProgressItems/BackupProgressItem.cs
#	common/ASC.Data.Backup.Core/Tasks/Modules/CrmModuleSpecifics.cs
#	common/ASC.Data.Storage/StorageFactory.cs
 2022-10-28 12:16:36 +03:00
SuhorukovAnton
deb0c5beb7 remove .wait and .result 2022-10-27 13:49:42 +03:00
pavelbannov
5848bf5cd3 Api: payments check 2022-09-19 17:56:45 +03:00
Tatiana Lopaeva
bec4f11dcd Merge branch 'develop' into feature/stripe 
# Conflicts:
#	common/ASC.Api.Core/Extensions/HostBuilderExtension.cs
#	common/services/ASC.Notify/Program.cs
#	common/services/ASC.Studio.Notify/Program.cs
#	common/services/ASC.Webhooks.Service/Program.cs
#	packages/common/components/Loaders/index.js
#	packages/common/store/AuthStore.js
#	packages/login/src/client/components/sub-components/recover-access-modal-dialog.tsx
#	packages/login/webpack.config.js
#	products/ASC.Files/Service/Program.cs
#	web/ASC.Web.Api/Program.cs
 2022-09-15 17:16:04 +03:00
SuhorukovAnton
896e1a7aeb fix 
add checks new alias, fix backup
 2022-09-13 17:11:23 +03:00
SuhorukovAnton
5d7998688d Merge branch 'develop' into feature/migration_personal 2022-09-05 17:39:20 +03:00
SuhorukovAnton
e4d379c411 backup: add regions 2022-09-05 14:27:38 +03:00
SuhorukovAnton
eccca5ea5f remove waste modules 2022-08-30 14:16:41 +03:00
Tatiana Lopaeva
9154b971c0 Merge branch 'develop' into feature/stripe 
# Conflicts:
#	packages/client/src/pages/PortalSettings/index.js
#	packages/common/api/settings/index.js
#	packages/common/components/Loaders/index.js
 2022-08-29 13:06:44 +03:00
pavelbannov
641695ec51 Removed paymentManager, DbButton, DbTenantPartner. Added PaymentConfiguration, PaymentsController 2022-08-25 23:09:12 +03:00
pavelbannov
88c3a92876 Backup: fixed mail 2022-08-17 12:38:51 +03:00
SuhorukovAnton
1a098875a6 migration personal: runner 2022-08-15 01:12:59 +03:00
SuhorukovAnton
fde3c94bf9 migration personal: first version backup 2022-08-10 12:25:53 +03:00
pavelbannov
dba122eb96 Common, files: added dbcontext pool 2022-07-28 21:00:49 +03:00
pavelbannov
6b2ba0d4ed moved from ddf515b8 2022-06-02 15:42:45 +03:00
pavelbannov
e7886aff2c Log: refactoring 2022-05-26 12:01:54 +03:00
SuhorukovAnton
3911d4837b fix 2022-05-20 16:07:47 +03:00
SuhorukovAnton
bcb7e9c3e7 add loggers 2022-05-06 18:49:06 +03:00
pavelbannov
89059cf32e Structured Logging 2022-04-28 12:15:33 +03:00
pavelbannov
13bbce8ea4 Custom logger replaced with Microsoft.Extensions.Logging 2022-04-26 20:53:48 +03:00
pavelbannov
97b45d3bd5 ILog: refactoring 2022-04-25 21:02:18 +03:00
pavelbannov
e603b26caa refactoring 2022-04-15 13:27:48 +03:00
pavelbannov
6ecc8e7071 code cleanup 2022-04-14 22:42:15 +03:00
pavelbannov
f138ff7c79 fixed warnings 2022-04-14 22:23:57 +03:00
pavelbannov
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
pavelbannov
e7e0f5327a Merge branch 'feature/backend-refactor' into feature/log-refactor 
# Conflicts:
#	common/ASC.Api.Core/GlobalUsings.cs
 2022-03-28 14:29:36 +03:00
pavelbannov
e5229f12f5 Merge branch 'develop' into feature/backend-refactor 
# Conflicts:
#	common/ASC.Api.Core/Middleware/TenantStatusFilter.cs
#	common/ASC.Common/Threading/DistributedTaskQueue.cs
#	common/ASC.Data.Backup.Core/BackupAjaxHandler.cs
#	common/ASC.Data.Backup.Core/BackupFileUploadHandler.cs
#	common/ASC.Data.Backup.Core/Core/NotifyHelper.cs
#	common/ASC.Data.Backup.Core/EF/BackupsContext.cs
#	common/ASC.Data.Backup.Core/Service/BackupWorker.cs
#	common/ASC.Data.Backup.Core/Storage/ConsumerBackupStorage.cs
#	common/ASC.Data.Backup.Core/Tasks/Data/TableInfo.cs
#	common/ASC.Data.Storage/Configuration/StorageSettings.cs
#	common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
#	products/ASC.Files/Core/Core/ResponseStream.cs
#	products/ASC.Files/Core/Helpers/Global.cs
#	products/ASC.Files/Core/Utils/EntryManager.cs
#	products/ASC.Files/Service/Thumbnail/Builder.cs
#	products/ASC.Files/Service/Thumbnail/Worker.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Api/Models/SettingsWrapper.cs
 2022-03-28 12:53:15 +03:00
MaksimChegulov
abae61f2db IDE1006 2022-03-25 19:26:06 +03:00
Alexey Bannov
63e12f49ab merge from feature/backend-refactor 2022-03-23 14:56:18 +03:00