IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
96b916d81e
DocSpace-client/common/ASC.Data.Backup.Core
History
pavelbannov 3e6a417d19 Merge branch 'hotfix/v1.1.2' into develop 
# Conflicts:
#	common/ASC.Data.Backup.Core/BackupFileUploadHandler.cs
#	migrations/mysql/SaaS/NotifyDbContext/NotifyDbContextModelSnapshot.cs
#	packages/client/src/components/panels/SelectFileDialog/index.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/restore-backup/sub-components/ButtonComponent.js
#	packages/client/src/pages/PortalSettings/categories/security/access-portal/tfa.js
#	packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/index.js
#	packages/client/src/store/ProfileActionsStore.js
#	packages/common/api/files/index.js
#	packages/common/store/AuthStore.js
#	web/ASC.Web.Api/Api/AuthenticationController.cs
#	web/ASC.Web.Api/Api/Settings/SettingsController.cs
#	yarn.lock
2023-09-01 15:33:39 +03:00
..
Contracts Merge remote-tracking branch 'remotes/origin/feature/api-descriptions' into feature/api-develop 2023-08-01 17:07:05 +03:00
Core Merge branch 'develop' into feature/optimization-queries 2023-06-27 18:29:23 +03:00
EF refactoring 2023-06-09 14:28:49 +03:00
Exceptions
Extensions
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
Service Merge branch 'hotfix/v1.1.2' into develop 2023-08-11 12:47:44 +03:00
Storage fix await using 2023-06-01 14:27:27 +03:00
Tasks Merge branch 'hotfix/v1.1.2' into develop 2023-08-11 12:47:44 +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 backend: updated some dll 2023-08-10 19:16:25 +03:00
BackupAjaxHandler.cs Merge branch 'hotfix/v1.1.2' into develop 2023-08-28 18:53:10 +03:00
BackupFileUploadHandler.cs Merge branch 'hotfix/v1.1.2' into develop 2023-09-01 15:33:39 +03:00
BackupResource.az.resx added translations 2023-04-28 16:24:46 +03:00
BackupResource.bg.resx Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
BackupResource.cs.resx Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
BackupResource.de.resx added translations 2023-08-04 17:07:12 +03:00
BackupResource.Designer.cs upload backup: max size 2023-08-28 16:44:40 +03:00
BackupResource.el-GR.resx added translations 2023-04-28 16:24:46 +03:00
BackupResource.es.resx Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
BackupResource.fi.resx Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
BackupResource.fr.resx added translations 2023-04-28 16:24:46 +03:00
BackupResource.hy-AM.resx Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
BackupResource.it.resx Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
BackupResource.ja-JP.resx Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
BackupResource.ko-KR.resx Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
BackupResource.lv.resx Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
BackupResource.nl.resx Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
BackupResource.pl.resx Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
BackupResource.pt-BR.resx Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
BackupResource.pt.resx Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
BackupResource.resx upload backup: max size 2023-08-28 16:44:40 +03:00
BackupResource.ru.resx Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
BackupResource.sk.resx Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
BackupResource.sl.resx Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
BackupResource.tr.resx added translations 2023-04-28 16:24:46 +03:00
BackupResource.uk-UA.resx Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
BackupResource.vi.resx Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
BackupResource.zh-CN.resx Merge branch 'master' into develop 2023-07-18 19:26:32 +03:00
GlobalUsings.cs Merge branch 'hotfix/v1.1.2' into develop 2023-09-01 15:33:39 +03:00