Commit graph

174 commits

Author SHA1 Message Date
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 67499c5d21 Fix Bug 34613, Fix Bug 16000 2021-04-20 18:46:41 +03:00
Julia Radzhabova ff6ed83339 Move changeCoAuthoring parameter to permissions 2021-04-02 11:08:36 +03:00
Julia Radzhabova 553b2daffc [DE] Add api parameters for co-authoring mode 2021-04-01 13:36:08 +03:00
Julia Radzhabova 4da4514e97 [PE][DE] Fix show history 2021-03-29 16:40:05 +03:00
Julia Radzhabova 92d4fec022 Show beta version label 2020-11-02 23:26:17 +03:00
Julia Radzhabova 5f03cfae8a Add api event onRequestCreateNew for creating files 2020-06-15 20:05:19 +03:00
Julia Radzhabova 469c76d0a1 [DE][PE] Add settings for copy, cut, paste 2020-06-04 11:51:14 +03:00
Julia Radzhabova 0a41040bff Fix Bug 44520 2020-02-17 17:30:15 +03:00
Julia Radzhabova f9ac080ba0 Merge branch 'hotfix/v5.4.2' into develop 2019-11-29 16:01:17 +03:00
Julia Radzhabova 933a0d001b Update translation (#262) 2019-11-08 13:53:10 +03:00
Julia Radzhabova fbb8c0c110 Disable comments remove when comments are not displayed 2019-10-29 17:08:47 +03:00
Julia Radzhabova 611c12e885 Refactoring change access rights. Fix Bug 43103, Bug 43105 2019-10-09 13:23:40 +03:00
Julia Radzhabova 1a5ac4ffcc [DE] Fix download as docx 2019-08-06 11:24:44 +03:00
Julia Radzhabova 85b5d88c12 [DE] Fix rev. c0862be9b9 (Change downloading as TXT/ RTF) 2019-08-06 10:49:13 +03:00
Julia Radzhabova 1cff575fd6 Add onRequestSaveAs event 2019-07-26 12:54:20 +03:00
Julia Radzhabova 9f3daf68ef [DE] FIx Bug 42176 2019-07-25 15:13:40 +03:00
Julia Radzhabova a43e7a0c85 Change usage of advanced options on load/save csv, txt, rtf 2019-07-25 10:14:45 +03:00
Julia Radzhabova c0862be9b9 [DE][SSE] Change downloading as TXT/ RTF and CSV 2019-07-24 17:33:29 +03:00
Julia Radzhabova 39bfe54860 Change usage of asc_Print 2019-07-24 16:07:16 +03:00
Julia Radzhabova b0d6c172b9 [DE] Set option for saving docx in mode compatible with old versions 2019-07-24 12:27:14 +03:00
Julia Radzhabova 4abaffcf88 Change usage of asc_DownloadAs 2019-07-24 11:36:13 +03:00
Maxim Kadushkin 511888dc4e [all] opened 'create new' option for desktop app 2019-07-16 16:30:37 +03:00
Julia Radzhabova b53773a298 Bug 39667 2019-02-20 14:13:10 +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
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
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
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 8348a8d432 [DE] Search selected text 2018-11-15 15:02:50 +03:00
Julia Radzhabova 1d3f946653
Merge branch 'develop' into hotfix/v5.2.3 2018-10-30 13:08:21 +03:00
Julia Radzhabova c62858944f Enable/disable downloading and printing for different disconnections. Add Asc.c_oAscError.ID.EditingError error. 2018-10-25 16:19:29 +03:00
Julia Radzhabova 84dbf3cc68 Remove 'command+h' hotkey for MacOs (hotkey must close active app) 2018-10-12 14:36:01 +03:00
Julia Radzhabova f671569c88 Merge branch 'release/v5.2.0' into develop 2018-09-28 13:47:04 +03:00
Julia Radzhabova 641e5813af Bugfix 2018-09-27 16:12:19 +03:00
Julia Radzhabova 8dc82501ef [DE] Replace MailMergeSaveDlg by SaveAsDlg from common 2018-09-27 13:52:15 +03:00
Julia Radzhabova 29dfa2b83d [DE] Change config parameter for selecting save folder 2018-09-27 13:25:30 +03:00
Julia Radzhabova a8482985e8 [DE] Add 'Save Copy As' action to file menu. Bug 23603, Bug 32790 2018-08-22 11:13:37 +03:00
Julia Radzhabova 9463b08164 Fix save button in the left menu (PE, SSE - disable on start) 2018-07-25 11:21:18 +03:00
Julia Radzhabova 902f5d2f5f Merge branch 'hotfix/v5.1.4' into develop 2018-05-14 14:21:55 +03:00
Julia Radzhabova 680f549846 [DE] Fix setting option Realtime collaboration changes to "View All" 2018-05-07 15:47:44 +03:00
maxkadushkin 98331d05e6
Merge branch 'develop' into hotfix/v5.1.3 2018-04-26 18:53:29 +03:00
Julia Radzhabova b31efd58ca [DE][SSE] Don't show resolved comments by default 2018-04-26 15:17:02 +03:00
Julia Radzhabova f964680eb4 Add customization->help option for show/hide help (default is true) 2018-04-19 17:26:42 +03:00
Julia Radzhabova 9e0473b8ea [DE] Warning when saving to rtf format 2018-04-18 16:20:59 +03:00
Maxim Kadushkin dbf06b62fe [ALL] added menu for 'options' button 2018-03-21 14:28:28 +03:00
Maxim Kadushkin 03e6994738 Merge branch 'develop' into feature/desktop-new 2018-03-14 18:08:19 +03:00
Pavel Lobashov 06da18bf2d Update copyright to 2018 2018-03-01 15:16:38 +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 5f1b291886 [DE][PE][SSE] synchronize extra buttons state through events 2018-02-16 02:56:17 +03:00
Julia Radzhabova 31152c92d8 Remove sogou pinyin option. 2018-02-14 17:29:54 +03:00
Julia Radzhabova 11a3706785 Added "Close File" button to the password dialog. Send api event "onRequestClose" when Close File (or Esc) is selected. 2018-02-06 13:54:40 +03:00
Julia Radzhabova 6ee6336001 Merge branch 'develop' into feature/table-of-contents 2018-01-16 11:12:47 +03:00
Julia Radzhabova 833f9fc1b1 Merge branch 'hotfix/v5.0.7' into develop 2018-01-15 16:11:11 +03:00
Julia Radzhabova e198458d58 [DE] Added document structure in the left panel. 2017-12-19 16:30:58 +03:00
Julia Radzhabova 654585df8e Fix hiding left plugins panel in the desktop app. 2017-12-06 14:25:29 +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 f49404e8b5 Feature/new toolbar signature 2017-11-27 14:15:10 +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 2aab94e5e9 Debug merging from hotfix/v5.0.3. 2017-10-31 20:31:07 +03:00
Julia Radzhabova c02389ab21
Merge branch 'develop' into hotfix/v5.0.3 2017-10-31 20:15:07 +03:00
Julia Radzhabova db3475a6e6 Merge branch 'feature/collaboration-tab' into develop 2017-10-27 16:03:03 +03:00
Julia Radzhabova dcf80f9ba0 Added trial and developer mode. 2017-10-25 17:36:59 +03:00
Julia Radzhabova 20ea8595ba Don't apply Sogou pinyin input. 2017-10-12 17:16:26 +03:00
Julia Radzhabova 9757cb175b Use api.setInputParams method for SogouPinyin. 2017-10-12 14:20:32 +03:00
Julia Radzhabova 0bdcd6099f Added Sogou Pinyin input in Chrome. 2017-10-12 14:16:45 +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 1577c8a26e [DE] Added version history to the collaboration tab. 2017-10-09 15:37:12 +03:00
Julia Radzhabova f05835e0c0 Added Sogou Pinyin input in Chrome. 2017-10-06 13:57:35 +03:00
Julia Radzhabova 8c193881d1 [PE][SSE] Bug 35406. 2017-10-04 18:44:01 +03:00
Julia Radzhabova b4029143fa [DE] Fix Bug 35406. 2017-10-03 14:22:33 +03:00
Julia Radzhabova 4ff60d7f56 [PE][SSE] Adding signatures. 2017-09-13 11:57:30 +03:00
Julia Radzhabova ad866734b6 [DE] SignDialog, SignSettingsDialog ->Common. 2017-09-13 11:33:33 +03:00
Julia Radzhabova 2f92c81749 [DE] View signatures in the right panel. 2017-09-13 11:29:05 +03:00
Julia Radzhabova 8477d8b7dd [DE] Sign visible signature. 2017-09-13 11:24:54 +03:00
Julia Radzhabova 4ab7e47406 [DE] Sign visible signature. 2017-09-13 11:24:17 +03:00
Julia Radzhabova 015a11bc62 [DE] Signature - use certificates. 2017-09-13 11:21:33 +03:00
Julia Radzhabova 1828f40de5 [DE] Signature - use api methods. 2017-09-13 11:18:47 +03:00
Julia Radzhabova 8f08bacf02 [DE] Sign document with visible signature. 2017-09-13 11:18:05 +03:00
Julia Radzhabova be959d51ad [DE] Add invisible signature. 2017-09-13 11:17:34 +03:00
Julia Radzhabova 48b4ae0a0f [DE] Add signature to document. 2017-09-13 11:15:45 +03:00
Julia Radzhabova f71fb5a370 [DE] Enable key events for sdk when file menu is closed. 2017-09-04 16:21:52 +03:00
Julia Radzhabova 3fb4d7abcb [DE][SSE] Show running inside-plugin in the left panel after hiding comment, chat, about panels. 2017-08-18 17:08:45 +03:00
Julia Radzhabova 29d3515dfa Fix Bug 35643. 2017-08-18 15:17:25 +03:00
Julia Radzhabova 3c769f883e Lock hotkeys for view mode (Ctrs+Shift+S, Alt+F). 2017-08-14 14:24:00 +03:00
Maxim Kadushkin dad9b2127d unlocked plugins in toolbar 2017-08-11 14:01:27 +03:00
Maxim Kadushkin 134c5c907e locked F1 hotkey for 'view' mode 2017-08-09 19:59:54 +03:00
Maxim Kadushkin 79261c8d77 [DE] debug FileMenu 2017-06-27 11:40:15 +03:00
Julia Radzhabova 9f34062d32 Bug with closing File menu (when search dialog was opened before). 2017-06-20 12:53:18 +03:00
Julia Radzhabova fb8b479e60 [DE] Use localStorate.getBool instead getItem. 2017-06-16 14:53:29 +03:00
Julia Radzhabova 1aa34efab9 Commenting in view mode: set autosave to true. 2017-06-16 10:29:15 +03:00
Julia Radzhabova 8705842152 [Common] LocalStorage: use default value in getBool function. 2017-06-15 16:33:04 +03:00
Julia Radzhabova 00fb06281e View mode with commenting (permissions.comments = true). 2017-06-14 14:53:29 +03:00
Julia Radzhabova 556b0c55ae [DE] Added option for show/hide resolved comments. 2017-06-05 17:51:26 +03:00
Maxim Kadushkin 75100b9a37 repaired z-order for 'FileMenu' 2017-05-01 14:30:44 +03:00
Maxim Kadushkin 60e0feecfc Merge 2017-04-20 16:50:10 +03:00
Maxim Kadushkin 0875b47bab [DE] debug "FileMenu" 2017-04-20 13:29:44 +03:00
Julia Radzhabova 58ead9e451 Change hint for developer mode. 2017-04-12 10:54:47 +03:00