Commit graph

244 commits

Author SHA1 Message Date
Maxim Kadushkin 49a32c8155 merge with develop 2018-04-02 01:11:24 +03:00
Julia Radzhabova f11f79b1b9 Fix Bug 37291 2018-03-23 17:15:42 +03:00
Maxim Kadushkin 7077ca5e84 Merge branch 'develop' into feature/desktop-new 2018-03-21 15:40:49 +03:00
Maxim Kadushkin a2afa4b7fe [Common] added 'settings' button 2018-03-21 14:11:03 +03:00
Julia Radzhabova 38ac8db56f Change font size for chat panel. 2018-03-20 17:00:08 +03:00
Julia Radzhabova 7ec3d4170f [DE] Navigation refactoring: always show scrollbar, scroll to current header. 2018-03-16 13:09:00 +03:00
nekurill 878e546757 Have moved the icon "user". 2018-03-15 16:24:09 +03:00
Maxim Kadushkin 03e6994738 Merge branch 'develop' into feature/desktop-new 2018-03-14 18:08:19 +03:00
Julia Radzhabova f79385b71e [DE] Fix Bug 37104 2018-03-07 15:07:56 +03:00
Julia Radzhabova 426123738e Change resizer layout for left panel (due to changing colors in the canvas). 2018-03-07 13:02:21 +03:00
Maxim Kadushkin 99a7be61c6 merge with develop 2018-03-04 23:41:58 +03:00
Pavel Lobashov 06da18bf2d Update copyright to 2018 2018-03-01 15:16:38 +03:00
Maxim Kadushkin 794d08ea9c [common] changed synchronize tooltip markup 2018-02-28 16:33:04 +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
Julia Radzhabova 35542d4ee5 Change colors and layout. 2018-02-27 16:17:15 +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
Julia Radzhabova c8390124d7 Change icon for flag nn-NO. 2018-02-21 11:57:46 +03:00
Julia Radzhabova d6d6b02af8 Change icons in the right panel. 2018-02-20 19:36:28 +03:00
Julia Radzhabova 5ec790f85e Move common icons. 2018-02-20 15:29:01 +03:00
Julia Radzhabova 06dc9231a9 Add mexico flag. 2018-02-16 16:07:22 +03:00
nekurill 48895e287d Change mexico flag 2018-02-16 15:14:01 +03:00
nekurill 05a4ea7c51 Add Mexico flag 2018-02-16 14:56:33 +03:00
Julia Radzhabova aabbc9c8fd [DE][SSE] Open TXT: preview data bloks (as csv). 2018-02-13 17:01:13 +03:00
Maxim Kadushkin 8be206fa33 Merge branch 'develop' into feature/desktop-new 2018-02-13 11:26:16 +03:00
Julia Radzhabova c6e4aedae2 [DE][SSE] Open CSV/TXT: preview data bloks. 2018-02-13 10:52:48 +03:00
Julia Radzhabova 995fda53eb [Scroller] Update horizontal scroll icons. 2018-02-10 16:18:55 +03:00
Julia Radzhabova c97e7cfdbe [DE][SSE] Open CSV/TXT: use perfect-scrollbar in the preview panel, load data blocks (for future use) 2018-02-10 15:50:29 +03:00
Julia Radzhabova 056809faa6 Scroll refactoring: fix horizontal scroll. 2018-02-10 15:47:08 +03:00
Julia Radzhabova 0f2e985634 Fix Bug 36742. 2018-02-09 17:26:34 +03:00
Julia Radzhabova 69d8618bf7 Change style for buttons in the advanced settings dialog. 2018-02-07 14:15:03 +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 b142294a4a [SSE] Update select pivot icon. 2018-02-06 16:29:11 +03:00
Maxim Kadushkin d3b23c19f8 implement changes according to draft design 2018-02-06 01:01:29 +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 c0ca28d905 Change style for selected item in treeview. 2018-01-25 17:56:57 +03:00
Julia Radzhabova 26eae05fa7 Update icons in header. 2018-01-24 17:35:28 +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
Julia Radzhabova c7a7dd6aff
Merge pull request #48 from ONLYOFFICE/feature/table-of-contents
Feature/table of contents
2018-01-23 14:44:17 +03:00
Julia Radzhabova 1bbf47dd44 Comments: use 'break-word' in the textarea. 2018-01-17 13:26:18 +03:00
Julia Radzhabova 6ee6336001 Merge branch 'develop' into feature/table-of-contents 2018-01-16 11:12:47 +03:00
Julia Radzhabova 7959ab8773 [SSE] Fix merging v.5.0.7 to develop. 2018-01-16 10:58:15 +03:00
Julia Radzhabova 833f9fc1b1 Merge branch 'hotfix/v5.0.7' into develop 2018-01-15 16:11:11 +03:00
Julia Radzhabova 234c38aadf [DE] Change advanced settings for table of contents. 2018-01-11 18:02:27 +03:00
Julia Radzhabova db8840f4ec [DE] Added Links tab, added inserting and updating table of contents. 2017-12-23 11:33:49 +03:00
Julia Radzhabova b11e896521 Change style for the empty headers. 2017-12-21 15:01:37 +03:00