Commit graph

433 commits

Author SHA1 Message Date
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
Julia Radzhabova c823cb38fe [DE] Fix view mode, select user email using keyboard. 2019-04-18 17:16:07 +03:00
Julia Radzhabova 145008eaae [DE] Add user email to comment 2019-04-18 17:08:48 +03:00
Julia Radzhabova 58a1ddb834 Find emails for sending invitation (begins with + or @) when adding comment. 2019-04-18 17:06:46 +03:00
Julia Radzhabova 0dcc980e9f [DE] Add tooltip for Follow Move button in review changes 2019-04-16 13:13:49 +03:00
Julia Radzhabova 05a2056fa5 [DE] Bug 41216 2019-04-15 14:06:41 +03:00
Julia Radzhabova 2244c5ba29
Merge pull request #157 from ONLYOFFICE/feature/review-move
Feature/review move
2019-04-12 18:20:52 +03:00
Julia Radzhabova d22611e4cd [DE] Add translation 2019-04-12 18:09:57 +03:00
Julia Radzhabova 550b22c3be [DE] Review: add description for moved text and move to changed text 2019-04-12 17:55:08 +03:00
Julia Radzhabova 233951d551 [DE] Bug 41193 2019-04-12 15:15:06 +03:00
Julia Radzhabova 6da9f77db0 [Comments] Save text for new (not added) comment: clear text when esc, close or add button pressed 2019-04-11 17:43:28 +03:00
Julia Radzhabova be7ba215d5 [DE] Added description for review changes 2019-04-03 17:01:32 +03:00
Maxim Kadushkin 8a6715f03b [all] refactoring 2019-04-03 16:49:29 +03:00
Maxim Kadushkin 86a808ba4f [all] share some config to desktop 2019-03-29 16:01:46 +03:00
Julia Radzhabova 8cca5fc839 Merge into develop from release/v5.3.0 2019-03-29 13:05:29 +03:00
Julia Radzhabova 128411ba08 [DE] Hide "Display Mode" button for review changes when document is opened in fill forms or commenting mode (use "Markup" option - show all review changes) 2019-03-28 16:35:27 +03:00
Julia Radzhabova 0c20f3b91e Fix review changes locking 2019-03-25 17:21:27 +03:00
Julia Radzhabova c2b4892502 Fix Bug 40787 2019-03-18 16:17:46 +03:00
Julia Radzhabova cf769ab97a Fix for desktop app 2019-03-15 13:30:46 +03:00
Julia Radzhabova 3350f387e0 [DE] Fix review=false mode 2019-03-06 10:33:38 +03:00
Maxim Kadushkin 1e5a6e6c8d [common] debug plugins loading 2019-03-04 18:13:52 +03:00
Julia Radzhabova a6091d9326 Merge branch 'develop' into feature/async-xhr 2019-03-04 17:04:32 +03:00
Maxim Kadushkin 583575040b Merge branch 'develop' into feature/flex-production 2019-03-04 12:15:39 +03:00
Julia Radzhabova f8f4aad60d Fix Bug 40746 2019-03-01 16:10:20 +03:00
Julia Radzhabova 5b834e4ca8 Fix Bug 40582. Refactoring rev. 71997cf64e (4 Jun 2018) 2019-02-26 16:17:05 +03:00
Julia Radzhabova 934bcbc4c4 Bug 26462: add new comment to text with other comments 2019-02-25 19:10:03 +03:00
Maxim Kadushkin 8df10d8348 [all] debug plugins loading 2019-02-25 16:09:43 +03:00
Maxim Kadushkin 963cd66d01 refactoring 2019-02-22 15:28:39 +03:00
Julia Radzhabova fdc734d898 Fix Bug 40582 2019-02-18 16:02:32 +03:00
Maxim Kadushkin 8bff4f4b35 [DE] moved plugins functions from Main controller 2019-02-15 13:44:37 +03:00
Julia Radzhabova 164378dfaa [Common] Hide comment popover when switch to preview comment mode 2019-02-13 13:33:28 +03:00
Julia Radzhabova 407ba1fcca Fix Bug 40401. Show Search dialog in find mode when open mailmerge preview, version history, review preview 2019-02-13 12:57:02 +03:00
Maxim Kadushkin 9b5ae84f58 Merge branch 'feature/custom-header-view' into develop 2019-02-07 16:00:33 +03:00
Maxim Kadushkin e08ced6efd [common] use editor color for color of underscore on new style 2019-02-07 15:04:13 +03:00
Julia Radzhabova 048b8480ce Merge branch 'hotfix/v5.2.8' into develop 2019-02-05 16:43:52 +03:00
Julia Radzhabova b8fc92092a [DE] Fix comments and review changes in version history mode (clear comments and rev.changes when loading revisions, disable toolbar) 2019-02-05 15:11:22 +03:00
Julia Radzhabova 84b0419deb [DE] Disable accepting/rejecting review changes when preview mail merge and in version history mode 2019-02-04 16:43:25 +03:00
Julia Radzhabova 7d54f26372 Fix Bug 35911 2019-01-28 16:51:07 +03:00
Alexander.Trofimov c10009a464 [copyright] Update Copyright
Limited -> SIA
2019-01-17 16:05:03 +03:00
Alexander.Trofimov 68a1691d28 [copyright] For bug 39644
Change address Latvian office.
2019-01-17 16:00:34 +03:00
Alexander.Trofimov 1c9e684698 [copyright] Update Copyright
2018 -> 2019
2019-01-17 15:58:05 +03:00
Oleg Korshul 51bd550fc1 Add support system plugins to web 2019-01-17 14:01:35 +03:00
Julia Radzhabova 773a49d683 Fix Bug 40242 2019-01-16 12:55:46 +03:00
Julia Radzhabova 1e1d1ebd17 Merge branch 'develop' into feature/review-in-viewer 2019-01-15 17:49:00 +03:00
Julia Radzhabova 2e322cf66f Hide plugins tab when no visible plugins (e.g., editor has only editing plugins but is opened in viewer mode) 2019-01-15 17:05:13 +03:00
Julia Radzhabova faf3cceeea Merge branch 'hotfix/v5.2.7' into develop 2019-01-15 15:18:47 +03:00
Julia Radzhabova db2f5818c7 [DE] Save/load display mode for review changes to/from local storage in viewer (set "original" mode by default) 2019-01-15 14:12:09 +03:00
Julia Radzhabova 61ce51f6a1 View comments in final/original display mode (don't disable left comments panel) 2019-01-14 16:51:23 +03:00
Julia Radzhabova 19f7dbf6e6 [DE] Check review changes from all users in view mode 2019-01-10 10:34:03 +03:00
Julia Radzhabova b8dc7d4017 [DE] Show review changes in view mode. Add collaboration tab in view mode (change display mode) 2018-12-18 17:27:19 +03:00
Julia Radzhabova f621e671eb Show comments in view mode (hints, left panel, advanced settings in the File menu) 2018-12-17 11:37:43 +03:00
Julia Radzhabova 1153d9a803 [SSE] Fix adding comments on new sheet 2018-12-14 17:53:05 +03:00
Julia Radzhabova 3eb1c21ecd Plugins: add translation for plugin buttons, add option for hiding buttons in the viewer 2018-12-13 15:01:19 +03:00
Julia Radzhabova 540da6573d Plugins: add urlAddition parameter 2018-12-13 11:16:18 +03:00
Julia Radzhabova 1d2d38ec1e Merge with hotfix/v5.2.4 2018-12-11 16:27:35 +03:00
Julia Radzhabova 90eaf7de72 FIx Bug 36927. Refactoring comments for spreadsheet editor: load/render comments for current sheet only. 2018-11-16 16:44:11 +03:00
Maxim Kadushkin 44e8976021 [common] fix bug 38430 2018-11-07 18:42:16 +03:00
Maxim Kadushkin f3d5090806 [common] extended 'close' request 2018-11-02 15:17:45 +03:00
Maxim Kadushkin 7dced037a3 [DE SSE PE] extended request to close editor 2018-10-31 12:16:44 +03:00
Julia Radzhabova 0180e527d6 [DE] Always check if document has new revision changes 2018-09-12 17:21:43 +03:00
Julia Radzhabova d5c7220c9c [DE] Save track-changes option for file key 2018-09-12 15:44:20 +03:00
Oleg Korshul 01d8760fc2 Add "events" item to plugin variation 2018-08-30 14:15:38 +03:00
Julia Radzhabova 2a254a88d0 [Desktop] Show/hide protect settings depending on sdk settings (use isSignatureSupport, isProtectionSupport) 2018-08-01 19:08:24 +03:00
Julia Radzhabova 69b1b7b11a Fix Bug 37586 2018-07-31 12:51:31 +03:00
Julia Radzhabova 5a3f316bfe Sort comments in the popover by ascending creation time 2018-07-20 17:01:07 +03:00
Julia Radzhabova 6c4e7cf566
Merge branch 'develop' into hotfix/v5.1.5 2018-07-18 10:03:33 +03:00
Julia Radzhabova aa9d331414 [Desktop] Disable/enable password editing 2018-06-14 15:11:50 +03:00
Julia Radzhabova dbdf13f1a1 Show comments and review changes in the same window 2018-06-07 17:09:54 +03:00
Julia Radzhabova bb29cc5e27 Show user color in chat messages 2018-06-05 15:46:46 +03:00