Commit graph

567 commits

Author SHA1 Message Date
Julia Radzhabova f95abd902c Fix Bug 37377 2018-04-02 13:58:55 +03:00
Maxim Kadushkin 49a32c8155 merge with develop 2018-04-02 01:11:24 +03:00
Julia Radzhabova 706664459a Merge branch 'develop' into feature/bookmarks 2018-03-28 14:39:57 +03:00
Alexey Golubev e764043a34 v5.1.0 2018-03-28 12:09:01 +03:00
Julia Radzhabova 0808629f4a [DE] Load and sort bookmarks. 2018-03-27 15:21:15 +03:00
Julia Radzhabova c9cc95064d Fix Bug 37308 2018-03-26 16:50:15 +03:00
Julia Radzhabova 89cf77c172 Customization goback parameter doesn't depend of license. 2018-03-23 16:00:57 +03:00
Maxim Kadushkin 7077ca5e84 Merge branch 'develop' into feature/desktop-new 2018-03-21 15:40:49 +03:00
Maxim Kadushkin ea4dd3abbe Merge branch 'release/v5.1.0' into develop 2018-03-21 15:36:04 +03:00
Maxim Kadushkin ff8f958d0b [ALL] applied translation for Viewport controller 2018-03-21 14:29:43 +03:00
Maxim Kadushkin dbf06b62fe [ALL] added menu for 'options' button 2018-03-21 14:28:28 +03:00
Julia Radzhabova e86454d8d6 Fix Bug 37263. 2018-03-20 18:43:59 +03:00
Julia Radzhabova f307c90ae8 Merge branch 'release/v5.1.0' into feature/bookmarks 2018-03-19 12:10:49 +03:00
Julia Radzhabova 7ec3d4170f [DE] Navigation refactoring: always show scrollbar, scroll to current header. 2018-03-16 13:09:00 +03:00
Julia Radzhabova 926ca217b3 [DE] Fix Bug 37228 2018-03-15 16:05:38 +03:00
Julia Radzhabova 5b3dab1239 Fix Bug 37192 2018-03-15 14:38:53 +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
Julia Radzhabova 280f57cd11 [DE] Fix Bug 37220 2018-03-14 15:41:42 +03:00
Julia Radzhabova 0096094d8f [DE] Hide menu for table of contents 2018-03-14 14:55:53 +03:00
Julia Radzhabova 8665373465 [DE] Show menu for table of contents in canvas. 2018-03-14 13:19:41 +03:00
Julia Radzhabova dfb0b7bfa5 [DE] Add translations 2018-03-12 19:48:34 +03:00
Julia Radzhabova eace54100d [DE] Fix Bug 37170 2018-03-12 12:11:22 +03:00
Maxim Kadushkin 217e7afeaa [DE] unlocked version history for desktop app 2018-03-09 00:48:47 +03:00
Julia Radzhabova 1a4d88fcc8 [DE] Translate new editor styles 2018-03-07 14:54:22 +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
Julia Radzhabova dc9158bc7b [DE] Fix Bug 37059 2018-03-05 12:28:37 +03:00
Maxim Kadushkin 99a7be61c6 merge with develop 2018-03-04 23:41:58 +03:00
Maxim Kadushkin 9f289a6392 [DE] button 'save' disabled in wrong way 2018-03-04 23:25:00 +03:00
Maxim Kadushkin 321a92bf7f [DE] refactoring 2018-03-04 23:23:26 +03:00
Julia Radzhabova d04a61933e Show critical error with custom message. 2018-03-01 17:37:15 +03:00
Pavel Lobashov 06da18bf2d Update copyright to 2018 2018-03-01 15:16:38 +03:00
Maxim Kadushkin 8a9c221eb3 redefine 'save' button for desktop app 2018-02-28 16:22:14 +03:00
Julia Radzhabova 9d1bf1199b [DE] Bug 36827 2018-02-26 17:38:35 +03:00
Maxim Kadushkin 09b9947051 [DE] defined button to indicate coauth changes 2018-02-26 16:31:34 +03:00
Maxim Kadushkin fc6c6c2cb8 refactoring 2018-02-25 01:19:36 +03:00
Maxim Kadushkin 39f29c5ef8 [common] lock/unlock header buttons on file menu events 2018-02-23 00:19:40 +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 5ed42705fc Can protect only offline files. 2018-02-20 12:35:49 +03:00
Julia Radzhabova 0b18b03060 [DE] Add bookmarks. 2018-02-19 14:56:44 +03:00
Julia Radzhabova d08137da83 Fix Bug 36953. 2018-02-19 12:34:15 +03:00
Maxim Kadushkin 5f1b291886 [DE][PE][SSE] synchronize extra buttons state through events 2018-02-16 02:56:17 +03:00
Maxim Kadushkin cb82ea8230 [DE PE] refactoring 2018-02-16 02:52:44 +03:00
Julia Radzhabova 31152c92d8 Remove sogou pinyin option. 2018-02-14 17:29:54 +03:00
Julia Radzhabova f3c3ead61c Fix Bug 36883. 2018-02-14 17:11:28 +03:00
Maxim Kadushkin 0fb072b9fa refactoring. created controller for set of buttons 2018-02-13 17:37:22 +03:00
Maxim Kadushkin 8be206fa33 Merge branch 'develop' into feature/desktop-new 2018-02-13 11:26:16 +03:00
Maxim Kadushkin 753afc350d refactoring. send commands to desktop app 2018-02-13 11:23:53 +03:00
Julia Radzhabova 0f2e985634 Fix Bug 36742. 2018-02-09 17:26:34 +03:00
Julia Radzhabova f2ae20c36d [DE] Fix Bug 36778 2018-02-08 16:03:10 +03:00
Maxim Kadushkin b5a5c97735 hide some buttons for desktop mode 2018-02-07 18:30:45 +03:00
Julia Radzhabova e92d353971 [DE] Fix Bug 36847. 2018-02-07 14:51:19 +03:00
Julia Radzhabova 33c8dcf475 Don't use customization.goback.url on critical errors in desktop. 2018-02-07 12:21:10 +03:00
Maxim Kadushkin c3260dfc38 initialized app's strart params 2018-02-07 01:37:23 +03:00
Julia Radzhabova 1694178caa
Merge pull request #50 from ONLYOFFICE/feature/table-settings
Feature/table settings
2018-02-06 15:07:14 +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 42e4481776 Set long operation mask for plugins actions (action.id is string). 2018-02-05 12:22:03 +03:00
Maxim Kadushkin f328e83a4f refactoring 2018-02-03 16:10:38 +03:00
Maxim Kadushkin c8e9fe9a63 Merge branch 'develop' into feature/desktop-new
# Conflicts:
#	apps/common/main/lib/util/utils.js
2018-02-02 16:18:07 +03:00
Julia Radzhabova b3499e7361 Added support for force save errors. 2018-01-26 15:39:21 +03:00
Julia Radzhabova e500335e15 [DE] Added translations. 2018-01-25 10:22:00 +03:00
Julia Radzhabova bb36c63c13 [DE] Added print, save, undo, redo buttons and user name to header panel. 2018-01-24 13:57:58 +03:00
Julia Radzhabova 5cf94b8ca9 [DE] Fix adding table of contents. 2018-01-24 13:05:11 +03:00
Maxim Kadushkin 826ac6aef1 new design changes 2018-01-23 20:35:16 +03:00
Julia Radzhabova 7c70133e2a [DE] Debug expand/collapse for table of contents. 2018-01-23 13:21:27 +03:00
Julia Radzhabova 69ee24f112 [DE] Fix adding table of contents. 2018-01-19 16:41:40 +03:00
Julia Radzhabova efa339a125 [DE] Update table of contents. 2018-01-19 15:53:04 +03:00
Julia Radzhabova c154b154e9 [DE] Change style for existing table in contents from toolbar presets. 2018-01-19 15:20:45 +03:00
Julia Radzhabova f77dc3d45f [DE] Added table settings: change width/height, distribute rows/columns. 2018-01-18 17:26:31 +03:00
Julia Radzhabova 99c5bb7aac [SE] Show settings for table of contents. 2018-01-18 11:58:24 +03:00
Julia Radzhabova 5f3d992f12 [DE] Show settings for table of contents. 2018-01-17 12:32:12 +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 1a3b022467 [DE] Fast updating name of the headers in the table of contents. 2018-01-11 10:38:50 +03:00
Julia Radzhabova 697785ff23 Added onWarning event to api. 2018-01-09 15:10:48 +03:00
Julia Radzhabova 2e1ab32de6 [DE] Added advanced settings for table of contents. 2017-12-26 17:31:14 +03:00
Julia Radzhabova 8ca83c7144 [DE] Added hyperlink button to the Links tab. 2017-12-26 10:32:52 +03:00
Julia Radzhabova be416c5ed2 Add Note editing button to the Links tab. 2017-12-25 15:55:26 +03:00
Julia Radzhabova 6f7d5cc533 [DE] Check empty items in the table of contents. 2017-12-25 12:03:51 +03:00
Julia Radzhabova db8840f4ec [DE] Added Links tab, added inserting and updating table of contents. 2017-12-23 11:33:49 +03:00
Julia Radzhabova 4c17a79725 Change layout for table of contents. 2017-12-21 13:56:48 +03:00
Julia Radzhabova 909e73270a [DE] Added methods for table of content. 2017-12-21 11:44:06 +03:00
Julia Radzhabova 5ae243b26c Expand treeview to selected level. 2017-12-20 15:34:17 +03:00
Julia Radzhabova e198458d58 [DE] Added document structure in the left panel. 2017-12-19 16:30:58 +03:00
Julia Radzhabova 14d06a5f95 [DE] AscCommon.sdtlocktype -> Asc.c_oAscSdtLockType, AscCommon.sdttype -> Asc.c_oAscSdtLevelType 2017-12-15 11:50:56 +03:00
Julia Radzhabova 4d213595ca [DE] AscCommonWord -> AscCommon for woring with class CContentControl. 2017-12-14 15:13:40 +03:00
Julia Radzhabova 4568d2ac16
Merge pull request #42 from ONLYOFFICE/feature/de-content-controls
Feature/de content controls
2017-12-13 16:53:45 +03:00
Julia Radzhabova e7b722c021 [DE] Updated icons. Added context menu for content controls. 2017-12-13 16:52:14 +03:00
Julia Radzhabova 3a3e0602b7 Bugfix for IE/Edge: set focus out of the editor frame. 2017-12-13 12:11:27 +03:00
Julia Radzhabova eb3efa3778 [DE] Insert content controls. 2017-12-12 14:14:27 +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 7de7841b3d Merge branch 'hotfix/v5.0.6' into feature/v5.0.6-signature 2017-12-07 15:02:43 +03:00
Julia Radzhabova 160b6ddfee Added event for reset plugins list. 2017-12-07 15:02:19 +03:00
Alexander.Trofimov 78623f0998 Users -> UsersCount 2017-12-07 13:36:57 +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 654585df8e Fix hiding left plugins panel in the desktop app. 2017-12-06 14:25:29 +03:00
Julia Radzhabova efbcc8653f [DE][PE] Changes for Bug 35358 (show text in the loader mask). 2017-12-05 18:04:30 +03:00
Julia Radzhabova 91fb911ba3 Fixed opening view mode. 2017-12-05 17:40:52 +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 a0ea3d2903 [DE] Signature refactoring. 2017-11-28 15:33:54 +03:00
Julia Radzhabova 259d8852d9 [DE] Change registering for signature update event. 2017-11-28 15:32:20 +03:00
Julia Radzhabova ab99ce6adb [DE] Disable protect settings when review mode is changed. 2017-11-28 15:32:07 +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 9e458a51f8 [DE] Added Protection tab with the ability to encrypt and sign document. 2017-11-28 15:23:37 +03:00
Julia Radzhabova 0ccdf8b4e2 [DE] Show tooltip and disable editing when document is signed. 2017-11-28 14:20:54 +03:00
Julia Radzhabova f49404e8b5 Feature/new toolbar signature 2017-11-27 14:15:10 +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 b9f90aa91c Update translations. 2017-11-23 14:00:02 +03:00
Julia Radzhabova 82be952126 [DE] Change applying license. 2017-11-22 16:32:43 +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 0c7749b1d1 Update translations/ 2017-11-22 11:35:45 +03:00
Julia Radzhabova 565e0bd750 [DE] Signature refactoring. 2017-11-17 16:11:40 +03:00
Julia Radzhabova 2d87b6c08e [DE] Change registering for signature update event. 2017-11-17 10:39:23 +03:00
Julia Radzhabova 0a2e8ffdda [DE] Disable protect settings when review mode is changed. 2017-11-17 10:26:06 +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 222c0bf74d [DE] Added Protection tab with the ability to encrypt and sign document. 2017-11-15 10:59:06 +03:00
Julia Radzhabova d598aed90d Menu component: added clearAll method. 2017-11-13 11:41:32 +03:00
Julia Radzhabova 6036d08f92 Fix Bug 35547. 2017-11-10 12:00:47 +03:00
Julia Radzhabova 41f33ec586 [DE] Added translation for internal link. 2017-11-09 12:03:17 +03:00
Julia Radzhabova 6ab02ed9f8 [DE] Show tooltip and disable editing when document is signed. 2017-11-08 17:52:03 +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 1e194ac11d [DE] Bug 36143 2017-10-26 16:05:05 +03:00
Julia Radzhabova dcf80f9ba0 Added trial and developer mode. 2017-10-25 17:36:59 +03:00
Julia Radzhabova 03890e6403 Fix Bug 36134. 2017-10-24 15:59:18 +03:00
Julia Radzhabova 5da46ba82c Fix https://github.com/ONLYOFFICE/DocumentServer/issues/185.
Added format parameter to downloadAs api method.
2017-10-24 14:23:15 +03:00
Julia Radzhabova 4b83f6a2fd Fix Bug 36122. 2017-10-23 15:19:07 +03:00
Julia Radzhabova 6d64d2b9a5 Set permissions to docInfo (use put_Permissions). 2017-10-18 15:25:12 +03:00
Julia Radzhabova 09d019fa87 Change name and link for limitation window. 2017-10-18 15:08:11 +03:00
Julia Radzhabova 968661758c Merge branch 'hotfix/v5.0.2' into develop 2017-10-13 15:11:11 +03:00
Julia Radzhabova d668bd150d Merge plugins from config, server and from event asc_onPluginsInit. 2017-10-13 12:47:39 +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 b638710824 Merge branch 'hotfix/v5.0.2' into feature/collaboration-tab 2017-10-11 13:18:39 +03:00
Julia Radzhabova 5ac475ca92 Merge plugins list from editor config and from server (don't add duplicated plugins). 2017-10-11 11:45:42 +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 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
Julia Radzhabova 22580a02cb Added onWarning event to api. 2017-10-07 12:20:39 +03:00
Julia Radzhabova f05835e0c0 Added Sogou Pinyin input in Chrome. 2017-10-06 13:57:35 +03:00
Julia Radzhabova d614acfe1b Revert "[DE] Added Sogou Pinyin input in Chrome."
This reverts commit a7e4628000.
2017-10-06 13:29:46 +03:00
Julia Radzhabova a7e4628000 [DE] Added Sogou Pinyin input in Chrome. 2017-10-05 17:51:15 +03:00
Alexey Golubev fce84eef7a v5.0.1 2017-10-05 14:48:08 +03:00
Julia Radzhabova 8c193881d1 [PE][SSE] Bug 35406. 2017-10-04 18:44:01 +03:00