Commit graph

318 commits

Author SHA1 Message Date
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 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
Julia Radzhabova da5edeef42 [DE][PE] Fix Bug 37679 2018-05-08 13:05: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
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
Maxim Kadushkin f623946299 [DE PE] "save" button locked in wrong way in coauth mode for desktop 2018-04-25 02:44:53 +03:00
Julia Radzhabova aa7e09b311 [PE] Fix Bug 37566 2018-04-24 13:46:07 +03:00
Julia Radzhabova 6565b7b7e9 [PE] Fix Bug 37549 2018-04-23 15:21:52 +03:00
Julia Radzhabova d7f4d9047e [PE] Fix Bug 37545 2018-04-23 15:06:58 +03:00
Julia Radzhabova a774753614 [PE] Fix Bug 37543 (bug in arrays concatenation) 2018-04-23 14:16:37 +03:00
Julia Radzhabova aa4422253d [PE] Fix Bug 37534 2018-04-20 13:41:24 +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
Maxim Kadushkin ff8f958d0b [ALL] applied translation for Viewport controller 2018-03-21 14:29:43 +03:00
Maxim Kadushkin dbf06b62fe [ALL] added menu for 'options' button 2018-03-21 14:28:28 +03:00
Julia Radzhabova e86454d8d6 Fix Bug 37263. 2018-03-20 18:43:59 +03:00
Julia Radzhabova fe68423a70 [PE] Fix Bug 37256 2018-03-20 14:10:29 +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
Maxim Kadushkin 321a92bf7f [DE] refactoring 2018-03-04 23:23:26 +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
Maxim Kadushkin 8a9c221eb3 redefine 'save' button for desktop app 2018-02-28 16:22:14 +03:00
Maxim Kadushkin 6cf3ee7fb9 [SE PE] absract 'save' button 2018-02-28 16:17:53 +03:00
Julia Radzhabova b44d0ea354 [PE] Bug 35583 2018-02-27 17:38:32 +03:00
Maxim Kadushkin 6d0a353d78 [Common] refactoring. defined $icon element for a button 2018-02-26 16:23:07 +03:00
Maxim Kadushkin 39f29c5ef8 [common] lock/unlock header buttons on file menu events 2018-02-23 00:19:40 +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 0fb072b9fa refactoring. created controller for set of buttons 2018-02-13 17:37:22 +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