Commit graph

309 commits

Author SHA1 Message Date
Julia Radzhabova 5766138138 [DE] Add settings for macros 2020-05-21 22:50:18 +03:00
Julia Radzhabova 84cbbf9813 Add parameters to api customization: macros (can run macros in document), plugins (can run plugins in document), showMacrosWarning (warn about macros in document). 2020-05-21 19:30:57 +03:00
Julia Radzhabova 9b1aa597c4 Change api for new and recent files 2020-04-30 18:35:30 +03:00
Julia Radzhabova 6573cc7a84 Merge branch 'hotfix/v5.5.1' into develop 2020-04-15 15:04:23 +03:00
Julia Radzhabova c13d0dc8e9 Check origin in messages 2020-03-19 17:38:09 +03:00
Maxim Kadushkin 8c5cf7e9f9 [desktop] refactoring 2020-03-05 13:09:53 +03:00
Alexey Golubev 359451fed4 Add customer branding 2020-02-19 20:04:10 +03:00
Alexander.Trofimov eb9652772b [all] Move
Rename LoadFontsFromServer -> asc_loadFontsFromServer
2020-02-18 15:58:37 +03:00
maxkadushkin a5647058e7
[build] rebranding for customer (#331) 2020-02-06 13:56:32 +03:00
Julia Radzhabova 6b58820098 Feature/bugfix (#300)
* [PE] Bug 42759

* Fux Bug 44131

* [SSE] Update skeleton
2020-01-15 16:12:53 +03:00
Julia Radzhabova eb9da5251b Add parameter customization->mentionShare: change hint for mention in comment 2019-12-23 15:51:00 +03:00
Julia Radzhabova add6f62dbd Bug 42788: rename customization->units to customization->unit 2019-12-16 15:01:09 +03:00
Julia Radzhabova 2ee40024e7 Fix Bug 42788: add customization->units parameter to api 2019-12-16 14:02:22 +03:00
Julia Radzhabova 326c469e01 [DE] Deprecate permission.changeHistory parameter 2019-11-29 13:32:53 +03:00
Julia Radzhabova 019dffbceb Add event onRequestSharingSettings: use instead editorConfig.sharingSettingsUrl. 2019-11-28 16:54:14 +03:00
Julia Radzhabova 8027645de5 Merge branch 'develop' into feature/compare 2019-11-28 12:51:56 +03:00
Julia Radzhabova 61ab8193fb Add parameter customization.goback.requestClose to api: send event onRequestClose instead opening customization.goback.url 2019-11-27 10:22:25 +03:00
Julia Radzhabova 9e246ec424 Fix loader for compact header mode 2019-11-25 14:23:27 +03:00
Julia Radzhabova d6584c6e49 Change loader for modes with compact header 2019-11-25 11:02:50 +03:00
Julia Radzhabova 769fa9a611 Merge branch 'develop' into feature/compare 2019-11-14 12:47:19 +03:00
Oleg Korshul 54c0fda8fe Add allow autoplay attribute to editor iframe (for media plugins) 2019-11-07 18:49:33 +03:00
Julia Radzhabova 974c512765 Add parameter compatibleFeatures to customization: hide ability to add comment to document 2019-11-01 10:36:21 +03:00
Julia Radzhabova a9c2c7a3e6 Merge branch 'develop' into feature/compare 2019-10-15 12:46:57 +03:00
Julia Radzhabova e605452cfb [DE] Compare use onRequestCompareFile/setRevisedFile for loading file 2019-10-15 11:44:38 +03:00
Julia Radzhabova 0eae3533df Force opening mobile version for ipad safari 2019-10-14 10:54:01 +03:00
Julia Radzhabova 5c05508dcf [DE] Compare files: add errors. 2019-10-11 15:12:59 +03:00
Julia Radzhabova f588e9b67a [SSE] Internal mode 2019-10-08 15:12:15 +03:00
Julia Radzhabova 27dd33133e Don't show skeleton loader when use customization.toolbarNoTabs=true mode 2019-10-04 10:36:10 +03:00
Julia Radzhabova 8d3ec85ca2 Merge branch 'develop' into feature/optimization 2019-09-18 16:32:26 +03:00
Julia Radzhabova 032a460490 [Embedded] Add skeleton loader 2019-09-13 17:40:21 +03:00
Julia Radzhabova 2a141b4ceb [DE][PE] Fix Bug 42696 2019-09-04 15:37:57 +03:00
Julia Radzhabova 960a107e8e Merge branch 'develop' into feature/optimization 2019-08-19 10:27:00 +03:00
Julia Radzhabova 13276e3f16 [SSE] Bug 41549 2019-07-31 13:19:00 +03:00
Julia Radzhabova f04ab651f4 Deprecate plugins.url parameter 2019-07-30 13:57:29 +03:00
Julia Radzhabova 4b16460ed0 Bug 40231 2019-07-30 13:51:36 +03:00
Julia Radzhabova d678a227bf Remove onReady api event, use onAppReady instead 2019-07-30 13:38:43 +03:00
Julia Radzhabova 2652e09372 Add onRequestMailMergeRecipients event, setMailMergeRecipients method for mail merge 2019-07-29 13:40:07 +03:00
Julia Radzhabova d45d04f0a1 Add onRequestInsertImage event, insertImage method for inserting image from storage 2019-07-26 14:49:53 +03:00
Julia Radzhabova 1cff575fd6 Add onRequestSaveAs event 2019-07-26 12:54:20 +03:00
Julia Radzhabova 80a6e6a1e6 Custom loader logo 2019-07-22 17:04:24 +03:00
Julia Radzhabova bd6071ccd2 Merge branch 'feature/comment-mentions' into develop 2019-07-12 17:00:29 +03:00
Julia Radzhabova 8bcd9da398 Refactoring update users rights 2019-07-12 10:43:02 +03:00
Julia Radzhabova 04b3651fd0 Add setSharingSettings api method: update sharing settings when add mention for users 2019-07-11 18:00:11 +03:00
maxkadushkin 2d7711e340 Update index.html.desktop (#201) 2019-06-28 15:08:15 +03:00
Julia Radzhabova f19597a9cb Mentions refactoring: add placeholder to comment textarea, set mentions on adding reply, clear external users when change document access rights 2019-06-26 14:04:02 +03:00
Julia Radzhabova 3bfdd7ac32 [DE] Add customization->reviewDisplay parameter (#188) 2019-06-13 17:37:56 +03:00
Julia Radzhabova 25e50435bb Request users for mentions, send mentions 2019-04-23 14:41:35 +03:00
Julia Radzhabova c87540c393 Fix style for header buttons in "customization->toolbarNoTabs=true" mode 2019-04-17 17:23:49 +03:00
Maxim Kadushkin 60044d9178 [all] renamed config's option 2019-04-17 16:39:03 +03:00
Oleg Korshul e0b723bdb0 Prevent android reload page on scrolling 2019-04-02 17:15:07 +03:00
Julia Radzhabova 2f5951aaaf [DE] create url with data for action/command 2019-03-18 14:47:41 +03:00
Maxim Kadushkin a481caff43 [DE] create url with data for action/command 2019-03-12 15:45:32 +03:00
Julia Radzhabova e17397ac95 Fix rev.53836e656fadbeed210162c478eb227edacc56d9 (16 Mar 2018): Add formats .ott, .ots, .otp 2019-02-20 16:29:24 +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
Maxim Kadushkin 4866923553 [all] flag to hide file name from toolbar 2019-02-06 16:50:55 +03:00
Maxim Kadushkin 937b4523f1 [All] underscore instead tabs in toolbar's style 2019-02-05 18:37:42 +03:00
Julia Radzhabova 2c7662cd72 Remove customization parameter for hiding header (customization.header) 2019-01-31 17:09:37 +03:00
Julia Radzhabova 1767ba0ae8 Add parameter customization.compactHeader for compact header view (not for desktop) 2019-01-31 16:41:29 +03:00
Julia Radzhabova faf3cceeea Merge branch 'hotfix/v5.2.7' into develop 2019-01-15 15:18:47 +03:00
Oleg Korshul f560e6fd5c Disable scrolling in mobile version 2018-12-24 18:09:11 +03:00
Julia Radzhabova 1d2d38ec1e Merge with hotfix/v5.2.4 2018-12-11 16:27:35 +03:00
Alexey Golubev 0fc4038cc0
Fix #39737
* Fix index.html for desktop
2018-11-16 13:46:03 +03:00
Maxim Kadushkin f3d5090806 [common] extended 'close' request 2018-11-02 15:17:45 +03:00
Julia Radzhabova c9e36352eb Remove unused parameters 2018-10-26 15:04:56 +03:00
Julia Radzhabova a95c95204f Fix Bug 39096 2018-10-26 12:49:11 +03:00
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 29dfa2b83d [DE] Change config parameter for selecting save folder 2018-09-27 13:25:30 +03:00
Julia Radzhabova 6b4261629f [DE] Add mode for filling forms 2018-07-19 17:47:03 +03:00
Julia Radzhabova 6c4e7cf566
Merge branch 'develop' into hotfix/v5.1.5 2018-07-18 10:03:33 +03:00
Julia Radzhabova ae60e24aad [DE] Add modifyContentControl parameter to permissions 2018-06-26 15:46:49 +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 7077ca5e84 Merge branch 'develop' into feature/desktop-new 2018-03-21 15:40:49 +03:00
Julia Radzhabova 53836e656f Add formats .ott, .ots, .otp 2018-03-16 16:31:18 +03:00
Maxim Kadushkin 958355cf4a [ALL] notify desktop about event 2018-03-14 17:55:34 +03:00
Maxim Kadushkin 217e7afeaa [DE] unlocked version history for desktop app 2018-03-09 00:48:47 +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 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 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
maxkadushkin c5da1082bb set button "back to documents" visible 2018-01-25 11:22:47 +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
Maxim Kadushkin 4de7a13fc5 merge with default 2017-01-23 14:04:37 +03:00
Maxim Kadushkin 85db5814c2 fix bug 33748 2017-01-17 17:02:24 +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
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 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 f178d63915 Don't load document if the config parameter "document.key" isn't string. 2016-09-22 16:27:52 +03:00
Julia Radzhabova 4dc23c41ee [DE] Added the ability to restore version in versions history (need event onRequestRestore and permissions.changeHistory = true in editor config). 2016-09-16 15:46:00 +03:00
Julia Radzhabova 376990a7a6 Added custom logo to loader of the editors (need parameter in config -> customization). 2016-09-14 12:45:10 +03:00
Julia Radzhabova 4e72c53a8a Load initial value for compact toolbar from editor config. 2016-09-13 15:03:32 +03:00
Julia Radzhabova 35d21fdb65 Load initial zoom value from editor config. 2016-09-13 11:28:21 +03:00
Julia Radzhabova 995391dfb5 [DE] Отладка панели плагинов. 2016-05-25 15:52:21 +03:00
Julia Radzhabova 57e7d1dc80 Правка index.html 2016-05-19 15:24:21 +03:00
Julia Radzhabova 7b86f88935 [DE] Изменена структура плагинов. 2016-05-19 12:46:21 +03:00
Julia Radzhabova 42932dc55b [DE] Добавлена поддержка плагинов 2016-05-17 18:38:54 +03:00
Alexander.Trofimov e1612fbaf6 add api config 2016-05-13 11:37:54 +03:00
Alexander.Trofimov 946e83d56c fix bug 32395 2016-05-11 17:31:26 +03:00
Alexander.Trofimov 79bfa777f8 delete asc_SetFontsPath
route fonts by path "fonts/"
2016-05-05 14:07:51 +03:00
Alexander.Trofimov e7acc4fdb7 load only sdk-all-min.js file 2016-05-05 13:09:49 +03:00
Julia Radzhabova 7bf15f88c6 В конфиг редакторов добавлен параметр location: передается двухбуквенный код страны, по которому определяется метрика по-умолчанию (us, ca - дюймы). 2016-04-08 11:55:15 +03:00
Alexander Trofimov e054f11cd7 Merge pull request #1 from ONLYOFFICE/feature/remove-global-variables
Feature/remove global variables
2016-04-07 13:12:16 +04:00
Alexander.Trofimov 7d6675b5b8 global clases -> Asc namespace 2016-04-05 15:57:51 +03:00
Maxim Kadushkin fa729d39e7 cutted back license's header in api.js 2016-04-05 15:43:34 +03:00
Maxim Kadushkin 1bd7d37f93 license info added to js 2016-04-01 16:17:09 +03:00
Julia Radzhabova ca1cb54642 [Mobile][Embedded] Запуск редакторов с учетом новой структуры сдк. 2016-03-25 16:38:31 +03:00
Julia Radzhabova 109908a17a Versions History: изменено поле urlDiff на changesUrl. 2016-03-25 11:12:32 +03:00
Alexey Golubev 8d6e32402f Fixed "Ошибки в консоли на шаге Loading editor scripts" http://bugzserver/show_bug.cgi?id=31944 2016-03-15 14:45:39 +03:00
Maxim Kadushkin 741b10515d webapps added 2016-03-10 21:48:53 -03:00