Commit graph

401 commits

Author SHA1 Message Date
Julia Radzhabova 460ff7e6f3 Merge branch 'feature/de-new-controls' into develop 2020-10-31 19:11:19 +03:00
Maxim Kadushkin 29520613f9 [desktop] fixed wrong action click 2020-10-28 22:59:24 +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 92c97dc1aa Change config parameter documentType: it must take one of the values word/cell/slide (deprecate text/spreadsheet/presentation values). 2020-09-11 16:34:29 +03:00
Maxim Kadushkin aa0242e16d [desktop] cut unused code 2020-09-04 20:23:57 +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 47692237c4 Add userdata field to comments 2020-08-31 14:27:54 +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 e0be508225 Merge branch 'hotfix/v5.6.0' into develop 2020-07-28 22:15:23 +03:00
Julia Radzhabova e79fa7f093 [Plugins] Move help parameter to variations 2020-07-21 18:23:39 +03:00
Julia Radzhabova 70a4ff2b87 Show help for plugins 2020-07-21 15:33:22 +03:00
Maxim Kadushkin e1a707e49c [desktop] 'isCrypted' sent to desktop app 2020-06-09 00:22:12 +03:00
Julia Radzhabova 0d3ba4831f Refactoring 2020-06-05 20:34:50 +03:00
Julia Radzhabova ef5fe977da
Merge pull request #408 from ONLYOFFICE/feature/macros-settings
Feature/macros settings
2020-06-03 16:55:13 +03:00
Maxim Kadushkin b1233935d8 [desktop] changed 'desktop' controller 2020-05-22 18:02:54 +03:00
Julia Radzhabova 10d596be29 [DE] Add api parameter customization.plugins: hide plugins panel when false 2020-05-21 23:07:41 +03:00
Maxim Kadushkin f50d0253ca [all] debug locked file open 2020-04-29 20:54:48 +03:00
Maxim Kadushkin 90128ec48c [desktop] fix bug 45170 2020-04-27 19:38:55 +03:00
Maxim Kadushkin 37094765cb [desktop] debug for locked file 2020-04-24 12:00:28 +03:00
Maxim Kadushkin c462bd6ddb [desktop] fix bug 45005 2020-04-21 17:03:04 +03:00
Maxim Kadushkin 7bd2011e08 [desktop] fix bug 45170 2020-04-21 11:20:15 +03:00
Maxim Kadushkin c7902ef927 [desktop] fix bug 45095 2020-04-09 18:21:51 +03:00
Maxim Kadushkin bc5552711d [desktop] send editor's config as soon as ready 2020-04-09 18:21:51 +03:00
maxkadushkin 583d745b84
Update Desktop.js (#374) 2020-04-03 16:26:40 +03:00
maxkadushkin 3268acdfcf
fix bug 45012 (#372) 2020-04-02 17:17:35 +03:00
Maxim Kadushkin 46bd7b76a5 [desktop] hide modal window's mask 2020-03-17 18:06:09 +03:00
Maxim Kadushkin 586d26619f [desktop] fix bug 42729 2020-03-15 18:13:29 +03:00
Maxim Kadushkin aa984412b2 fix bug 44815 2020-03-13 17:46:10 +03:00
Maxim Kadushkin 8c5cf7e9f9 [desktop] refactoring 2020-03-05 13:09:53 +03:00
maxkadushkin 650b0c0f82
Update Desktop.js (#352) 2020-02-26 16:14:04 +03:00
maxkadushkin ca46cf41b0
Update Desktop.js (#349) 2020-02-25 18:23:38 +03:00
Julia Radzhabova d041247d7b
[DE][DE mobile] Fix bugs in review changes (#339) 2020-02-14 17:39:13 +03:00
maxkadushkin 7ff056f7d5
Update Desktop.js (#334) 2020-02-07 16:15:41 +03:00
Julia Radzhabova eb9da5251b Add parameter customization->mentionShare: change hint for mention in comment 2019-12-23 15:51:00 +03:00
Julia Radzhabova 36b19cf3d0 [Mentions] Check onRequestSendNotify event when send notification (don't check onRequestUsers event) 2019-12-20 17:40:15 +03:00
Maxim Kadushkin e5a0e50eda Merge with develop 2019-12-04 15:26:53 +03:00
Julia Radzhabova f9ac080ba0 Merge branch 'hotfix/v5.4.2' into develop 2019-11-29 16:01:17 +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 b811606de9 Merge branch 'develop' into feature/remove-comments 2019-11-15 11:52:22 +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 769fa9a611 Merge branch 'develop' into feature/compare 2019-11-14 12:47:19 +03:00
Julia Radzhabova 56042f4c89 [SSE] Fix appearance of comment popover in view mode 2019-11-13 14:47:32 +03:00
Julia Radzhabova 0dd9e23188 Merge branch 'develop' into feature/remove-comments 2019-11-13 14:32:00 +03:00
Julia Radzhabova 9f4c98cedf [DE] Fix bug in version history (wrong history data parameters) 2019-11-13 13:51:32 +03:00
Maxim Kadushkin 7141304b4e [desktop] keep early requests for 'desktop' plugin 2019-11-06 16:55:02 +03:00
Julia Radzhabova 3308662a1d [DE] Fix Bug 43460 (#261) 2019-11-06 11:07:56 +03:00
Maxim Kadushkin a72d14d421 [desktop] send 'save' button changed icon 2019-11-05 15:28:33 +03:00
Maxim Kadushkin a0616e8f17 [common] refactoring 2019-11-05 15:17:48 +03:00
Maxim Kadushkin 9e24e71941 [desktop] bind to modal dailog show/hide events 2019-10-30 16:30:43 +03:00
Maxim Kadushkin af1cb78840 [desktop] doesn't serialize button's icon info 2019-10-30 16:29:27 +03:00
Julia Radzhabova fbb8c0c110 Disable comments remove when comments are not displayed 2019-10-29 17:08:47 +03:00
Julia Radzhabova b5c481dd65 Remove comments 2019-10-28 14:20:21 +03:00
Sergey Luzyanin a7aa69f454 [de][comparison] Fix callback call 2019-10-25 13:46:37 +03:00
Julia Radzhabova f34167d0f2 Remove comments (current, all, only my comments) 2019-10-18 13:28:30 +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 e20dd48374 Fix buttons in plugins dialog 2019-10-08 10:50:22 +03:00
Maxim Kadushkin 43180c90eb [all] sync info with desktop app 2019-10-07 15:47:56 +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 0643f6756d [Common] Don't render plugins list 2019-09-03 17:36:32 +03:00
Julia Radzhabova 36e83f7cb3 Merge branch 'develop' into feature/optimization 2019-08-27 13:48:14 +03:00
Julia Radzhabova ef91d66f2f [DE] View review changes in edit mode (don't check revisions on start, as they may come from other users) 2019-08-23 17:23:44 +03:00
Julia Radzhabova e1142bac16 [DE] Fix view mode 2019-08-23 11:42:21 +03:00
Julia Radzhabova 322888f37d [DE] Compare documents: use sdk methods 2019-08-14 16:18:57 +03:00
Julia Radzhabova 8ae13a7fde [DE] Add settings for comparison of documents 2019-08-14 11:07:24 +03:00
Julia Radzhabova 9b0047189d [DE] Compare two documents 2019-08-13 17:40:52 +03:00
Julia Radzhabova 4abaffcf88 Change usage of asc_DownloadAs 2019-07-24 11:36:13 +03:00
Julia Radzhabova 579fb0d32a [Mentions] Fix changing comments 2019-07-18 14:05:31 +03:00
Julia Radzhabova a8db76ea39 Move selecting comment on loading document to sdkjs 2019-07-17 15:07:53 +03:00
Julia Radzhabova 8cc4803b82 [Comments] Fix opening comment action 2019-07-16 17:50:21 +03:00
Maxim Kadushkin 511888dc4e [all] opened 'create new' option for desktop app 2019-07-16 16:30:37 +03:00
Julia Radzhabova c9dbd128e8 [Comments] Use original guid for comment mentions 2019-07-16 15:50:55 +03:00
Julia Radzhabova 112c12d64c User original id for comments mentions 2019-07-16 13:11:38 +03:00
Julia Radzhabova 010520dd55 [PE] Refactoring spell check button 2019-07-15 16:22:34 +03:00
Julia Radzhabova bd6071ccd2 Merge branch 'feature/comment-mentions' into develop 2019-07-12 17:00:29 +03:00
Julia Radzhabova f19597a9cb Mentions refactoring: add placeholder to comment textarea, set mentions on adding reply, clear external users when change document access rights 2019-06-26 14:04:02 +03:00
Julia Radzhabova dbb0e8e499 Mentions: use hasAccess user option 2019-06-25 15:05:14 +03:00
Julia Radzhabova 08e3e47fa1 Merge branch 'hotfix/v5.3.2' into develop 2019-06-21 18:28:46 +03:00
Julia Radzhabova 0a3fe3630a Fix loading plugins in desktop application 2019-06-14 15:55:37 +03:00
Julia Radzhabova 3bfdd7ac32 [DE] Add customization->reviewDisplay parameter (#188) 2019-06-13 17:37:56 +03:00
maxkadushkin 206741d83b Feature/pr2 hotfix v5.3.2 (#183)
* [build] apply tags to vary production info

* [build] debug

* [DE] refactoring

* [all] extend production tags

* [build] read environment variables

* refactoring
2019-06-07 18:23:33 +03:00
Julia Radzhabova 4e41fbf782 Fix plugins loading 2019-05-30 16:15:18 +03:00
Julia Radzhabova 2e16e770e8 Customization plugins refactoring 2019-05-23 17:25:44 +03:00
Julia Radzhabova 4c8196aac4 Fix plugins 2019-05-22 17:42:23 +03:00
Maxim Kadushkin cc7b8102ca Merge branch 'release/v5.3.0' into develop
# Conflicts:
#	apps/documenteditor/main/app/controller/Main.js
2019-05-22 16:02:54 +03:00
Julia Radzhabova 06d71b464b Fix loading plugins 2019-05-22 14:44:30 +03:00
Julia Radzhabova 2d8059a61d Plugins refactoring 2019-05-21 13:02:55 +03:00
Julia Radzhabova 69c9cc3dab Merge branch 'feature/async-xhr' into develop 2019-05-17 11:40:40 +03:00
Julia Radzhabova a65cc89437 [DE] Fix Bug 41580 2019-05-16 14:17:18 +03:00
Maxim Kadushkin 126cf552df [all] added 'Undock' button 2019-05-13 14:45:17 +03:00
Julia Radzhabova 42120fe5d4 [DE] Fix Bug 41450 2019-04-26 17:10:34 +03:00
Julia Radzhabova 25e50435bb Request users for mentions, send mentions 2019-04-23 14:41:35 +03:00
Julia Radzhabova 36e92e7810 Bug 41347 2019-04-22 11:04:54 +03:00