Commit graph

354 commits

Author SHA1 Message Date
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
Julia Radzhabova 8212070fa3 Header: show editing users in format <username>(<opened browser tabs>) 2018-06-05 11:54:49 +03:00
Julia Radzhabova 71997cf64e Draw user color in comments, chat, review changes. 2018-06-04 14:45:22 +03:00
Julia Radzhabova 0523524829 Fix Bug 37570 2018-05-17 17:34:04 +03:00
Julia Radzhabova 869bc1a7a6 [DE] Show File and Plugins tabs in view mode 2018-05-15 15:37:26 +03:00
Julia Radzhabova 14426a4b04 Fix bug with plugin groups (don't separate groups without plugins) 2018-05-15 11:15:35 +03:00
Julia Radzhabova 4aa68f5eb5 Fix Bug 37355 2018-05-03 18:27:05 +03:00
Julia Radzhabova 3d6ebf252c Disable protection feature. 2018-04-28 13:25:41 +03:00
Maxim Kadushkin 057d730c78 [Desktop] config didn't update 2018-04-27 16:32:39 +03:00
Maxim Kadushkin f9bd3b3d47 [Desktop] config wasn't updated 2018-04-17 15:10:21 +03:00
Alexey Golubev 09606f77bb v5.1.2 2018-04-11 14:28:01 +03:00
Julia Radzhabova 11ca118097 Show multiple comments in the popover 2018-04-06 12:04:20 +03:00
Maxim Kadushkin 03e6994738 Merge branch 'develop' into feature/desktop-new 2018-03-14 18:08:19 +03:00
Maxim Kadushkin 7fd2497462 Merge branch 'release/v5.1.0' into develop 2018-03-14 17:59:24 +03:00
Maxim Kadushkin 0ee904ab39 [ALL] removed event for desktop 2018-03-14 17:54:51 +03:00
Julia Radzhabova cd45f0ae06 [DE] Disable items in the Navigation context menu when editing is disabled 2018-03-07 13:47:41 +03:00
Maxim Kadushkin 99a7be61c6 merge with develop 2018-03-04 23:41:58 +03:00
Pavel Lobashov 06da18bf2d Update copyright to 2018 2018-03-01 15:16:38 +03:00
Julia Radzhabova 68ae26ac5d Fix Bug 36870 2018-02-28 18:04:11 +03:00
Maxim Kadushkin 482a7d11bf Merge branch 'develop' into feature/desktop-new
# Conflicts:
#	apps/documenteditor/main/app/controller/Main.js
#	apps/documenteditor/main/app/controller/Toolbar.js
#	apps/presentationeditor/main/app/controller/Main.js
#	apps/spreadsheeteditor/main/app/controller/Main.js
2018-02-22 02:41:49 +03:00
Maxim Kadushkin dcd1589adc [common] added 'Desktop' controller 2018-02-22 02:24:03 +03:00
Julia Radzhabova fa34aa1558 Fix Bug 36936. 2018-02-15 11:57:48 +03:00
Julia Radzhabova 42949a67aa [SSE] Comment: Bug 36927. Don't render comments when left comments panel is closed. 2018-02-14 12:14:22 +03:00
Julia Radzhabova 22237f9634 Fix Bug 36885. 2018-02-08 18:22:32 +03:00
Julia Radzhabova 833f9fc1b1 Merge branch 'hotfix/v5.0.7' into develop 2018-01-15 16:11:11 +03:00
Julia Radzhabova d1e3692e48
Merge branch 'develop' into hotfix/v5.0.6 2017-12-11 13:24:21 +03:00
Julia Radzhabova 4b4bef4e0b Added groups for plugins. 2017-12-07 17:46:13 +03:00
Julia Radzhabova 4d90badb55 Merge branch 'hotfix/v5.0.6' into feature/v5.0.6-signature 2017-12-06 14:53:09 +03:00
Julia Radzhabova d7b0a40b99 Fix chart editing in the desktop. 2017-12-06 10:06:45 +03:00
Julia Radzhabova 662a7e0c20 [DE] Disable/enable plugins left panel when review mode is changed. 2017-12-01 14:50:25 +03:00
Julia Radzhabova 16c1af8a2b Refactoring signatures: enable adding invisible signature when document is signed. 2017-11-28 15:52:30 +03:00
Julia Radzhabova dbc71821ae Refactoring contex menu for signature. 2017-11-28 15:50:50 +03:00
Julia Radzhabova 490a79ea47 [Common] Refactoring signature. 2017-11-28 15:33:25 +03:00
Julia Radzhabova 227138f3c3 [DE] Request signature before sign document. 2017-11-28 15:32:57 +03:00
Julia Radzhabova ab99ce6adb [DE] Disable protect settings when review mode is changed. 2017-11-28 15:32:07 +03:00
Julia Radzhabova d48e76e5c6 [DE] Change signature settings layout in the right panel. 2017-11-28 15:30:26 +03:00
Julia Radzhabova 4da0fe1938 [DE] Change layout for protect file menu. 2017-11-28 15:30:10 +03:00
Julia Radzhabova ceb0cd4b5e [DE] Refactoring signature settings in the right and left panels. 2017-11-28 15:29:14 +03:00
Julia Radzhabova 7d75359ff4 Update password changing. 2017-11-28 15:25:22 +03:00
Julia Radzhabova abdaa3ede6 [DE] Update translations. 2017-11-28 15:25:06 +03:00
Julia Radzhabova 9e458a51f8 [DE] Added Protection tab with the ability to encrypt and sign document. 2017-11-28 15:23:37 +03:00
Julia Radzhabova b471b732b1 Fix Bug 31420. 2017-11-24 15:02:52 +03:00
Julia Radzhabova 29810902e4 Fix Bug 36426. 2017-11-24 09:31:34 +03:00
Julia Radzhabova 493a464076 Refactoring signatures: enable adding invisible signature when document is signed. 2017-11-23 16:29:05 +03:00
Julia Radzhabova 084e254b42 Refactoring contex menu for signature. 2017-11-23 14:29:41 +03:00
Julia Radzhabova a90f108209 [DE] Change applying the license (disable editing when connections are over the limitations). 2017-11-22 15:20:51 +03:00
Julia Radzhabova 28a1c6561f [Common] Refactoring signature. 2017-11-17 12:23:31 +03:00
Julia Radzhabova 66fe289633 [DE] Request signature before sign document. 2017-11-17 11:44:36 +03:00
Julia Radzhabova 0a2e8ffdda [DE] Disable protect settings when review mode is changed. 2017-11-17 10:26:06 +03:00
Julia Radzhabova 354e9d1a9b [DE] Change signature settings layout in the right panel. 2017-11-16 16:06:55 +03:00
Julia Radzhabova 781030ed3d [DE] Change layout for protect file menu. 2017-11-16 12:43:21 +03:00
Julia Radzhabova 1bcb080cf7 [DE] Refactoring signature settings in the right and left panels. 2017-11-15 15:52:37 +03:00
Julia Radzhabova 7630a072f8 Update password changing. 2017-11-15 11:40:36 +03:00
Julia Radzhabova c2f360fb0c [DE] Update translations. 2017-11-15 11:11:50 +03:00
Julia Radzhabova 222c0bf74d [DE] Added Protection tab with the ability to encrypt and sign document. 2017-11-15 10:59:06 +03:00
Julia Radzhabova 27afcaba0f
Merge branch 'develop' into hotfix/v5.0.4 2017-11-13 18:32:25 +03:00
Julia Radzhabova cba014bbc7 Save co-editing mode option when changed from Collaborative tab. 2017-11-07 15:00:11 +03:00
Julia Radzhabova 7af4bc9d7b Plugins refactoring. 2017-11-01 12:03:37 +03:00
Julia Radzhabova c02389ab21
Merge branch 'develop' into hotfix/v5.0.3 2017-10-31 20:15:07 +03:00
Julia Radzhabova c8879d7c07 Comments refactoring. 2017-10-31 11:51:45 +03:00
Julia Radzhabova db3475a6e6 Merge branch 'feature/collaboration-tab' into develop 2017-10-27 16:03:03 +03:00
Oleg Korshul c8a12f7dba new plugins scheme (system & parallel working) 2017-10-17 18:08:12 +03:00
Julia Radzhabova 8cce90d8f0 Hide Plugins tab when no plugins. Hide Review tab when no buttons on this tab (for the future). 2017-10-12 17:25:47 +03:00
Julia Radzhabova 5178858833 [SSE] Added collaboration tab. 2017-10-12 13:43:23 +03:00
Julia Radzhabova 1057868cda Set application prefix for Collaboration tab (used for saving to local storage). 2017-10-12 12:05:55 +03:00
Julia Radzhabova b638710824 Merge branch 'hotfix/v5.0.2' into feature/collaboration-tab 2017-10-11 13:18:39 +03:00
Julia Radzhabova cae3819434 [DE] Added Chat button to the collaborative tab in the toolbar. 2017-10-10 15:14:27 +03:00
Julia Radzhabova 7d1a4e14c9 [DE] Remove spellcheck and document language buttons from the toolbar collaboration tab. 2017-10-09 15:03:50 +03:00
Julia Radzhabova 32267aa6ab [DE] Added tab Collaboration. 2017-10-07 16:06:51 +03:00
Alexey Golubev fce84eef7a v5.0.1 2017-10-05 14:48:08 +03:00
Julia Radzhabova 229c47b8a0 Autostart array of plugins. 2017-10-03 20:45:41 +03:00
Julia Radzhabova f37d4b53ac Set full plugins list to sdk, but add buttons to the toolbar using "EditorsSupport" field . 2017-10-03 20:42:41 +03:00
Maxim Kadushkin 1afc0e47de [Common] refactoring 2017-10-03 20:41:44 +03:00
Julia Radzhabova b4029143fa [DE] Fix Bug 35406. 2017-10-03 14:22:33 +03:00
Julia Radzhabova 52b56fa997 [DE] Set serverVersion parameter to version history items. 2017-09-22 17:18:06 +03:00
Julia Radzhabova 9ce1c45226 Change api event: "onReady" -> "onAppReady", added "onDocumentReady" event. 2017-09-20 14:32:18 +03:00
Julia Radzhabova e1bde7bbc2 Autostart array of plugins. 2017-09-13 15:02:34 +03:00
Julia Radzhabova 4eaf251ae5 Set full plugins list to sdk, but add buttons to the toolbar using "EditorsSupport" field . 2017-09-11 15:47:36 +03:00
Maxim Kadushkin 41fd7a1bce [Common] debug for 'preview' mode 2017-09-07 18:01:26 +03:00
Maxim Kadushkin 3da352c6e7 [Common] debug for 'preview' mode 2017-09-07 17:55:30 +03:00