Commit graph

176 commits

Author SHA1 Message Date
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
Maxim Kadushkin 011130b5bd [DE] removed nativeApp flag 2017-04-10 16:11:09 +03:00
Maxim Kadushkin e88fb9b51b [DE] debug hiding for FileMenu 2017-04-10 14:50:58 +03:00
Maxim Kadushkin 98b1168c06 [DE] processed toolbar's [Comments] button 2017-03-29 19:29:04 +03:00
Maxim Kadushkin 55e48173ce [Common] refactoring 2017-03-29 19:27:44 +03:00
Maxim Kadushkin 7f972c790e [Common] added label for 'Save' operation 2017-03-16 13:24:03 +03:00
Maxim Kadushkin 10a55236d0 [DE] moved "coauthoring users" panel to toolbar 2017-03-13 19:29:05 +03:00
Maxim Kadushkin b0935bca7a [DE] show FileMenu from the toolbar 2017-02-20 17:54:12 +03:00
Alexander.Trofimov 126a0c9c4b change license to 2017 2017-01-17 17:58:08 +03:00
Julia Radzhabova a2c03c3ea0 Show co-authoring mode settings regardless of the license. 2016-12-20 17:29:37 +03:00
Julia Radzhabova 0dd09875b8 Disable download as, print, save and version history when server is disconnected. 2016-10-12 16:32:48 +03:00
Julia Radzhabova 379d61e759 [DE] Version history: add "Show/Hide detailed changes" to history panel. Don't reload editor, when press Back to Document (= Close Menu) in the File menu. 2016-10-05 16:31:49 +03:00
Julia Radzhabova 3eb619db31 Added "Rename" to the File menu. 2016-09-27 15:09:32 +03:00
Julia Radzhabova 4cbd0ad7e2 In light version default value for Autosave is off. 2016-08-16 13:01:23 +03:00
Julia Radzhabova 2d1b5ea522 [DE] Ограничения для light-версии (сокращенная версия тулбара + скрыты чат, комментарии, плагины, рецензирование). 2016-06-30 11:56:15 +03:00
Julia Radzhabova 3572261704 [DE] Добавлено меню для плагинов. 2016-06-29 11:03:12 +03:00
Julia Radzhabova 984fb163c8 [DE] Панель плагинов изменена в соответствии с макетами. 2016-06-29 10:58:10 +03:00
Alexander.Trofimov 7a5d025854 send array of asc_CCommentData on asc_onAddComments event instead array of objects 2016-05-31 18:42:12 +03:00
Julia Radzhabova 7b86f88935 [DE] Изменена структура плагинов. 2016-05-19 12:46:21 +03:00
Julia Radzhabova 229d7110c0 [DE] Отладка панели с плагинами. 2016-05-18 14:41:30 +03:00
Julia Radzhabova 42932dc55b [DE] Добавлена поддержка плагинов 2016-05-17 18:38:54 +03:00
Alexander.Trofimov eec1f68457 use 'c_oAsc...' variables from Asc namespace 2016-04-05 14:52:34 +03:00
Maxim Kadushkin 1bd7d37f93 license info added to js 2016-04-01 16:17:09 +03:00
Julia Radzhabova a244bc3fc7 Bug 31993 2016-03-25 10:48:19 +03:00
Maxim Kadushkin 741b10515d webapps added 2016-03-10 21:48:53 -03:00