96d9dc9058
downgrade AspNetCore.HealthChecks.Elasticsearch
2023-03-07 15:30:08 +03:00
Vashchuk Nikita
ca8c737b4f
small fix MessageAction after merge
2023-03-06 19:17:39 +05:00
29abce027d
Merge branch 'develop' into feature/notifications
...
# Conflicts:
# packages/client/src/pages/Accounts.jsx
# packages/client/src/store/FilesActionsStore.js
# packages/common/constants/index.js
# products/ASC.People/Server/Api/UserController.cs
2023-03-06 15:37:45 +03:00
6934ee79bc
thumbnails: refactoring, optimization
2023-03-04 19:58:45 +03:00
f95c56198e
thumbnail: bump ImageSharp from v2.0.0 to 3.0.0, optimization, refactoring
2023-03-03 22:49:36 +03:00
f8af64e9d6
ASC.Common.Threading: extension for channel
2023-03-03 22:00:20 +03:00
Vashchuk Nikita
c92be742cb
Fix/modified sendWhatsNew, Added RoomCreateUser, Added RoomRemoveUser
2023-03-03 20:02:48 +05:00
a835719980
bugfix 60194
...
first hash then download when backup in s3
2023-03-02 10:47:22 +03:00
e73df55f3c
Bug 61218
2023-03-01 20:32:44 +03:00
4ecc81f8e7
Merge pull request #1249 from ONLYOFFICE/bugfix/set-quota-row
...
fix set quota row
2023-03-01 17:42:12 +03:00
ed66ee8b08
bugfix 60194
2023-03-01 13:25:46 +03:00
e2f90e5367
fix set quota row
2023-02-28 16:51:37 +03:00
18274f9a99
Merge pull request #1244 from ONLYOFFICE/feature/colloborator
...
Feature/colloborator
2023-02-28 17:27:05 +04:00
27900054a0
Merge pull request #1242 from ONLYOFFICE/feature/ef-batch
...
EF: batch operations
2023-02-28 15:48:05 +03:00
c77e960d70
add transform dictionary
2023-02-28 14:54:16 +03:00
c932d935fa
Merge branch 'develop' into feature/colloborator
2023-02-28 13:48:08 +04:00
78a2e20edb
refactoring
2023-02-27 18:38:01 +03:00
beb1834a0a
EF: batch operations
2023-02-27 16:39:52 +03:00
Timofey Boyko
8e59451b4a
Merge branch 'develop' into feature/colloborator
2023-02-27 15:22:21 +03:00
aa7cf93a74
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into develop
2023-02-27 13:29:36 +03:00
ead94f371e
Merge branch 'develop' into feature/notifications
2023-02-27 10:29:50 +03:00
03a4dc89dc
Settings: refactoring
2023-02-24 17:19:10 +03:00
f66dfbc0a8
kafka: setup config
2023-02-22 21:07:29 +03:00
44250c4f2f
fix
2023-02-22 17:39:33 +03:00
216a6480c8
Merge branch 'develop' into feature/notifications
...
# Conflicts:
# packages/common/constants/index.js
# products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
# products/ASC.Files/Core/Utils/FileMarker.cs
# yarn.lock
2023-02-22 15:50:55 +03:00
a9960f0545
Merge pull request #1170 from ONLYOFFICE/bugfix/chunk-size
...
fix chunk size
2023-02-22 15:30:57 +03:00
5a65b42177
Core: fixed invite
2023-02-21 19:00:25 +03:00
3401abb21a
Merge branch 'develop' into feature/colloborator
2023-02-21 17:11:39 +03:00
582c6a602b
Core: added new helper methods
2023-02-21 16:37:33 +03:00
0787427bce
fix
2023-02-21 15:12:57 +03:00
1c3d3bf132
Merge branch 'develop' into feature/fix-webhooks-second
...
# Conflicts:
# common/ASC.Api.Core/Core/BaseStartup.cs
2023-02-21 14:33:26 +03:00
3269d48e15
added new table
2023-02-21 14:22:34 +03:00
Vashchuk Nikita
9e0a5e91cb
fix letter format, mute attribute, tags counter
2023-02-21 14:19:26 +05:00
Vashchuk Nikita
efa04ae8ba
added functionality for notifying users about events via AuditEvent,
...
fix notifyEngine,
edited letter format,
added method for getting roomsId and roomsTitle from a file/folder inside the room,
added method for getting sharing info from foldersIds and userGuid
2023-02-21 13:35:01 +05:00
0a5d19a8f4
nlog: refactoring. added tenant info when httpcontext exist
2023-02-20 23:13:18 +03:00
5e9f12a797
backend: refactoring
2023-02-20 23:10:49 +03:00
6fb4f73110
Api.Core: added IsCollaborator in user dto
2023-02-20 11:51:21 +03:00
b88203df33
Api.Core: refactor
2023-02-20 11:15:41 +03:00
e171ee44e5
Core: refactor
2023-02-20 11:15:18 +03:00
c7792abb1d
Core: fixed sorting users by type
2023-02-17 18:46:43 +03:00
068004ed28
Core: fix
2023-02-17 18:11:02 +03:00
19899d14e9
Core: added collaborator, refactor
2023-02-17 17:53:18 +03:00
9801433fd0
Core: fix security
2023-02-17 16:30:48 +03:00
72b3b351da
Common: refactor
2023-02-17 16:29:13 +03:00
25859e5d4e
refactoring
2023-02-17 15:56:40 +03:00
b160e00dae
Backup: added collaborator group
2023-02-17 11:27:48 +03:00
90fdd58d1c
Core: added collaborator group and type
2023-02-17 11:27:27 +03:00
e9ed1cf5b2
Common: added collaborator role
2023-02-17 11:26:34 +03:00
d5d8373125
EnableSSLVerification is true by default
2023-02-15 15:06:22 +03:00
66806facb4
thumbnails: added cache key to url. added crop image after resize. replace _ => hash key
2023-02-14 10:57:21 +03:00
afe82d599d
ASC.Webhooks.Service moved to ASC.Web.Studio
2023-02-08 20:31:58 +03:00
6d363d4abd
Webhooks: settings
2023-02-08 14:46:33 +03:00
e58175f69e
WebHooks: added resources, new methods and settings for disable webhook
2023-02-08 14:17:06 +03:00
d49ee80fd8
Merge branch 'develop' into feature/fix-webhooks-second
2023-02-08 13:18:59 +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
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
