|
|
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 |
|
|
|
114dd9dc46
|
Merge pull request #1125 from ONLYOFFICE/feature/chunk-backup
Feature/chunk backup
|
2023-01-26 21:29:43 +03:00 |
|
|
|
32914b6413
|
Merge branch 'develop' into feature/chunk-backup
|
2023-01-26 21:28:53 +03:00 |
|
|
|
63af9c3329
|
Merge pull request #1151 from ONLYOFFICE/feature/fix-webhooks
Feature/fix webhooks
|
2023-01-24 16:50:56 +03:00 |
|
Vashchuk Nikita
|
596a85a318
|
fix GetJournal
|
2023-01-24 13:40:26 +05:00 |
|
Vashchuk Nikita
|
592c672c34
|
added name to returned parameters
|
2023-01-24 12:03:57 +05:00 |
|
Vashchuk Nikita
|
de94226794
|
fix
|
2023-01-23 18:15:46 +05:00 |
|
Vashchuk Nikita
|
1c32151a77
|
Revert "fix create, update methods", added id to returned parameters
|
2023-01-23 16:53:03 +05:00 |
|
|
|
a4aeb797db
|
Merge pull request #1148 from ONLYOFFICE/feature/get-reference-data
feature/get reference data
|
2023-01-19 21:19:12 +03:00 |
|
|
|
9e4c0f93e6
|
add token and filetype in fileReference
|
2023-01-19 14:24:24 +03:00 |
|
Vashchuk Nikita
|
bfe7524dde
|
fix create, update methods
|
2023-01-18 11:24:44 +05:00 |
|
|
|
d4f255803a
|
Merge pull request #1120 from ONLYOFFICE/feature/files-reference-data
feature/get reference data
|
2023-01-17 13:53:06 +05: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 |
|
|
|
226bb41eb7
|
Update apisystem.json - remove "api-cache"
|
2023-01-10 14:40:00 +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 |
|
Mushka Nikita
|
b817a5dc25
|
fixed info panel title tablet visual bugs
|
2023-01-10 13:29:31 +03:00 |
|
|
|
111fde509b
|
Fixed Bug 60477 - Files. Fixed blocking of a file opened in preview.
|
2023-01-10 12:25:37 +03:00 |
|
|
|
0d6450bf4f
|
Fix Bug 60484 - Files.Settings. User setting ‘Display notification when moving items to Trash’.
|
2023-01-09 18:42:47 +03:00 |
|
|
|
aac2a388e2
|
fix migration: set userGroup before migration and remove "RemoveGeneralBunchObjects"
|
2023-01-09 17:45:11 +03:00 |
|
|
|
f7bcbf54e0
|
Web: Editor: Fixed document type for creation url.
|
2023-01-09 17:22:42 +03:00 |
|
|
|
5a83f41348
|
Fixed Bug 60464 - Files. ‘Sorry, the resource could not be found’ on the page when creating a new document from the editor.
|
2023-01-09 17:14:54 +03:00 |
|
|
|
df0a43c470
|
Fix Bug 60383 - Files. The file version icon is not displayed after generating the version.
|
2023-01-09 13:41:29 +03:00 |
|
Viktor Fomin
|
f8fc8343f5
|
FIx Bug 60425: Add highlighting for user's email
|
2023-01-09 13:28:06 +03:00 |
|
Timofey Boyko
|
36298e8a48
|
Fixed Bug 60176 - Rooms. The menu of rooms/subfolders on the panel and in the header does not match the layouts.
|
2023-01-09 10:46:54 +03:00 |
|
Timofey Boyko
|
c9c523261f
|
Fixed Bug 60407 - Files. The button for calling the sort menu settings does not work when opening the information panel.
|
2023-01-09 10:09:37 +03:00 |
|
Akmal Isomadinov
|
49bfcf917a
|
Web: Combining avatar Editor and IconEditor components into one component and removing avatarEditor and IconEditor components
|
2023-01-04 15:28:52 +05:00 |
|
|
|
11e7a777f6
|
Disable jest auto run
|
2022-12-30 16:29:19 +03:00 |
|
|
|
c215f6ff15
|
Files: fixed tag new
|
2022-12-30 15:15:16 +03:00 |
|
Akmal Isomadinov
|
ce2c92d5ce
|
Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0
|
2022-12-30 16:56:10 +05:00 |
|
Akmal Isomadinov
|
abc7579133
|
Web:Client Updated image compression function in avatar editor
|
2022-12-30 16:56:00 +05:00 |
|
|
|
3dfb0ce753
|
Bug 60379
|
2022-12-30 13:18:04 +03:00 |
|
|
|
575da0f0db
|
Update EmptyFolderContainer.js
|
2022-12-30 11:59:32 +03:00 |
|
|
|
f28bbebbde
|
Web: Common: Removed mobx warnings.
|
2022-12-30 11:54:39 +03:00 |
|
|
|
cf445c644d
|
Fixed Bug 60418 - Document is highlighted when clicking on the version icon in thumbnail view.
|
2022-12-30 10:57:40 +03:00 |
|
|
|
7a00256714
|
Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0
|
2022-12-30 09:59:34 +03:00 |
|
|
|
20d3d28bad
|
Fixed Bug 60420 - Files.Editor. ‘Uncaught SyntaxError: "undefined" is not valid JSON’ in the console when selecting the My Rooms folder when inserting an image from storage.
|
2022-12-30 09:59:10 +03:00 |
|
|
|
622508734b
|
Fix Bug 60421 - Rooms. Low quality plug
|
2022-12-29 20:38:42 +03:00 |
|
|
|
03c8891827
|
Bug 60406
|
2022-12-29 17:53:34 +03:00 |
|
|
|
9d258d5801
|
Bug 60379
|
2022-12-29 14:29:07 +03:00 |
|
|
|
97629e80e5
|
Bug 60168
|
2022-12-29 14:20:25 +03:00 |
|
|
|
80a5d77d19
|
Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0
|
2022-12-29 14:16:16 +03:00 |
|
|
|
1958b3f989
|
Web: PortalSettings: Removed interface jumps after page loading.
|
2022-12-29 14:15:13 +03:00 |
|
|
|
ec84d70835
|
Web: Added count=1 to @root filter (fix speed issue)
|
2022-12-29 13:49:38 +03:00 |
|
Elyor Djalilov
|
fde5689aec
|
Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0
|
2022-12-29 15:21:36 +05:00 |
|
Elyor Djalilov
|
6c5c4e9f1c
|
Fix Bug 60380
|
2022-12-29 15:21:31 +05:00 |
|
|
|
fa96c177e5
|
Fixed Bug 60352 - Rooms.Files.There is no lock button for non-editable files.
|
2022-12-29 13:16:48 +03:00 |
|
|
|
dfa766bc39
|
Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0
|
2022-12-29 12:15:50 +03:00 |
|
