Commit graph

324 commits

Author SHA1 Message Date
Julia Radzhabova 3bd78060dc Load image from storage 2018-10-03 14:00:08 +03:00
Julia Radzhabova f671569c88 Merge branch 'release/v5.2.0' into develop 2018-09-28 13:47:04 +03:00
Julia Radzhabova 2b9c763955
Merge pull request #124 from ONLYOFFICE/feature/save-copy-as
Feature/save copy as
2018-09-27 16:31:49 +03:00
Julia Radzhabova 470a0483bb [PE][SSE] Add 'Save Copy As' action to file menu. Bug 23603, Bug 32790 2018-09-27 15:25:15 +03:00
Julia Radzhabova 3165fa2da9 [PE][SSE] Fix Bug 38948 2018-09-25 16:19:33 +03:00
Julia Radzhabova 3e79a19002 Add license error 2018-09-07 13:22:03 +03:00
Julia Radzhabova db682dcf24 Disable any editing (commenting, filling forms) when mode=view 2018-08-13 17:04:29 +03:00
Julia Radzhabova 5e2e94f789 Fix Bug 32938 2018-08-07 12:44:02 +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 16e0217007 [SSE] Fix customization plugins 2018-07-25 11:22:43 +03:00
Julia Radzhabova 3658506052 Fix comment mode (send event onDocumentStateChange) 2018-07-19 15:31:13 +03:00
Julia Radzhabova 43bad93bb1 Merge branch 'develop' into feature/sse-layout 2018-07-18 14:08:43 +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 84d60f7422 Fix layout for diagramm editor (when window was closed during editor loading) 2018-07-16 14:58:03 +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 685a0a42d3 [SSE] Add layout tab 2018-06-28 12:27:11 +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
Alexey Golubev 02c9828c57 v5.1.4 2018-05-24 15:34:47 +03:00
Maxim Kadushkin 0175dc8e9d [SSE] locked 'pivot table' options for offline files 2018-05-17 12:30:13 +03:00
Julia Radzhabova 85e1a64fea [SSE] Show File and Plugins tabs in view mode 2018-05-15 17:32:10 +03:00
Julia Radzhabova 902f5d2f5f Merge branch 'hotfix/v5.1.4' into develop 2018-05-14 14:21:55 +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
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 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
Julia Radzhabova f964680eb4 Add customization->help option for show/hide help (default is true) 2018-04-19 17:26:42 +03:00
Julia Radzhabova 9b8cc2bd29 [SSE] Enable signatures 2018-04-18 15:21:46 +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
Julia Radzhabova 5a39e55c21 [SSE] Hide options for export to pdf format (rev. 1aed6a07f5) 2018-04-17 13:38:26 +03:00
Alexey Golubev d4c13f34ec v5.1.1 2018-04-05 15:57:00 +03:00
Julia Radzhabova 1aed6a07f5 [SSE] Fix Bug 34914 2018-04-05 14:29:37 +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
Maxim Kadushkin 456f4dcc2d refactoring 2018-03-21 14:28:52 +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
Maxim Kadushkin 99a7be61c6 merge with develop 2018-03-04 23:41:58 +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
Julia Radzhabova 6fe96a17b2 [SSE] Fix Bug 36965 2018-02-27 10:58:30 +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
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 22237f9634 Fix Bug 36885. 2018-02-08 18:22:32 +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 472e5edcb7 debug 2018-02-07 01:37:40 +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 b7675946f8 Support for languages with "_" separator (en_US). 2018-01-24 14:40:59 +03:00
Julia Radzhabova fc6504f5ac [PE][SSE] Added print, save, undo, redo buttons and user name to header panel. 2018-01-24 14:10:33 +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 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 91fb911ba3 Fixed opening view mode. 2017-12-05 17:40:52 +03:00
Julia Radzhabova 4f9f366631 [SSE] Added Protection tab. Changed signature settings in the right and left menu. 2017-11-28 15:48:24 +03:00
Julia Radzhabova 4a5d78f36e [SSE] Show tooltip and disable editing when document is signed. 2017-11-28 14:25:08 +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 b664680915 [SSE] Change applying the license (disable editing when connections are over the limitations).
[PE] Refactoring.
2017-11-23 13:40:45 +03:00
Julia Radzhabova 0c7749b1d1 Update translations/ 2017-11-22 11:35:45 +03:00
Julia Radzhabova 147735ea7e [SSE] Added Protection tab. Changed signature settings in the right and left menu. 2017-11-17 17:35:40 +03:00
Julia Radzhabova 27afcaba0f
Merge branch 'develop' into hotfix/v5.0.4 2017-11-13 18:32:25 +03:00
Julia Radzhabova 76e2d4c290 [SSE] Show tooltip and disable editing when document is signed. 2017-11-10 10:50:01 +03:00
Julia Radzhabova 4ad34f0652 [SSE] Fix Bug 36222. 2017-11-02 11:17:48 +03:00
Julia Radzhabova c02389ab21
Merge branch 'develop' into hotfix/v5.0.3 2017-10-31 20:15:07 +03:00
Julia Radzhabova 0f6213f9db For Bug 36122. 2017-10-30 14:50:59 +03:00
Julia Radzhabova db3475a6e6 Merge branch 'feature/collaboration-tab' into develop 2017-10-27 16:03:03 +03:00