Commit graph

52 commits

Author SHA1 Message Date
Maxim Kadushkin 7077ca5e84 Merge branch 'develop' into feature/desktop-new 2018-03-21 15:40:49 +03:00
Maxim Kadushkin dbf06b62fe [ALL] added menu for 'options' button 2018-03-21 14:28:28 +03:00
Julia Radzhabova fe68423a70 [PE] Fix Bug 37256 2018-03-20 14:10:29 +03:00
Maxim Kadushkin 03e6994738 Merge branch 'develop' into feature/desktop-new 2018-03-14 18:08:19 +03:00
Maxim Kadushkin 321a92bf7f [DE] refactoring 2018-03-04 23:23:26 +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 833f9fc1b1 Merge branch 'hotfix/v5.0.7' into develop 2018-01-15 16:11:11 +03:00
Julia Radzhabova 654585df8e Fix hiding left plugins panel in the desktop app. 2017-12-06 14:25:29 +03:00
Julia Radzhabova b612b7b9b5 [PE] Added Protection tab. Changed signature settings in the right and left menu. 2017-11-28 15:39:36 +03:00
Julia Radzhabova f49404e8b5 Feature/new toolbar signature 2017-11-27 14:15:10 +03:00
Julia Radzhabova 005c22056e [PE] Added Protection tab. Changed signature settings in the right and left menu. 2017-11-17 17:23:38 +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 57c3b5f80b [PE] Hide left comments panel by esc. 2017-10-24 14:56:49 +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 aec113963d [PE] Added collaboration tab. 2017-10-12 12:22:31 +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 4ff60d7f56 [PE][SSE] Adding signatures. 2017-09-13 11:57:30 +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
Julia Radzhabova 8c1c09e437 [PE] localStorage.getItem -> getBool. 2017-08-08 14:14:14 +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 1aa34efab9 Commenting in view mode: set autosave to true. 2017-06-16 10:29:15 +03:00
Julia Radzhabova 00fb06281e View mode with commenting (permissions.comments = true). 2017-06-14 14:53:29 +03:00
Maxim Kadushkin 75100b9a37 repaired z-order for 'FileMenu' 2017-05-01 14:30:44 +03:00
Julia Radzhabova b1ba645bf6 [PE] Added spell check + changing document language. Moved LanguageDialog to Common. 2017-04-26 11:34:55 +03:00
Maxim Kadushkin a578e3c31e [PE] toolbar's new view 2017-04-20 16:34:39 +03:00
Julia Radzhabova f1280d2670 [DE mobile][PE][SSE] Merge from develop. 2017-04-11 14:05:56 +03:00
Maxim Kadushkin 55e48173ce [Common] refactoring 2017-03-29 19:27:44 +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 3eb619db31 Added "Rename" to the File menu. 2016-09-27 15:09:32 +03:00
Alexey Golubev 7a1cbfc141 Merge branch 'hotfix/v4.0.4' into develop 2016-08-23 11:49:50 +03:00
Julia Radzhabova 4cbd0ad7e2 In light version default value for Autosave is off. 2016-08-16 13:01:23 +03:00
Julia Radzhabova 7cb5aa9075 [PE] Add plugins. 2016-07-26 14:45:41 +03:00
Julia Radzhabova 68ba02c5b8 [PE][SSE] Limitations for light version (compact toolbar + hide chat/comments). 2016-06-30 12:38:54 +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
Maxim Kadushkin 1bd7d37f93 license info added to js 2016-04-01 16:17:09 +03:00