Commit graph

66 commits

Author SHA1 Message Date
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
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
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
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 bb36c63c13 [DE] Added print, save, undo, redo buttons and user name to header panel. 2018-01-24 13:57:58 +03:00
Julia Radzhabova c02389ab21
Merge branch 'develop' into hotfix/v5.0.3 2017-10-31 20:15:07 +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 de0b44f5dc [SSE] Added modifyFilter permission to config: when = false, disable add/remove filters,sort, change formatted table style. 2017-10-19 13:14:12 +03:00
Julia Radzhabova 52c93fcd5d Added formats fods, fodt, fodp. 2017-10-18 11:56:17 +03:00
Julia Radzhabova 22580a02cb Added onWarning event to api. 2017-10-07 12:20:39 +03:00
Alexey Golubev fce84eef7a v5.0.1 2017-10-05 14:48:08 +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 aa23ed4418 Changed appReady api event. 2017-09-25 14:49:46 +03:00
Julia Radzhabova c1e4b9e903 Check if the api "config->events" are functions. 2017-09-22 16:35:16 +03:00
Julia Radzhabova 90ae0245bd Show warning when event onReady is used. 2017-09-20 14:55:19 +03:00
Julia Radzhabova 9ce1c45226 Change api event: "onReady" -> "onAppReady", added "onDocumentReady" event. 2017-09-20 14:32:18 +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 a394ef749a Added new formats. 2017-08-18 15:35:10 +03:00
Julia Radzhabova 93e4a6a927 permissions.comments -> permissions.comment. 2017-07-05 15:36:49 +03:00
Julia Radzhabova c79eb90e08 [DE] Added parameter showReviewChanges to config: open review changes dialog, when showReviewChanges is true (but do not track review changes). 2017-06-09 17:30:52 +03:00
Julia Radzhabova a3c2858be1 Disable version history for pdf/djvu/xps. 2017-06-06 11:35:03 +03:00
Julia Radzhabova c3848b3468 Disable review permission for pdf/xps/djvu files. 2017-06-01 14:59:56 +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 48453ecda4 [DE] Added option customization->statusBar to config for hiding status bar. 2017-04-12 10:59:28 +03:00
Julia Radzhabova b89e590e4f Delete unused events and methods. 2017-04-11 17:09:00 +03:00
Julia Radzhabova 21ca5dfeda Delete unused config parameter. 2017-04-11 17:08:08 +03:00
Julia Radzhabova 321eb290c4 Delete unused method "applyEditRights" from api. 2017-04-11 16:52:31 +03:00
Julia Radzhabova 882a78c0c6 [DE] Added option "customization->commentAuthorOnly". If "true" - user can edit only comments that he created, otherwise he can edit all comments. 2017-04-11 16:43:31 +03:00
Julia Radzhabova d2d9b2b594 Merge feature/force-save. 2017-04-11 16:40:01 +03:00
Julia Radzhabova fe886bb472 [SSE] Fix Bug 34272. 2017-04-11 15:25:20 +03:00
Julia Radzhabova a48bce7598 Use customization->about for hiding about in the left panel (for licensed users only). Can hide about when asc_getCanBranding() is true. 2017-04-11 15:24:07 +03:00
Julia Radzhabova 9d2811389a send message to frameEditor (for plugins only). refactored plugin's messages. 2017-04-11 15:04:24 +03:00
Alexey.Golubev 3ad3aefac4 Added automatic version numbering 2017-01-25 19:30:08 +03:00
Julia Radzhabova 86ea2314a1 Added function for destroy editors. 2017-01-17 10:00:12 +03:00
Alexey Golubev 1dc090deb3 Merge tag 'staropramen' into develop
staropramen
2017-01-10 12:26:23 +03:00
Alexey Golubev 933ae6ec68 Merge branch 'hotfix/staropramen' 2017-01-10 12:26:12 +03:00
Alexey Golubev 80eb569d38 Changed version 2017-01-09 12:39:04 +03:00
Alexey Golubev e9ae465f20 Changed version 2017-01-09 12:29:17 +03:00
Julia Radzhabova 8d444cd223 Check origin of messages received in api. 2016-12-14 14:20:18 +03:00
Alexey Golubev 5ea7c5965e Version up 2016-12-13 11:45:56 +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 e6af089bda Update api.js 2016-11-18 12:57:02 +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
Maxim Kadushkin cde02d1526 merge branches [newembed] and [bootstrap-3.3.7] 2016-11-11 16:59:11 +03:00
Maxim Kadushkin 93d484dc72 [PPE embed] turn on player on app start 2016-11-11 15:13:25 +03:00
Julia Radzhabova b936280d78 Merge branch 'hotfix/v4.1.8' into develop 2016-11-03 13:27:16 +03:00
Julia Radzhabova 541000f308 Change DocEditor version. 2016-11-02 13:24:16 +03:00