Commit graph

456 commits

Author SHA1 Message Date
Julia Radzhabova 4b32576571 Fix Bug 20091 2019-02-08 15:08:19 +03:00
Maxim Kadushkin 9b5ae84f58 Merge branch 'feature/custom-header-view' into develop 2019-02-07 16:00:33 +03:00
Julia Radzhabova 89a704950c Branding refactoring 2019-02-07 13:18:56 +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
Maxim Kadushkin 477f3f58d8 [DE] debug 2019-02-04 15:49:41 +03:00
Maxim Kadushkin 74aa97c8f6 [DE] async load plugins list from server 2019-02-04 15:48:51 +03:00
Julia Radzhabova 2c7662cd72 Remove customization parameter for hiding header (customization.header) 2019-01-31 17:09:37 +03:00
Julia Radzhabova 7d54f26372 Fix Bug 35911 2019-01-28 16:51:07 +03:00
Julia Radzhabova 9bfe3b3294 [DE][PE] Add zh-CN (Chinese) locale (without spell checking) 2019-01-23 12:47:51 +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 1e1d1ebd17 Merge branch 'develop' into feature/review-in-viewer 2019-01-15 17:49:00 +03:00
Julia Radzhabova faf3cceeea Merge branch 'hotfix/v5.2.7' into develop 2019-01-15 15:18:47 +03:00
Julia Radzhabova ff9beb8a87 Disable downloadAs api method when permission.download = false 2019-01-10 17:20:59 +03:00
Julia Radzhabova 654902b5d7 For Bug 36883 ("goback" in current page when get critical error) 2019-01-10 16:20:27 +03:00
Julia Radzhabova 04bd8e2c62 Move onDocumentReady api event to the end of document loading (fix opening version history) 2019-01-10 11:20:53 +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 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 4db246e4a6 Plugins: add isDisplayedInViewer parameter for display/hide plugin in the viewer interface 2018-12-13 11:15:28 +03:00
Julia Radzhabova 1d2d38ec1e Merge with hotfix/v5.2.4 2018-12-11 16:27:35 +03:00
Julia Radzhabova a1b0262ef3 Fix bugs 2018-11-07 16:32:22 +03:00
Julia Radzhabova 7a7e4a7a50 Add translation for plugins name and description 2018-11-02 11:37:10 +03:00
Julia Radzhabova 1cf7526a85 Open with password: close dialog only by Close File button (not by Esc, not by cross button) 2018-10-31 13:44:18 +03:00
Maxim Kadushkin 7dced037a3 [DE SSE PE] extended request to close editor 2018-10-31 12:16:44 +03:00
Julia Radzhabova 1d3f946653
Merge branch 'develop' into hotfix/v5.2.3 2018-10-30 13:08:21 +03:00
Julia Radzhabova 17857e0295 Disable print/download when editing is disabled on document loading (changed file version, bad license) 2018-10-26 16:57:08 +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 67fb9ceea5 [PE][SSE] Add script loading error. 2018-10-08 17:06:37 +03:00
Julia Radzhabova a499f55067 [DE] Add script loading error. 2018-10-08 14:21:05 +03:00
Julia Radzhabova f671569c88 Merge branch 'release/v5.2.0' into develop 2018-09-28 13:47:04 +03:00
Julia Radzhabova 29dfa2b83d [DE] Change config parameter for selecting save folder 2018-09-27 13:25:30 +03:00
Julia Radzhabova 22a0ae6b20 [DE] Bug 38520 (Check new revisions in fast co-editing mode after save) 2018-09-20 16:14:04 +03:00
Julia Radzhabova d5c7220c9c [DE] Save track-changes option for file key 2018-09-12 15:44:20 +03:00
Julia Radzhabova 3e79a19002 Add license error 2018-09-07 13:22:03 +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 31a7a39f11 [DE] Check new revisions in fast co-editing mode 2018-08-16 17:43:06 +03:00
Julia Radzhabova db682dcf24 Disable any editing (commenting, filling forms) when mode=view 2018-08-13 17:04:29 +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 a100e0a15f Fix Bug 37707, Bug 37706 2018-07-26 17:14:41 +03:00
Julia Radzhabova caa3d19d52 Disable printing when modal window is visible, disable browser printing 2018-07-25 16:33:46 +03:00
Julia Radzhabova fdbdcc2fd2 [DE][SSE] Enable closing window when save to txt/csv 2018-07-25 14:40:51 +03:00
Julia Radzhabova 6b4261629f [DE] Add mode for filling forms 2018-07-19 17:47:03 +03:00
Julia Radzhabova 3658506052 Fix comment mode (send event onDocumentStateChange) 2018-07-19 15:31:13 +03:00
Julia Radzhabova 810588e2e6 Fix comment mode 2018-07-19 12:39:52 +03:00
Julia Radzhabova d8fc456686 Save to pdfa format 2018-07-18 14:07:24 +03:00
Julia Radzhabova 6c4e7cf566
Merge branch 'develop' into hotfix/v5.1.5 2018-07-18 10:03:33 +03:00
Julia Radzhabova cc7b233a6a Disable editing on Asc.c_oAscError.ID.DataEncrypted error 2018-06-28 15:56:44 +03:00
Julia Radzhabova 57c41e40e6 Add Asc.c_oAscError.ID.DataEncrypted error 2018-06-28 13:16:35 +03:00
Julia Radzhabova ae60e24aad [DE] Add modifyContentControl parameter to permissions 2018-06-26 15:46:49 +03:00
Julia Radzhabova 8a319f9e07 Enable saving with password from menu File 2018-06-14 15:17:52 +03:00
Julia Radzhabova 0d49651ea7 Add license type ConnectionsOS, UsersCountOS 2018-05-28 13:00:03 +03:00
Julia Radzhabova 869bc1a7a6 [DE] Show File and Plugins tabs in view mode 2018-05-15 15:37:26 +03:00
Julia Radzhabova 902f5d2f5f Merge branch 'hotfix/v5.1.4' into develop 2018-05-14 14:21:55 +03:00
Julia Radzhabova 8c3f4615aa [DE] Fix Bug 37658 2018-05-10 15:18:28 +03:00
Julia Radzhabova da5edeef42 [DE][PE] Fix Bug 37679 2018-05-08 13:05:05 +03:00
Julia Radzhabova 4aa68f5eb5 Fix Bug 37355 2018-05-03 18:27:05 +03:00
Julia Radzhabova ae09b32f56 [Desktop] Don't show warning when open password-protected offline file 2018-04-28 14:13:52 +03:00
Julia Radzhabova 3d6ebf252c Disable protection feature. 2018-04-28 13:25:41 +03:00
Maxim Kadushkin 06a400880d Merge branch 'feature/bugfix5.1.3' of https://github.com/ONLYOFFICE/web-apps-pro into feature/bugfix5.1.3 2018-04-27 16:33:17 +03:00
Maxim Kadushkin 057d730c78 [Desktop] config didn't update 2018-04-27 16:32:39 +03:00
Julia Radzhabova b31efd58ca [DE][SSE] Don't show resolved comments by default 2018-04-26 15:17:02 +03:00
Julia Radzhabova 601842c2f9 Show error when cannot open file protected with password 2018-04-26 13:27:08 +03:00
Julia Radzhabova 3e3da0e280 "Save" button locked in wrong way in coauth mode for desktop 2018-04-25 11:09:47 +03:00
Maxim Kadushkin f623946299 [DE PE] "save" button locked in wrong way in coauth mode for desktop 2018-04-25 02:44:53 +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 c12a591e6f Disable file renaming if onRequestRename isn't defined 2018-04-17 16:05:41 +03:00
Maxim Kadushkin f9bd3b3d47 [Desktop] config wasn't updated 2018-04-17 15:10:21 +03:00
Alexey Golubev d4c13f34ec v5.1.1 2018-04-05 15:57:00 +03:00
Julia Radzhabova 0638a9073b [DE] Disable version history for offline files 2018-04-03 16:40:31 +03:00
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 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
Julia Radzhabova e86454d8d6 Fix Bug 37263. 2018-03-20 18:43:59 +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
Julia Radzhabova dfb0b7bfa5 [DE] Add translations 2018-03-12 19:48:34 +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
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 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 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 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 33c8dcf475 Don't use customization.goback.url on critical errors in desktop. 2018-02-07 12:21:10 +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 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 697785ff23 Added onWarning event to api. 2018-01-09 15:10:48 +03:00
Julia Radzhabova e198458d58 [DE] Added document structure in the left panel. 2017-12-19 16:30:58 +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 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 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 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 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 222c0bf74d [DE] Added Protection tab with the ability to encrypt and sign document. 2017-11-15 10:59:06 +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 c02389ab21
Merge branch 'develop' into hotfix/v5.0.3 2017-10-31 20:15:07 +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 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 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 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