Commit graph

125 commits

Author SHA1 Message Date
Julia Radzhabova a207366b14 Fix merge release to develop 2021-08-25 20:51:35 +03:00
Maxim Kadushkin 5a7421e35d merge release 6.4.0 to develop 2021-08-25 19:02:44 +03:00
Julia Radzhabova 3e30b66193
[DE] Fix Bug 52165 (#1121) 2021-08-24 16:59:23 +03:00
Julia Radzhabova 5ffb7e8fa0 [SSE] Disable remove/resolve comment buttons when objects protected 2021-08-20 17:38:32 +03:00
Julia Radzhabova cfd5638646 [DE] Fix review balloon position 2021-08-13 14:32:32 +03:00
Julia Radzhabova a9c32f368e [DE] Use new methods for review display 2021-08-10 19:32:12 +03:00
Julia Radzhabova 2954b9ded5 [DE] Add parameter review.hoverMode to customization: show review changes balloons as tooltips (on mouse move) 2021-08-04 15:43:54 +03:00
Julia Radzhabova 7dfb96f914 [DE] Add simple markup mode for display review changes 2021-08-04 13:19:19 +03:00
Julia Radzhabova be8bc7dd42 Move api parameters showReviewChanges, reviewDisplay, trackChanges to section customization.review 2021-07-22 22:56:15 +03:00
Julia Radzhabova f13673653f Merge branch 'release/v6.4.0' into develop 2021-07-22 17:44:51 +03:00
Julia Radzhabova 4177faa7ee [DE] Support events for change review display mode 2021-07-19 14:06:01 +03:00
Julia Radzhabova 6506146eab [DE] Fix disable for several actions 2021-06-30 15:19:45 +03:00
Julia Radzhabova 68fc002dc3 Refactoring 2021-06-30 00:31:55 +03:00
Julia Radzhabova 8e5979570b [DE] Refactoring disable editing 2021-06-29 16:27:44 +03:00
Julia Radzhabova 59c658ecab Wopi: change config parameters and post messages 2021-05-13 00:57:01 +03:00
Julia Radzhabova f8ee00314a Change file sharing by url for wopi 2021-05-12 22:27:57 +03:00
Maxim Kadushkin 97474af94d Merge branch 'release/v6.3.0' into develop
# Conflicts:
#	apps/common/main/lib/controller/Plugins.js
#	apps/common/main/lib/view/Header.js
#	apps/documenteditor/main/app/controller/Main.js
#	apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js
#	apps/documenteditor/main/app/view/Toolbar.js
#	apps/documenteditor/main/locale/sl.json
#	apps/presentationeditor/main/app/view/ParagraphSettingsAdvanced.js
#	apps/presentationeditor/main/locale/ja.json
#	apps/spreadsheeteditor/main/app/controller/Main.js
#	apps/spreadsheeteditor/main/app/template/Toolbar.template
#	apps/spreadsheeteditor/main/app/view/ParagraphSettingsAdvanced.js
2021-04-29 23:31:07 +03:00
Julia Radzhabova 1449b92acc Fix plugins 2021-04-24 23:39:27 +03:00
Julia Radzhabova bc6653ef7f [DE] Fix Bug 49928 2021-04-24 01:30:36 +03:00
Julia Radzhabova 9a8db1b3b8 Disable resolve button 2021-04-07 22:50:53 +03:00
Julia Radzhabova 3b901f91e4 Use sdk class 2021-03-26 14:29:16 +03:00
Julia Radzhabova 7cc14b5f26 Refactoring review permissions 2021-03-16 13:46:44 +03:00
Julia Radzhabova 2fb370418f [DE] Refactoring 2021-03-01 18:07:12 +03:00
Julia Radzhabova c3b0f9c2b6 [DE] Fix new track changes 2021-02-27 12:43:32 +03:00
Julia Radzhabova 526732cc53 [DE] Change track revisions 2021-02-26 15:11:57 +03:00
Julia Radzhabova 7e822933ca Hide track changes tip on timeout 2021-02-10 13:40:53 +03:00
Julia Radzhabova 4b232db539 [DE] Save track changes to file: set 4 variants of track changes mode 2021-02-10 13:09:21 +03:00
Julia Radzhabova 583065a6af [DE] Change name for guest user 2020-12-10 14:48:03 +03:00
Julia Radzhabova 7b52161726 [DE][DE mobile] Add api parameter customization.trackChanges: on/off track changes mode in document editor 2020-11-02 14:16:52 +03:00
Julia Radzhabova 460ff7e6f3 Merge branch 'feature/de-new-controls' into develop 2020-10-31 19:11:19 +03:00
Julia Radzhabova a8325910b7 [DE] Use OptionsDialog 2020-10-15 15:37:48 +03:00
Julia Radzhabova 0a9d8773cd [DE] Turn on/off fill form mode from Forms tab 2020-10-08 11:11:34 +03:00
Julia Radzhabova b7f410def8 Changes for reviewPermissions: support for "" - empty group.
Used for users without groups.
2020-09-02 21:03:09 +03:00
Julia Radzhabova e222fdf4a7 Add parameter to api config: customization.reviewPermissions (user name must be prefixed) 2020-08-04 22:20:20 +03:00
Julia Radzhabova 0d3ba4831f Refactoring 2020-06-05 20:34:50 +03:00
Julia Radzhabova d041247d7b
[DE][DE mobile] Fix bugs in review changes (#339) 2020-02-14 17:39:13 +03:00
Julia Radzhabova 019dffbceb Add event onRequestSharingSettings: use instead editorConfig.sharingSettingsUrl. 2019-11-28 16:54:14 +03:00
Julia Radzhabova 8027645de5 Merge branch 'develop' into feature/compare 2019-11-28 12:51:56 +03:00
Julia Radzhabova 9d8675f041 [DE] Disable comparing of documents in the co-editing mode 2019-11-14 13:25:01 +03:00
Julia Radzhabova fbb8c0c110 Disable comments remove when comments are not displayed 2019-10-29 17:08:47 +03:00
Sergey Luzyanin a7aa69f454 [de][comparison] Fix callback call 2019-10-25 13:46:37 +03:00
Julia Radzhabova e605452cfb [DE] Compare use onRequestCompareFile/setRevisedFile for loading file 2019-10-15 11:44:38 +03:00
Julia Radzhabova 3facb70eba [DE] Compare: use loading from fileChoiceUrl 2019-10-15 10:58:18 +03:00
Julia Radzhabova 5c05508dcf [DE] Compare files: add errors. 2019-10-11 15:12:59 +03:00
Julia Radzhabova fa4e0a6cda [DE] Add asc_onAcceptChangesBeforeCompare event 2019-10-09 17:33:29 +03:00
Julia Radzhabova 9e9a60c466 Merge branch 'develop' into feature/compare 2019-10-09 17:02:05 +03:00
Julia Radzhabova 611c12e885 Refactoring change access rights. Fix Bug 43103, Bug 43105 2019-10-09 13:23:40 +03:00
Julia Radzhabova 8d3ec85ca2 Merge branch 'develop' into feature/optimization 2019-09-18 16:32:26 +03:00
Julia Radzhabova 2a141b4ceb [DE][PE] Fix Bug 42696 2019-09-04 15:37:57 +03:00
Julia Radzhabova 36e83f7cb3 Merge branch 'develop' into feature/optimization 2019-08-27 13:48:14 +03:00