Commit graph

254 commits

Author SHA1 Message Date
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
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