|
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 |
|
|
a1c4031cc6
|
upload backup: max size
|
2023-08-28 16:44:40 +03:00 |
|
|
ff66f27a1a
|
fix
|
2023-08-28 12:16:33 +03:00 |
|
|
d475451899
|
fix backup upload
|
2023-08-28 12:01:36 +03:00 |
|
|
9c8ee8cbbc
|
fix backup upload
|
2023-08-28 11:49:25 +03:00 |
|
|
0d1b4adc4f
|
Update BackupFileUploadHandler.cs
|
2023-08-25 15:21:04 +03:00 |
|
|
a8c133f4ca
|
fix backup upload handler
|
2023-08-25 12:51:15 +03:00 |
|
|
75ebc4ce65
|
fix await using
|
2023-06-01 14:27:27 +03:00 |
|
|
a3800de721
|
TenantDbContext -async part1
|
2023-03-20 19:16:00 +03:00 |
|
|
62c6f366df
|
fix local restore
|
2022-10-06 15:51:15 +03:00 |
|
|
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 |
|
|
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 |
|
|
7ad1462b81
|
Merge branch 'feature/backend-refactor' into feature/asc-core-common-refactor
|
2022-02-21 12:51:45 +03:00 |
|
|
ca7140186d
|
Core: resolve properties for mapping, add mapping/projection
|
2022-02-15 13:30:05 +03:00 |
|
|
85f9055eb2
|
BackupCore: used file-scoped namespaces
|
2022-02-09 21:49:52 +03:00 |
|
|
b3acf9ac9a
|
BackupCore: private properties replaced by with private fields, used keyword readonly
|
2022-02-09 19:29:19 +03:00 |
|
|
e4eaf5c522
|
refactoring: add globalUsing: backup.core
|
2022-01-26 14:17:12 +03:00 |
|
|
2cba76f838
|
backup: add "backupFileUpload.ashx"
|
2021-11-19 12:43:54 +03:00 |
|
|
8171563965
|
backup.core: move backup.core
|
2021-09-02 15:41:54 +03:00 |
|