Commit Graph

3121 Commits

Author SHA1 Message Date
66806facb4 thumbnails: added cache key to url. added crop image after resize. replace _ => hash key 2023-02-14 10:57:21 +03:00
Timofey Boyko
f89c5d4036 Plugins: fix versions 2023-02-08 12:32:48 +03:00
6a2606b71e fixed MigrationPersonalToDocSpace 2023-02-08 12:07:34 +03:00
109b44c529
Merge pull request #1132 from ONLYOFFICE/feature/asc.apicache
Feature/asc.apicache
2023-02-08 11:49:27 +03:00
Timofey Boyko
eb5d6b9b77 Plugins: bump dependencies 2023-02-08 10:21:42 +03:00
Timofey Boyko
61d214b15d WebPlugins: update dependencies 2023-02-08 09:59:50 +03:00
d38efe9474 Merge branch 'develop' into feature/asc.apicache
# Conflicts:
#	common/services/ASC.ApiSystem/Program.cs
2023-02-07 19:23:54 +03:00
5e76441b64 fix 2023-02-07 19:12:09 +03:00
0f35b8ab45 redis: support User property from config 2023-02-07 17:53:34 +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
610b2f7660 AuditTrail: added new audit message patterns 2023-02-02 13:28:31 +03:00
5aebd35844 AuditTrail: added room link update action 2023-02-02 13:25:18 +03:00
e116b85281 AuditTrail: added room unarchived action message 2023-02-02 11:51:22 +03:00
a48b77170f AuditTrail: added rooms action mapper 2023-02-02 11:33:20 +03:00
6d625aece4 AuditTrail: added entry types for room and custom tag 2023-02-02 11:32:51 +03:00
8577c9fa2f Common: changed message action for room invitation link 2023-02-02 11:31:27 +03:00
d2b5ea72a5 AuditTrail: added module type for room 2023-02-02 11:30:27 +03:00
06c9d6d7b7 StorageHandler: removed demand authorization for request with auth querystring 2023-02-01 20:50:41 +03:00
5d67962481
Merge pull request #1155 from ONLYOFFICE/bugfix/table-backup_backup
Bugfix/backup
2023-02-01 14:39:36 +03:00
442e57c092 fix 2023-02-01 14:24:30 +03:00
8f922bd8cf Api: added links field for success response 2023-01-30 16:57:29 +03:00
7ba557cd65 remove unused api methods 2023-01-30 11:00:00 +03:00
f6c5c7a437 Merge branch 'release/rc-v1.2.0' into bugfix/backup 2023-01-30 10:42:33 +03:00
4f60f9f8b9 add column removed in backup_backup 2023-01-27 18:12:02 +03:00
Timofey Boyko
ab7e49b93e Merge branch 'release/rc-v1.2.0' into bugfix/images-static-versioned 2023-01-27 16:01:11 +03:00
1639173950 Bug 60878 2023-01-27 15:44:17 +03:00
7db5e5f353 Merge branch 'release/rc-v1.2.0' into bugfix/restoring-portal 2023-01-27 12:11:11 +03:00
Timofey Boyko
76bd31350f Merge branch 'release/rc-v1.2.0' into bugfix/images-static-versioned 2023-01-27 11:42:52 +03:00
Timofey Boyko
ee8c60ac60 Update images tests 2023-01-27 11:16:28 +03:00
Timofey Boyko
ef5f72bc4e Add tests for wrong images import 2023-01-27 10:19:49 +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
dc71761710 Settings: TenantDomainValidator 2023-01-26 15:31:06 +03:00
403e993a3f bugfix backup tenants_tariff 2023-01-26 11:49:17 +03:00
29ee5c2b33 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2023-01-25 15:58:38 +03:00
4a79cc5174 Bug 60770 2023-01-25 15:58:30 +03:00
d4cb3327b7 SocketIO: updateFolder, deleteFolder 2023-01-25 14:50:46 +03:00
05b8f4ea81 Merge branch 'release/rc-v1.2.0' into bugfix/restoring-portal 2023-01-25 10:37:37 +03:00
8a8143950d replace CreateScope() => CreateScopeAsync() 2023-01-24 20:33:27 +03:00
75ef9b68f3 Merge branch 'release/rc-v1.2.0' into bugfix/restoring-portal 2023-01-24 18:36:09 +03:00
d5390f5a33
Merge pull request #1147 from ONLYOFFICE/feature/static-versioned
Feature/static versioned
2023-01-24 18:13:12 +03:00
255b54b169 Added allow anonymous attribute. 2023-01-24 17:08:55 +03:00
2adc84efe1 Bug 60497 2023-01-24 13:32:17 +03:00
06bdcd6cd2 Merge branch 'release/rc-v1.2.0' into feature/static-versioned 2023-01-24 12:19:20 +03:00
b2a3ca4d25 fix migration 2023-01-24 11:31:00 +03:00
Timofey Boyko
98d652ed9a Merge branch 'release/rc-v1.2.0' into feature/static-versioned 2023-01-24 10:05:04 +03:00
b00f7be0e4 add check count manager before migration 2023-01-23 11:48:53 +03:00
1857e7b62f StorageHandler: added DisableBuffering 2023-01-20 21:32:27 +03:00