IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
82af41943b
DocSpace-buildtools/common/ASC.Data.Backup.Core
History
Ilya Oleshko 19e8b2210a Merge branch 'master' into develop 
# Conflicts:
#	packages/client/src/helpers/constants.js
#	packages/client/src/pages/AccountsHome/Section/Filter/index.js
#	packages/client/src/pages/Home/InfoPanel/Body/sub-components/ItemTitle/AccountsItemTitle.js
#	packages/client/src/pages/Home/Section/AccountsBody/RowView/userContent.js
#	packages/client/src/pages/Home/Section/Header/index.js
#	packages/client/src/pages/Home/index.js
#	packages/client/src/pages/PortalSettings/categories/common/Customization/dns-settings.js
#	packages/client/src/pages/PortalSettings/categories/common/branding.js
#	packages/client/src/pages/PortalSettings/categories/security/access-portal/index.js
#	packages/client/src/store/FilesActionsStore.js
#	packages/common/components/Article/sub-components/article-payment-alert.js
#	packages/common/components/Section/index.js
#	packages/components/floating-button/styled-floating-button.js
#	packages/login/src/client/App.tsx
#	packages/login/src/client/components/Invalid/index.tsx
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Utils/FileConverter.cs
#	yarn.lock
2023-05-29 14:36:12 +03:00
..
Contracts Merge branch 'release/rc-v1.2.0' into feature/migration_personal 2022-11-29 13:07:12 +03:00
Core image only via attachment 2023-05-03 16:58:54 +05:00
EF add column removed in backup_backup 2023-01-27 18:12:02 +03:00
Exceptions migration personal: first version backup 2022-08-10 12:25:53 +03:00
Extensions Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00
IntegrationEvents/Events remove waste modules 2022-08-30 14:16:41 +03:00
Log backup: add regions 2022-09-05 14:27:38 +03:00
protos refactoring *.proto files according to https://bit.ly/3KcZ0Ef 2022-01-11 19:28:48 +03:00
Service Backup: fixed payment after restore 2023-05-24 19:33:10 +03:00
Storage fix GetScheduledBackupRecords 2023-03-30 23:17:56 +03:00
Tasks Merge branch 'master' into develop 2023-05-29 14:36:12 +03:00
Utils Merge branch 'develop' into feature/migration_personal 2022-10-31 21:15:23 +03:00
ActionInvoker.cs fix 2022-11-16 11:18:24 +03:00
ASC.Data.Backup.Core.csproj update MySQL from 8.0.31 => 8.0.32.1 2023-03-15 22:15:02 +03:00
BackupAjaxHandler.cs Merge branch 'develop' into release/rc-v1.2.0 2022-12-12 19:33:41 +03:00
BackupFileUploadHandler.cs fix local restore 2022-10-06 15:51:15 +03:00
BackupResource.az.resx added translations 2023-04-28 16:24:46 +03:00
BackupResource.Designer.cs added translations 2023-04-28 16:24:46 +03:00
BackupResource.el-GR.resx added translations 2023-04-28 16:24:46 +03:00
BackupResource.fr.resx added translations 2023-04-28 16:24:46 +03:00
BackupResource.resx az resources 2022-06-27 14:00:23 +03:00
BackupResource.tr.resx added translations 2023-04-28 16:24:46 +03:00
GlobalUsings.cs chunk backup 2022-12-14 15:55:41 +03:00