Commit Graph

15863 Commits

Author SHA1 Message Date
2e684aeab4 Merge branch 'release/v1.1.0' of https://github.com/ONLYOFFICE/AppServer into release/v1.1.0 2021-12-13 01:32:55 +03:00
9269594b8a Web: DesktopEditors mode: Added more logs 2021-12-13 01:32:47 +03:00
f291945fc5 Web:Files:Badges:Fix SharedButton display. 2021-12-12 19:48:27 +03:00
031af716e6 Tfa: fix 2021-12-10 21:25:03 +03:00
bd410ebcd8 Web:Files:Badges:Combining shared and version status into one badge. Сolor change active SharedButton. 2021-12-10 18:46:41 +03:00
a62a555217 Files: tagDao. Precompiled queries 2021-12-10 17:04:33 +03:00
30c138ef8b Files: optimization configuration 2021-12-10 17:02:44 +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
fce12af277 add translations 2021-12-10 13:34:21 +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
66e59f1978 Merge branch 'feature/translate-1.1.0' of https://github.com/ONLYOFFICE/AppServer into feature/translate-1.1.0 2021-12-09 21:51:16 +03:00
878df989d9 Web: Renamed folder zh_CN to zh-CN 2021-12-09 21:51:05 +03:00
8538b55dfc Web: Turned on all languages 2021-12-09 21:45:10 +03:00
0771a54c47 Optimization 2021-12-09 20:23:06 +03:00
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