|
|
0b929fe1d9
|
writer.WriteEntry outside ActionInvoker.Try
|
2023-04-07 17:57:56 +03:00 |
|
|
|
f1e0730e0f
|
fix GetScheduledBackupRecords
|
2023-03-30 23:17:56 +03:00 |
|
Vashchuk Nikita
|
2b94d5dfa5
|
changed notification image format to png,
images are sent in notifications as attacment,
fix images size,
fix attachment serialization,
fix work with cache
|
2023-03-23 00:25:15 +05:00 |
|
|
|
f67aec6a78
|
update MySQL from 8.0.31 => 8.0.32.1
|
2023-03-15 22:15:02 +03:00 |
|
|
|
f771315c7c
|
Merge pull request #1295 from ONLYOFFICE/feature/backup-chunk-size
backup chunk-size
|
2023-03-15 11:58:32 +03:00 |
|
|
|
f053663499
|
fixed DeleteExpiredService
|
2023-03-10 22:32:30 +03:00 |
|
|
|
92539449c4
|
backup chunk-size
|
2023-03-09 15:34:47 +03:00 |
|
|
|
18274f9a99
|
Merge pull request #1244 from ONLYOFFICE/feature/colloborator
Feature/colloborator
|
2023-02-28 17:27:05 +04:00 |
|
|
|
beb1834a0a
|
EF: batch operations
|
2023-02-27 16:39:52 +03:00 |
|
|
|
b160e00dae
|
Backup: added collaborator group
|
2023-02-17 11:27:48 +03:00 |
|
|
|
5e76441b64
|
fix
|
2023-02-07 19:12:09 +03:00 |
|
|
|
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 |
|
|
|
b39b294920
|
fix
|
2023-02-07 14:46:24 +03:00 |
|
|
|
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 |
|
|
|
4f60f9f8b9
|
add column removed in backup_backup
|
2023-01-27 18:12:02 +03:00 |
|
|
|
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 |
|
|
|
3ea77d951a
|
bugfix backup
|
2023-01-26 18:03:45 +03:00 |
|
|
|
403e993a3f
|
bugfix backup tenants_tariff
|
2023-01-26 11:49:17 +03:00 |
|
|
|
8a8143950d
|
replace CreateScope() => CreateScopeAsync()
|
2023-01-24 20:33:27 +03:00 |
|
|
|
667b10e874
|
Merge pull request #1149 from ONLYOFFICE/feature/dotnet7
Feature/dotnet7
|
2023-01-19 22:00:57 +03:00 |
|
|
|
4ddf7d521c
|
update external dependency
|
2023-01-19 19:05:07 +03:00 |
|
|
|
9937ecccee
|
fix
|
2023-01-19 18:32:37 +03:00 |
|
|
|
8ad635ba25
|
merge from release/rc-v1.2.0. fixed problem and update dll
|
2023-01-19 15:47:09 +03:00 |
|
|
|
bff2128b5f
|
Resources renamed
|
2023-01-18 18:53:09 +03:00 |
|
|
|
62cec7b7c5
|
Merge branch 'release/rc-v1.2.0' into feature/asc.apicache
|
2022-12-22 14:17:24 +03:00 |
|
|
|
d0fe06052e
|
Db: optimization
|
2022-12-21 15:57:32 +03:00 |
|
|
|
995d78ecd6
|
Merge branch 'release/rc-v1.2.0' into feature/asc.apicache
|
2022-12-21 12:39:28 +03:00 |
|
|
|
a764ceef1a
|
fix Bug 60191 - Settings: Backup. Does not create a backup file in temporary storage
|
2022-12-20 13:58:16 +03:00 |
|
|
|
db951d00e6
|
asc.apicache
|
2022-12-16 15:41:09 +03:00 |
|
|
|
9be6fcb22c
|
fix restore
|
2022-12-14 17:32:06 +03:00 |
|
|
|
dd4537963a
|
Merge branch 'develop' into feature/chunk-backup
|
2022-12-14 17:10:27 +03:00 |
|
|
|
02c9adc57b
|
chunk backup
|
2022-12-14 15:55:41 +03:00 |
|
|
|
426a11d080
|
Merge branch 'develop' into release/rc-v1.2.0
|
2022-12-12 19:33:41 +03:00 |
|
|
|
965867e3f5
|
Merge branch 'develop' into feature/fix-whitelable
|
2022-12-12 17:22:03 +03:00 |
|
|
|
143a4d01ec
|
removed unused variables
|
2022-12-09 17:47:46 +03:00 |
|
|
|
6e45bc5aa8
|
removed unused variables
|
2022-12-09 16:34:00 +03:00 |
|
|
|
b693486b46
|
merge from develop
|
2022-12-01 14:52:46 +03:00 |
|
|
|
a44d24d86f
|
Merge branch 'develop' into feature/migration_personal
|
2022-11-30 16:24:04 +03:00 |
|
Viktor Fomin
|
8f97413d1d
|
Merge branch 'develop' into feature/fix-whitelable
|
2022-11-30 12:33:31 +03:00 |
|
|
|
caa2143203
|
asc.data.backup: upgrade mysql.data.dll
|
2022-11-29 16:43:22 +03:00 |
|
|
|
3068359636
|
refactoring
|
2022-11-29 16:38:44 +03:00 |
|
|
|
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 |
|
|
|
4b180094e8
|
Whitelabel: rename
|
2022-11-22 18:03:59 +03:00 |
|
|
|
35e22fe8c8
|
Merge branch 'develop' into feature/fix-whitelable
# Conflicts:
# web/ASC.Web.Api/Api/Settings/WhitelabelController.cs
# web/ASC.Web.Core/LogoUploader.cs
# web/ASC.Web.Core/PublicResources/Resource.resx
# web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
|
2022-11-18 16:48:19 +03:00 |
|
|
|
2f7fdaf00a
|
Merge pull request #971 from ONLYOFFICE/feature/refactoring-saveUserInfo
Feature/remove .wait and .result
|
2022-11-16 18:24:29 +03:00 |
|
|
|
ca5e0e4d1e
|
fix
|
2022-11-16 11:18:24 +03:00 |
|
|
|
3b6eece8c7
|
add cache in DbFactory
|
2022-11-14 12:05:54 +03:00 |
|
|
|
d7c1787442
|
dbContext from regions
|
2022-11-13 00:44:57 +03:00 |
|
|
|
aa0222f078
|
Merge branch 'develop' into feature/migration_personal
|
2022-11-11 15:05:26 +03:00 |
|
|
|
a4fd81b404
|
migrate from .net6 to .net7
|
2022-11-10 13:10:18 +03:00 |
|
