9269594b8a
Web: DesktopEditors mode: Added more logs
2021-12-13 01:32:47 +03:00
055c200b60
Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0
2021-12-10 16:31:29 +03:00
1d2750f23b
Web: Files: Remove privacy folders from select files/folders dialog.
2021-12-10 16:30:20 +03:00
eca872cdd8
Add hardware check in deb and rpm OneClickInstall ( #479 )
...
* Add hardware check in deb and rpm OneClickInstall
* Modify docker document server run config (#476 )
* Revert "Modify docker document server run config (#476 )"
This reverts commit 9ed7f71e71ad431386717d37968b97ec2117add8.
2021-12-10 16:26:34 +03:00
0855eadc04
Merge pull request #477 from ONLYOFFICE/feature/editor-history
...
Feature/editor history
2021-12-10 15:09:06 +03:00
805718a71b
Update kafka version in OneClickInstall
2021-12-10 14:30:01 +03:00
6e6a12fc95
Merge branch 'release/v1.1.0' into feature/editor-history
2021-12-10 10:00:15 +03:00
c3e440ee9c
Web: Files: Added reset of fields after creating a template from the current file.
2021-12-10 09:58:04 +03:00
00ab71280c
Merge branch 'release/v1.1.0' into feature/editor-history
2021-12-10 09:36:12 +03:00
2afce477b1
Web: Common: Removed useless code.
2021-12-10 09:30:11 +03:00
7c15232f71
Web: Locales: Changed translation "New master form" to "New form template"
2021-12-09 13:54:56 +03:00
86cd5e21e9
Server: Files: Configuration: Added ImageDark property for editors config, if we open filling form in dark mode
2021-12-09 13:39:03 +03:00
41681d0c94
Server: Files: Configuration: Fixed logo type for filling form mode
2021-12-09 12:45:52 +03:00
3921fa74f3
Web: Editor: Deleted useless imports.
2021-12-08 17:00:24 +03:00
1b289515be
Files: rename master form to form template
2021-12-08 17:00:04 +03:00
c41937002f
Web: Editor: Added a condition for showing the history restore function.
2021-12-08 16:52:50 +03:00
e771000f8a
Web: Editor: Deleted useless code.
2021-12-08 16:46:09 +03:00
3b17a90b1b
Web: Editor: Fixed after cherry picking.
2021-12-08 16:45:12 +03:00
51b7921ed4
Web: Edit: Added doc property to api methods for history versions.
...
# Conflicts:
# packages/asc-web-common/api/files/index.js
2021-12-08 16:30:26 +03:00
d5a77379b3
Web: Editor: Added api method for restore document version.
2021-12-08 16:28:30 +03:00
aeb5121331
Web: Editor: Fixed displaying info.
2021-12-08 16:28:30 +03:00
3937082fc9
Web: Editor: Fixed object parameters of history data.
2021-12-08 16:28:30 +03:00
17129ad9d1
Erb: Editor: Renaming.
2021-12-08 16:28:30 +03:00
a3c4577482
Web: Editor: Refactoring.
2021-12-08 16:28:29 +03:00
1983d60e55
Web: Editor: Moved the functionality of converting history and getting the current version into separate functions.
2021-12-08 16:28:29 +03:00
944591cd4d
Web: Editor: Added error handler for history function.
2021-12-08 16:28:29 +03:00
71aa1eb474
Web: Editor: Added restore option.
2021-12-08 16:28:29 +03:00
30bd96a4c6
Web: Editor: Fixed opening of revisions.
2021-12-08 16:28:28 +03:00
bc8a7f3dd2
Web: Editor: Removed revisions from versions list.
2021-12-08 16:28:28 +03:00
70cc67b356
Web: Editor: Refactoring.
2021-12-08 16:28:28 +03:00
d20f833889
Web: Editor: Renaming.
2021-12-08 16:28:28 +03:00
d5b2b2a395
Web: Editor: Added error handler for history data.
2021-12-08 16:28:28 +03:00
a79db0fa25
Web: Editor: Added version to the history data.
2021-12-08 16:28:27 +03:00
fcb4e43d55
Web: Editor: Removed side effect - changes of array length.
2021-12-08 16:28:27 +03:00
a6deb7febb
Web: Editor: Fixed display of editing date.
2021-12-08 16:28:27 +03:00
7fd1452e81
Web: Editor: Fixed current version of document.
2021-12-08 16:28:27 +03:00
c6265a9cb4
Web: Editor: Fixed getting name and id of user for history.
2021-12-08 16:28:26 +03:00
5fa436eb21
Web: Editor: Fixed getting information of difference of file.
2021-12-08 16:28:26 +03:00
e3eb043c2a
Web: Editor: Added new api method for RequestHistory method.
2021-12-08 16:28:26 +03:00
317750f909
Web: Added api methods.
...
# Conflicts:
# packages/asc-web-common/api/files/index.js
2021-12-08 16:28:25 +03:00
feb48c01a0
Files: moved from feature/editor-version-history
2021-12-08 15:25:39 +03:00
b0dc82210a
Fixed Bug 54407 - Client.Files.FormTemplate. Added folder filtering excluding subfolders.
2021-12-08 14:49:54 +03:00
f1bebda4aa
Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0
2021-12-08 14:20:51 +03:00
458284c5fc
Web: Files: SelectFileDialog/SelectFolderDialog: Added shift of all folders to the left if there are no subfolders.
2021-12-08 14:20:40 +03:00
614ee07ee6
Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0
2021-12-08 13:48:28 +03:00
eba68c62dc
Web: Files: Added rename form file after creating from template. Fixed temp editing file parameters. Fixed create form from dialog, now it use action
2021-12-08 13:48:19 +03:00
a0335532fc
Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0
2021-12-08 13:12:08 +03:00
2766859431
Web: Files: fixed upload panel header styles
2021-12-08 13:12:01 +03:00
89adb75360
Fix Bug 54383 - Client.Files: ‘Somehing went wrong’ on converting password protected file
2021-12-08 12:30:03 +03:00
475dd92c30
Web: Editor: Fixed history information.
2021-12-08 09:37:40 +03:00