Commit graph

313 commits

Author SHA1 Message Date
Maxim Kadushkin f9bd3b3d47 [Desktop] config wasn't updated 2018-04-17 15:10:21 +03:00
Julia Radzhabova 648abe2198 [PE] FIx Bug 21362 2018-04-09 14:23:44 +03:00
Alexey Golubev d4c13f34ec v5.1.1 2018-04-05 15:57:00 +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
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 b44d0ea354 [PE] Bug 35583 2018-02-27 17:38:32 +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 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 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 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 b612b7b9b5 [PE] Added Protection tab. Changed signature settings in the right and left menu. 2017-11-28 15:39:36 +03:00
Julia Radzhabova 580903591a [PE] Show tooltip and disable editing when document is signed. 2017-11-28 14:32:48 +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 620c4ab5c2 [PE] Change applying the license (disable editing when connections are over the limitations). 2017-11-22 17:41:40 +03:00
Julia Radzhabova 0c7749b1d1 Update translations/ 2017-11-22 11:35:45 +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 27afcaba0f
Merge branch 'develop' into hotfix/v5.0.4 2017-11-13 18:32:25 +03:00
Julia Radzhabova aeb279276d [PE] Show tooltip and disable editing when document is signed. 2017-11-10 11:59:05 +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
Julia Radzhabova 5968d0d35c [PE] Bug 36040. 2017-10-26 11:24:13 +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 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 aec113963d [PE] Added collaboration tab. 2017-10-12 12:22:31 +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
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
Julia Radzhabova 229c47b8a0 Autostart array of plugins. 2017-10-03 20:45:41 +03:00
Julia Radzhabova 28b92b60f7 Debug autostart plugins. 2017-10-03 20:44:20 +03:00
Julia Radzhabova 2e36f36dbe Run first plugin from autostart plugins list. 2017-10-03 20:43:58 +03:00
Julia Radzhabova cc0933be99 Add "autostart" parameter to plugins config: auto start array of plugins. 2017-10-03 20:43:39 +03:00
Julia Radzhabova 8709548c7a Load plugins from config or using request to server. 2017-10-03 20:43:06 +03:00
Julia Radzhabova f37d4b53ac Set full plugins list to sdk, but add buttons to the toolbar using "EditorsSupport" field . 2017-10-03 20:42:41 +03:00
Maxim Kadushkin ceaf3371c6 refactoring 2017-10-03 20:41:22 +03:00
Maxim Kadushkin c0772ef73a refactoring 2017-10-03 20:40:53 +03:00
Julia Radzhabova a0dfdea5aa Fix Bug 35934, update Bug 35851. 2017-10-02 14:08:26 +03:00
Julia Radzhabova ceb67537ac Fix Bug 35851. 2017-09-20 15:41:26 +03:00
Julia Radzhabova 9ce1c45226 Change api event: "onReady" -> "onAppReady", added "onDocumentReady" event. 2017-09-20 14:32:18 +03:00
Julia Radzhabova 73f5efae27 Merge branch 'release/v5.0.0' into develop 2017-09-19 17:44:29 +03:00
Julia Radzhabova 40cc71ea63 Merge pull request #5 from ONLYOFFICE/feature/new-toolbar-signature
Feature/new toolbar signature
2017-09-18 10:49:27 +03:00
Julia Radzhabova 0987210cb6 Use api.asc_isSignaturesSupport() function for signature supporting. 2017-09-18 10:44:27 +03:00
Julia Radzhabova e1bde7bbc2 Autostart array of plugins. 2017-09-13 15:02:34 +03:00
Julia Radzhabova 9f2ffc408c Plugins: remove deprecated parameter "url". 2017-09-13 14:43:35 +03:00
Julia Radzhabova a147880f22 Debug autostart plugins. 2017-09-13 14:35:20 +03:00
Julia Radzhabova 6e4ec9e92d Run first plugin from autostart plugins list. 2017-09-13 13:36:19 +03:00
Julia Radzhabova 7fb874128c Add "autostart" parameter to plugins config: auto start array of plugins. 2017-09-13 13:32:01 +03:00
Julia Radzhabova c99107bfa4 Load plugins from config or using request to server. 2017-09-11 16:34:23 +03:00
Julia Radzhabova 4eaf251ae5 Set full plugins list to sdk, but add buttons to the toolbar using "EditorsSupport" field . 2017-09-11 15:47:36 +03:00
Julia Radzhabova ca41ce7809 Fix Bug 35791. 2017-09-08 15:02:54 +03:00
Julia Radzhabova 196bc28847 Show error when file password is incorrect. 2017-09-08 11:44:01 +03:00
Julia Radzhabova 62029e2d5d Bug 35768. 2017-09-08 11:39:07 +03:00
Julia Radzhabova 43222dfa9d Merge pull request #4 from ONLYOFFICE/release/v5.0.0
Release/v5.0.0
2017-09-07 11:49:02 +03:00
Julia Radzhabova 0caa6dfb2f Show error when file password is incorrect. 2017-09-06 16:41:53 +03:00
Maxim Kadushkin e4faebd1d0 refactoring 2017-09-05 12:47:52 +03:00
Julia Radzhabova c1039d2d77 Synchronize save buttons in the toolbar and left menu. 2017-09-05 10:54:44 +03:00
Maxim Kadushkin cd5721977d refactoring 2017-09-04 17:20:46 +03:00
Julia Radzhabova 13b623ef0c Fix Bug 35525. + Set focus to document after "insert table" dialog is closed. 2017-08-23 11:02:04 +03:00
Julia Radzhabova 3f5b9ce24c [PE] Start presenter mode from toolbar menu. 2017-08-11 10:26:21 +03:00
Julia Radzhabova 09a49ed246 [PE] Hide rulers by default. 2017-08-10 17:20:12 +03:00
Julia Radzhabova fba5c61fb3 [PE] Move saving status from header to status bar. 2017-08-10 15:25:46 +03:00
Julia Radzhabova 8c1c09e437 [PE] localStorage.getItem -> getBool. 2017-08-08 14:14:14 +03:00
Julia Radzhabova 02049ed668 Fix Bug 35358. 2017-07-14 11:57:59 +03:00
Julia Radzhabova 93e4a6a927 permissions.comments -> permissions.comment. 2017-07-05 15:36:49 +03:00
Julia Radzhabova 8fe267819d [PE] Translate slide objects. 2017-07-05 15:11:12 +03:00
Julia Radzhabova c5405c6110 Plugins: add isCustomWindow type to variation. 2017-06-23 17:22:02 +03:00
Julia Radzhabova 7397124998 [PE, PE mobile] Set translation to api. 2017-06-23 16:49:29 +03:00
Julia Radzhabova 443620cdb3 Set translations for chars and textarts using api config. 2017-06-23 16:43:21 +03:00
Julia Radzhabova 1aa34efab9 Commenting in view mode: set autosave to true. 2017-06-16 10:29:15 +03:00
Julia Radzhabova 08186157c6 Set fast co-editing when commenting in view mode. 2017-06-14 14:59:43 +03:00
Julia Radzhabova 14fd826605 Use asc_setRestriction method for commenting in view mode. 2017-06-14 14:56:51 +03:00
Julia Radzhabova 00fb06281e View mode with commenting (permissions.comments = true). 2017-06-14 14:53:29 +03:00
Julia Radzhabova 3d4e53f7b0 Added context menu in the viewer mode (Copy menu item). 2017-06-06 11:04:04 +03:00
Julia Radzhabova f10c01cfd2 [Common] Change api method showMessage (2 parameter will be deprecated). 2017-05-16 10:46:04 +03:00
Julia Radzhabova 142666012d [PE] Add spell checking to context menu. 2017-04-26 12:26:02 +03:00
Julia Radzhabova b1ba645bf6 [PE] Added spell check + changing document language. Moved LanguageDialog to Common. 2017-04-26 11:34:55 +03:00
Julia Radzhabova 4379bb208b [PE] Debug forcesave mode. 2017-04-21 14:17:08 +03:00
Julia Radzhabova b6ac8cffff [PE] Common.localStorage.getItem -> Common.localStorage.getBool. 2017-04-21 12:56:11 +03:00
Julia Radzhabova 499785cac5 [PE] Bug with co-editing in strict mode. 2017-04-21 11:59:00 +03:00
Julia Radzhabova fde00ea2d2 Update jquery to 3.2.1. 2017-04-21 11:20:40 +03:00
Maxim Kadushkin a578e3c31e [PE] toolbar's new view 2017-04-20 16:34:39 +03:00
Maxim Kadushkin b761758c9e [PE] refactoring 2017-04-20 15:13:11 +03:00
Julia Radzhabova f1280d2670 [DE mobile][PE][SSE] Merge from develop. 2017-04-11 14:05:56 +03:00
Maxim Kadushkin a75065ecd6 [Common] cherrypicked changes for plugins (6c427e9, 3b82dab, aceb1fe) 2017-03-01 19:19:42 +03:00
Maxim Kadushkin 861c2954fa [PE] fix bug 33845 2017-01-27 19:20:14 +03:00
Alexander.Trofimov 126a0c9c4b change license to 2017 2017-01-17 17:58:08 +03:00
Alexey Golubev da8c914a01 Merge tag 'v4.2.3' into develop
v4.2.3 v4.2.3
2016-12-23 14:23:17 +03:00
Julia Radzhabova 518c4212a1 New licence type SuccessLimit. 2016-12-20 18:40:43 +03:00
Julia Radzhabova a2c03c3ea0 Show co-authoring mode settings regardless of the license. 2016-12-20 17:29:37 +03:00
Julia Radzhabova 1ee50da033 Merge branch 'feature/interface-customizer' into develop 2016-12-08 12:14:41 +03:00
Julia Radzhabova 38444d61fa Added new error messages. 2016-11-28 14:52:03 +03:00
Julia Radzhabova e82da5ebab Added "token" parameter to api config. 2016-11-24 16:44:54 +03:00
Julia Radzhabova 7392d30a9d Change format for editorConfig->user (use "name" instead of "lastname" and "firstname"). 2016-11-18 14:48:24 +03:00
Julia Radzhabova daf066c656 Change editor config: added "autosave" parameter to customization - initial option for autosaving.
Used if the user didn't change autosave or co-editing mode in the advanced settings.
2016-11-17 14:13:33 +03:00
Julia Radzhabova 275c592337 Update translations. 2016-11-16 13:35:26 +03:00
Julia Radzhabova 7dfcc927f6 Interface customization using plugins. Need to append config->editorConfig->pluigns->UIpluginsData field with list of customizer plugins. 2016-11-16 12:38:16 +03:00
Julia Radzhabova 26819a5488 [PE] Fixed Bug 33406. 2016-11-15 11:55:49 +03:00
Julia Radzhabova ad21492c29 Disable toolbar and right panel when lost editing rights (api method denyEditingRights). 2016-11-10 15:38:26 +03:00
Julia Radzhabova b936280d78 Merge branch 'hotfix/v4.1.8' into develop 2016-11-03 13:27:16 +03:00
Julia Radzhabova 2b4ebdefa1 Changed branding permissions. Use canBranding from license to hiding panels. 2016-10-28 16:38:33 +03:00
Julia Radzhabova 7761977ff6 Merge branch 'hotfix/v4.1.6' into develop 2016-10-26 13:37:10 +03:00
Julia Radzhabova 054319793f [PE] Added equations. 2016-10-25 13:48:31 +03:00
Julia Radzhabova 04acc3ecc8 Autostart plugin after loading plugins. 2016-10-21 17:09:58 +03:00
Julia Radzhabova 1058d48f46 Add parameters to config for hiding toolbar, left menu, right menu. 2016-10-21 16:47:46 +03:00
Julia Radzhabova f5fb3f94f5 Merge branch 'develop' into feature/refactor 2016-10-20 11:59:23 +03:00