Commit graph

469 commits

Author SHA1 Message Date
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
Julia Radzhabova af70d981d2 [PE] Fix Bug 37271 2018-03-22 11:44:34 +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 b50749f572 element with id=title inserted in some data views 2018-03-09 01:01:28 +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
Julia Radzhabova 42ef04facf [PE] Fix Bug 35976 2018-02-27 17:20:20 +03:00
Julia Radzhabova dd0aa73f51 [PE] Fix Bug 35700 2018-02-27 17:02:33 +03:00
Maxim Kadushkin 6d0a353d78 [Common] refactoring. defined $icon element for a button 2018-02-26 16:23:07 +03:00
Maxim Kadushkin fc6c6c2cb8 refactoring 2018-02-25 01:19:36 +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
Maxim Kadushkin b5a5c97735 hide some buttons for desktop mode 2018-02-07 18:30:45 +03:00
Julia Radzhabova 1954fa34f3 [DE][PE] Bug 36801. 2018-02-07 15:14:20 +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 8f3638ee14 [PE] Fix Bug 36833. 2018-02-07 11:05:58 +03:00
Maxim Kadushkin c3260dfc38 initialized app's strart params 2018-02-07 01:37:23 +03:00
Maxim Kadushkin 14c19f8369 changed toolbar's markup 2018-02-07 00:55:24 +03:00
Julia Radzhabova 1694178caa
Merge pull request #50 from ONLYOFFICE/feature/table-settings
Feature/table settings
2018-02-06 15:07:14 +03:00
Julia Radzhabova 81e72f269c [PE] Added width, height for table settings in the right panel. Distribute rows and columns in table. 2018-02-06 15:06:01 +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 1703a115e1 Fix Bug 36850. Added Default Size for images in the context menu, added Change Shape Type for images in the right settings panel. 2018-02-06 11:56:13 +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 987e10fb2a [DE][PE] Change order for download formats. 2018-01-25 10:33:59 +03:00