Commit Graph

15841 Commits

Author SHA1 Message Date
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
73527a51dc add translations 2021-12-08 15:58:10 +03:00
ac5edf13cb Web:Files:Badges:Edited badges styles. 2021-12-08 15:43:12 +03:00
466f46958d edit translations 2021-12-08 15:42:22 +03:00
feb48c01a0 Files: moved from feature/editor-version-history 2021-12-08 15:25:39 +03:00
225f277976 Merge branch 'feature/translate-1.1.0' of https://github.com/ONLYOFFICE/AppServer into feature/translate-1.1.0 2021-12-08 15:24:13 +03:00
4009717f96 edit lo 2021-12-08 15:23:44 +03:00
674732ee60 Merge branch 'release/v1.1.0' into feature/translate-1.1.0 2021-12-08 15:22:53 +03:00
898101485b edit lo 2021-12-08 15:22:06 +03:00
489ecb1b26 add translations 2021-12-08 15:18:22 +03:00
8441a506af add translations 2021-12-08 15:17:26 +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
c87a831b89 Files: optimization 2021-12-08 13:14:44 +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
2187cb5331 edit lv 2021-12-08 12:24:54 +03:00
de3dbc78e9 add translations 2021-12-08 12:24:19 +03:00
ddbaee09e4 add translations 2021-12-08 12:23:52 +03:00
300a45a172 add translations 2021-12-08 12:23:12 +03:00
bc95ce2356 add translations 2021-12-08 12:21:49 +03:00
430a775a89 add translations 2021-12-08 12:20:57 +03:00