Commit Graph

15808 Commits

Author SHA1 Message Date
02a57ac53e Web: People: Added dropDownMaxHeight 2021-12-09 19:48:03 +03:00
afe25e3bc4 Fix issues of WrongTranslationVariablesTest 2021-12-09 19:47:18 +03:00
f5c5d1fa78 Web:Files:Badges:Added badgesComponent and HOC withBadges in FilesRowContent. Added quickButtonsComponent and HOC withQuickButtons in SimpleFilesRow. 2021-12-09 17:35:54 +03:00
b3621708ab esit az 2021-12-09 17:30:03 +03:00
05a551d2b1 Web:Files:Badges:Added new component QuickButtons and HOC WithQuickButtons. Moved badges from the Badges component to QuickButtons. Moved actions badges from HOC withBadges to WithQuickButtons. 2021-12-09 16:31:13 +03:00
5a8c60edf8 edit vi 2021-12-09 14:27:19 +03:00
372ba52d94 add translations 2021-12-09 14:07:51 +03:00
e8af856c26 Merge branch 'release/v1.1.0' into feature/translate-1.1.0 2021-12-09 13:55:55 +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
0bd39bfc19 Core: optimization 2021-12-08 22:18:04 +03:00
8abd9ef42b Nlog: fixed configs 2021-12-08 22:17:39 +03:00
b82747e7f4 Web:Files:Badges:Fixed work cursor lock badge. 2021-12-08 19:20:40 +03:00
87fe0892a4 Web:Files:Badges:Returned the frame on hover badge version. 2021-12-08 18:56:15 +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
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