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 |
|
|
85b20c6f72
|
fix chunk size when copy file in s3
|
2023-02-06 14:06:09 +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 |
|
Vashchuk Nikita
|
d8b9fada67
|
added functionality for disable SSL verification on WebhookSender requests
|
2023-01-31 00:25:51 +05:00 |
|
Vashchuk Nikita
|
29626ce3a8
|
hex format and renaming for secret
|
2023-01-30 21:32:46 +05:00 |
|
Vashchuk Nikita
|
cf37c1704d
|
remove name from returned parameters
|
2023-01-30 21:31:31 +05: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 |
|
|
f65019a8e3
|
fixed download bytes range from StorageHandler
|
2023-01-20 21:04:13 +03:00 |
|
|
c51e7a189b
|
fix 60214
|
2023-01-20 20:12:45 +03:00 |
|
|
5311005587
|
fix Bug 60606
|
2023-01-20 15:34:36 +03:00 |
|
Timofey Boyko
|
10611fc98d
|
Merge branch 'feature/static-versioned' of https://github.com/ONLYOFFICE/DocSpace into feature/static-versioned
|
2023-01-20 10:14:58 +03:00 |
|
Timofey Boyko
|
cfbf8a9860
|
Merge branch 'release/rc-v1.2.0' into feature/static-versioned
|
2023-01-20 10:14:49 +03:00 |
|
|
406ee9f2f9
|
Notify: removed schedulers. Fixed send
|
2023-01-19 23:13:29 +03:00 |
|
|
667b10e874
|
Merge pull request #1149 from ONLYOFFICE/feature/dotnet7
Feature/dotnet7
|
2023-01-19 22:00:57 +03:00 |
|
|
f762b44dbe
|
update external dll
|
2023-01-19 19:10:38 +03:00 |
|
|
4ddf7d521c
|
update external dependency
|
2023-01-19 19:05:07 +03:00 |
|
|
9937ecccee
|
fix
|
2023-01-19 18:32:37 +03:00 |
|
|
32bc687a39
|
Update package.json
|
2023-01-19 17:11:18 +03:00 |
|
Timofey Boyko
|
d911aef48c
|
ImageTests: fix docspace path
|
2023-01-19 17:07:36 +03:00 |
|
Timofey Boyko
|
b49efc447f
|
Move images-tests from packaged to common/Tests
|
2023-01-19 16:29:43 +03:00 |
|
Timofey Boyko
|
f20a1db341
|
Merge branch 'release/rc-v1.2.0' into branch feature/static-versioned
|
2023-01-19 16:15:19 +03:00 |
|
|
8ad635ba25
|
merge from release/rc-v1.2.0. fixed problem and update dll
|
2023-01-19 15:47:09 +03:00 |
|
|
9cc90a4789
|
People: refactor
|
2023-01-19 13:27:23 +03:00 |
|
|
8f8553d473
|
Merge branch 'release/rc-v1.2.0' into feature/static-versioned
|
2023-01-19 12:29:47 +03:00 |
|
|
cd367502fb
|
Bug 60660
|
2023-01-19 12:15:14 +03:00 |
|
Timofey Boyko
|
3ed48603b3
|
Merge branch 'release/rc-v1.2.0' into feature/static-versioned
|
2023-01-19 11:58:35 +03:00 |
|
|
8ba37860c8
|
Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0
|
2023-01-18 18:53:23 +03:00 |
|
|
bff2128b5f
|
Resources renamed
|
2023-01-18 18:53:09 +03:00 |
|
|
0d46e034e7
|
Files.Service: added users module for feed aggregator
|
2023-01-18 18:36:06 +03:00 |
|
Timofey Boyko
|
f4cb8acf1d
|
Merge branch 'release/rc-v1.2.0' into branch feature/static-versioned
|
2023-01-18 18:06:22 +03:00 |
|
|
2c2f759d01
|
remove waste
|
2023-01-17 10:51:26 +03:00 |
|
|
a1fc302536
|
add user for already exist portal
|
2023-01-17 10:50:56 +03:00 |
|
Timofey Boyko
|
0e68d1e0df
|
Merge branch 'release/rc-v1.2.0' into feature/static-versioned
|
2023-01-13 16:39:56 +03:00 |
|
|
2f29eb444f
|
fix 60163
|
2023-01-13 14:28:44 +03:00 |
|
|
29e0ef45b9
|
fix 60163
|
2023-01-13 14:26:12 +03:00 |
|
|
1ab804e4a0
|
Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0
|
2023-01-12 22:48:30 +03:00 |
|
Timofey Boyko
|
5730a5e8ac
|
Merge branch 'release/rc-v1.2.0' into feature/static-versioned
|
2023-01-12 18:10:15 +03:00 |
|
|
92f786c572
|
fix 60163
|
2023-01-12 12:09:01 +03:00 |
|
|
08937a22b6
|
Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0
|
2023-01-11 19:28:02 +03:00 |
|
Timofey Boyko
|
b46d21c258
|
Merge branch 'release/rc-v1.2.0' into feature/static-versioned
|
2023-01-11 18:47:06 +03:00 |
|
|
c51141a5d4
|
fix SetTenantActiveaAndTenantOwner before migration
|
2023-01-11 18:25:00 +03:00 |
|
|
2782778c71
|
add Console.WriteLine in migration
|
2023-01-11 13:51:48 +03:00 |
|
|
070475af5b
|
running ActivePassiveHostedService in singletone mode as default
|
2023-01-11 00:31:12 +03:00 |
|
|
5e1e4caa5b
|
SetTenantOwner before migration
|
2023-01-10 17:42:32 +03:00 |
|
|
1198303f22
|
fix merge
|
2023-01-10 14:47:38 +03:00 |
|
|
0090561fb6
|
Merge branch 'release/rc-v1.2.0' into feature/asc.apicache
|
2023-01-10 14:47:27 +03:00 |
|
|
769b621eca
|
add console writeline new alias
|
2023-01-10 13:35:38 +03:00 |
|
|
2710c8b4ee
|
fix SetAdmin before migration
|
2023-01-10 13:31:46 +03:00 |
|
|
6092262bbe
|
add migration for use mail instead of userName and autogenerate unique alias
|
2023-01-10 13:31:23 +03:00 |
|
|
aac2a388e2
|
fix migration: set userGroup before migration and remove "RemoveGeneralBunchObjects"
|
2023-01-09 17:45:11 +03:00 |
|
Timofey Boyko
|
96d3458e2d
|
Merge branch 'release/rc-v1.2.0' into feature/static-versioned
|
2023-01-09 11:03:08 +03:00 |
|
|
6142c450af
|
fix migration
add ignore general rows in files_bunch_objects
|
2022-12-29 12:07:41 +03:00 |
|
|
ad4ae24191
|
fix migration
add skip tables
add default value for files_folder.private
|
2022-12-29 11:36:40 +03:00 |
|
|
44804e34db
|
fixed cache room logo/user photo
|
2022-12-29 11:31:22 +03:00 |
|
|
1312bfefd0
|
Revert "temp delete migrationRunner"
This reverts commit 0457feafde .
|
2022-12-28 18:18:10 +03:00 |
|
|
0457feafde
|
temp delete migrationRunner
|
2022-12-28 15:09:36 +03:00 |
|
|
45ab3bcc5f
|
remove find backup files
|
2022-12-28 10:22:46 +03:00 |
|
|
9f198ef31d
|
fixed user avatar/room logo cache
|
2022-12-27 18:20:05 +03:00 |
|