Commit graph

142 commits

Author SHA1 Message Date
Julia Radzhabova 1d2d38ec1e Merge with hotfix/v5.2.4 2018-12-11 16:27:35 +03:00
Julia Radzhabova 524eaa94f2 Fix Bug 39696 2018-11-13 11:40:35 +03:00
Julia Radzhabova f671569c88 Merge branch 'release/v5.2.0' into develop 2018-09-28 13:47:04 +03:00
Julia Radzhabova 48fa05b250 For Bug 38948: disable print button on start in the desktop header 2018-09-25 17:09:59 +03:00
Julia Radzhabova 88998b07aa Set header layout as in the desktop editors 2018-09-25 13:46:28 +03:00
Julia Radzhabova 87feed6ccf Hide settings menu in the header when open change access window 2018-08-28 15:09:19 +03:00
Julia Radzhabova 4e033860cf Fix loading on IE10 2018-07-30 17:08:33 +03:00
Julia Radzhabova 6b4261629f [DE] Add mode for filling forms 2018-07-19 17:47:03 +03:00
Maxim Kadushkin af8edb29ca merge with develop 2018-07-18 15:24:51 +03:00
Julia Radzhabova 8212070fa3 Header: show editing users in format <username>(<opened browser tabs>) 2018-06-05 11:54:49 +03:00
Julia Radzhabova 869bc1a7a6 [DE] Show File and Plugins tabs in view mode 2018-05-15 15:37:26 +03:00
Julia Radzhabova b9f8990fee Fix Bug 37531 2018-04-20 11:23:58 +03:00
Maxim Kadushkin e7cfb6909b [SSE] button "settings" stayed disabled for some actions 2018-04-18 15:30:09 +03:00
Maxim Kadushkin 49a32c8155 merge with develop 2018-04-02 01:11:24 +03:00
Maxim Kadushkin 59b6193f24 [DE] refactoring 2018-03-28 13:37:41 +03:00
Julia Radzhabova 89cf77c172 Customization goback parameter doesn't depend of license. 2018-03-23 16:00:57 +03:00
Maxim Kadushkin dbf06b62fe [ALL] added menu for 'options' button 2018-03-21 14:28:28 +03:00
Maxim Kadushkin a2afa4b7fe [Common] added 'settings' button 2018-03-21 14:11:03 +03:00
Maxim Kadushkin 03e6994738 Merge branch 'develop' into feature/desktop-new 2018-03-14 18:08:19 +03:00
Maxim Kadushkin 3e60e495a0 Merge branch 'develop' into feature/svg-icons 2018-03-04 23:49:46 +03:00
Julia Radzhabova 1b75d2035e [Common] Bug in rendering chat and header panel when user id contains special characters. 2018-03-02 17:48:24 +03:00
Pavel Lobashov 06da18bf2d Update copyright to 2018 2018-03-01 15:16:38 +03:00
Maxim Kadushkin 19b0d19792 [common] centered document title 2018-02-28 16:31:59 +03:00
Maxim Kadushkin 9dcf65d8df [common] added coauth icons to header's 'save' button 2018-02-28 16:24:48 +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 6d385730b1 [Common] make created buttons disabled 2018-02-16 02:46:45 +03:00
Julia Radzhabova f3c3ead61c Fix Bug 36883. 2018-02-14 17:11:28 +03:00
Julia Radzhabova 104ce55de4 [Common] Refactoring 2018-02-13 17:52:06 +03:00
Maxim Kadushkin 8be206fa33 Merge branch 'develop' into feature/desktop-new 2018-02-13 11:26:16 +03:00
Julia Radzhabova a1db2fac69 Fix Bug 36868. 2018-02-07 13:57:46 +03:00
Maxim Kadushkin 159b26aac5 fix bug 36857 2018-02-07 11:11:58 +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
Maxim Kadushkin e2f86ace35 in button added icon for 150% of zoom 2018-02-01 17:15:56 +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
Maxim Kadushkin 826ac6aef1 new design changes 2018-01-23 20:35:16 +03:00
Alexey Golubev fce84eef7a v5.0.1 2017-10-05 14:48:08 +03:00
Julia Radzhabova 73f5efae27 Merge branch 'release/v5.0.0' into develop 2017-09-19 17:44:29 +03:00
Julia Radzhabova 876171af9c Change click on header logo: click only on the image. 2017-09-19 15:42:44 +03:00
Julia Radzhabova 405fe55461 Open "customization->logo->url" when click on the header logo. 2017-09-19 12:16:59 +03:00
Julia Radzhabova cdf53c398c Fix Bug 35860. 2017-09-18 15:13:36 +03:00
Julia Radzhabova f5a3a86ba0 Fix Bug 35860. 2017-09-18 14:38:24 +03:00
Julia Radzhabova fe462bd08b Merge pull request #3 from ONLYOFFICE/release/v5.0.0
Release/v5.0.0
2017-08-30 15:07:13 +03:00
Julia Radzhabova 220b4b8c0e Fix Bug 35721. 2017-08-24 11:44:11 +03:00
Julia Radzhabova 8c7287def2 Merge pull request #1 from ONLYOFFICE/release/v5.0.0
Release/v5.0.0
2017-08-22 14:08:09 +03:00
Julia Radzhabova b6b818db80 Fix Bug 35662. 2017-08-21 10:53:39 +03:00
Julia Radzhabova 8900b912d7 User icon isn't displayed in FF, Safari on retina. 2017-08-17 17:32:37 +03:00
Julia Radzhabova 4f37e52b8c Fix Bug 35626. refactoring rev. 1843040605. 2017-08-17 16:44:57 +03:00
Julia Radzhabova 1843040605 Fix Bug 35626. 2017-08-17 15:39:28 +03:00
Maxim Kadushkin 891a4dc91f [Common] locked click on branding logo 2017-08-15 19:30:16 +03:00
Maxim Kadushkin 0bb1d90bb3 [Common] rename document in title 2017-08-15 14:44:59 +03:00
Julia Radzhabova 948bb630bf Change hint for printing from toolbar in the view mode. 2017-08-14 14:27:36 +03:00
Julia Radzhabova 1587ae9f2d Fix Bug 35539 + Hide context menu on document caption. 2017-08-08 11:17:18 +03:00
Julia Radzhabova 919cd331d5 Fix bug in viewer. 2017-08-07 17:10:03 +03:00
Maxim Kadushkin cb5e41fa78 [Common] setCanRename caused a error before doc name label wasn't created 2017-08-02 14:52:52 +03:00
Maxim Kadushkin 8513705b1e [Common] added 'document rename' 2017-08-01 15:14:19 +03:00
Maxim Kadushkin 6f4e5620fa debug, refactoring 2017-07-21 13:44:49 +03:00
Maxim Kadushkin 7473e641d6 updated translations 2017-07-21 13:44:07 +03:00
Maxim Kadushkin 0a1324217e [Common] added button 'Edit Document' to 'preview' mode 2017-07-21 13:41:56 +03:00
Maxim Kadushkin 86c3493c1c changed header layout for view mode 2017-07-13 12:43:40 +03:00
Maxim Kadushkin 2f54b983a2 [Common] debug styles for header buttons 2017-07-13 12:37:22 +03:00
Maxim Kadushkin 6ea33aa303 [Common] refactoring 2017-07-13 11:50:36 +03:00
Maxim Kadushkin 29bdf730c4 changed icon for 'Users ' button 2017-06-30 17:44:19 +03:00
Maxim Kadushkin 2ab489cd3a [Common] 'back' now has one action 2017-05-04 15:39:17 +03:00
Maxim Kadushkin cee6024b35 implemented interface for desktop app 2017-05-04 15:36:42 +03:00
Maxim Kadushkin f3f7536da0 [Common] refactoring 2017-05-04 15:26:32 +03:00
Julia Radzhabova 26b6527e26 [DE][PE] Refactoring header, toolbar 2017-04-28 13:44:03 +03:00
Maxim Kadushkin 343c014b17 [Common] debug Header's logo 2017-04-25 19:52:51 +03:00
Maxim Kadushkin 04b5214015 [Common] updated app logo 2017-04-22 17:51:12 +03:00
Julia Radzhabova f0c2692afa [Common] Update underscore to v.1.8.3 2017-04-21 11:15:04 +03:00
Maxim Kadushkin 60e0feecfc Merge 2017-04-20 16:50:10 +03:00
Maxim Kadushkin 2bbfe4d1f4 [PE] svg icon in button 2017-04-20 16:36:15 +03:00
Julia Radzhabova 7af77fafb5 [DE] Added default translations. 2017-04-19 15:09:44 +03:00
Julia Radzhabova 65b7e8722b [DE] Changes for fast co-editing mode when count of users>2: always send ' onDocumentStateChange' event , draw '*' in the document caption while user is editing document. 2017-04-12 11:55:46 +03:00
Julia Radzhabova 58ead9e451 Change hint for developer mode. 2017-04-12 10:54:47 +03:00
Maxim Kadushkin c8e40f6d03 [DE] refactoring 2017-04-06 12:42:43 +03:00
Maxim Kadushkin 360cca6601 [DE] locked action for 'status' label 2017-04-06 12:42:10 +03:00
Maxim Kadushkin 3784eb0717 [DE] national's flags were moved to separate sprite 2017-04-04 17:47:21 +03:00
Maxim Kadushkin 5ed32d082c [DE] refactoring 2017-03-29 12:01:34 +03:00
Maxim Kadushkin 849ff6a91e [Common] added action for 'Back' menu 2017-03-16 16:59:04 +03:00
Maxim Kadushkin 7f972c790e [Common] added label for 'Save' operation 2017-03-16 13:24:03 +03:00
Maxim Kadushkin b57830c9ab [DE] refactoring 2017-03-16 13:20:07 +03:00
Maxim Kadushkin 10a55236d0 [DE] moved "coauthoring users" panel to toolbar 2017-03-13 19:29:05 +03:00
Maxim Kadushkin a3a896ac79 [DE] repaired header 2017-03-01 16:33:12 +03:00
Alexander.Trofimov 126a0c9c4b change license to 2017 2017-01-17 17:58:08 +03:00
Julia Radzhabova 9f3d70bbf0 Highlight document name when it can be renamed. 2016-10-05 13:40:18 +03:00
Julia Radzhabova a362235acf Rename file from editors. 2016-09-26 13:54:25 +03:00
Julia Radzhabova 7749b95544 Added developer mode. 2016-09-19 17:04:56 +03:00
Julia Radzhabova de773f8618 Debug opening/moving/resizing menus, dialogs, tips and others (using mouse events), when browser zoom != 100%. 2016-08-19 16:41:48 +03:00
Maxim Kadushkin 1bd7d37f93 license info added to js 2016-04-01 16:17:09 +03:00
Maxim Kadushkin 741b10515d webapps added 2016-03-10 21:48:53 -03:00