Commit graph

376 commits

Author SHA1 Message Date
Maxim Kadushkin af8edb29ca merge with develop 2018-07-18 15:24:51 +03:00
Julia Radzhabova 9d4b63e2e9 Fix header logo 2018-07-17 16:55:54 +03:00
nekurill f2e44de3c6 Svg icon for pdf\a format is added 2018-07-12 18:32:00 +03:00
nekurill 40c57baf7c Chenge color for icon RTF
For increase visual difference between TXT and RTF icons
2018-07-12 18:25:13 +03:00
nekurill a967f30864 Add icons "Diagonal Up Border" and "Diagonal Down Border" 2018-06-19 15:59:35 +03:00
Julia Radzhabova dbdf13f1a1 Show comments and review changes in the same window 2018-06-07 17:09:54 +03:00
Julia Radzhabova 0262458c42 Fix style for user name 2018-06-05 12:53:02 +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 71997cf64e Draw user color in comments, chat, review changes. 2018-06-04 14:45:22 +03:00
Julia Radzhabova 2c08096b17 Change user name in chat panel 2018-06-01 10:51:09 +03:00
Julia Radzhabova 3a600d8e64 [SSE] Fix Bug 18052 2018-05-31 10:27:38 +03:00
Julia Radzhabova 55b8ec47ea Fix header logo 2018-05-23 17:38:44 +03:00
Julia Radzhabova 902f5d2f5f Merge branch 'hotfix/v5.1.4' into develop 2018-05-14 14:21:55 +03:00
Julia Radzhabova bdb770e68e Fix Bug 37666, Bug 35896 2018-05-08 11:14:43 +03:00
Julia Radzhabova 0af418dced revert commit 161bd0ee3d (Bug 35896) 2018-05-08 11:07:01 +03:00
nekurill 8128ba990d Change svg-btn-options 2018-05-04 14:31:36 +03:00
Maxim Kadushkin 8e29326db7 [All] fix bug 37587 2018-05-03 19:02:09 +03:00
Julia Radzhabova d8f87beaa2 Add warning when open file protected with password. 2018-04-27 14:53:36 +03:00
maxkadushkin 98331d05e6
Merge branch 'develop' into hotfix/v5.1.3 2018-04-26 18:53:29 +03:00
Maxim Kadushkin 326e5bfa98 [All] correction z-order for synchronize tooltip 2018-04-24 20:07:04 +03:00
Maxim Kadushkin a9eb64fa3a [DE] z-index correction 2018-04-24 16:15:26 +03:00
Maxim Kadushkin 15a7771a6f [Common] correct index for SSE 2018-04-23 15:29:41 +03:00
Maxim Kadushkin 6977ca9cbf [Common] tooltip appeared under toolbar tabs 2018-04-23 14:32:28 +03:00
Maxim Kadushkin 1294cfd4a5 [All] 'save as' format images changed on svg 2018-04-17 15:07:30 +03:00
Julia Radzhabova 2bdb4ea51c Refactoring tooltips 2018-04-03 17:39:49 +03:00
Maxim Kadushkin a4a32ee321 merge with develop 2018-04-03 13:57:02 +03:00
Maxim Kadushkin 49a32c8155 merge with develop 2018-04-02 01:11:24 +03:00
Julia Radzhabova 706664459a Merge branch 'develop' into feature/bookmarks 2018-03-28 14:39:57 +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 f307c90ae8 Merge branch 'release/v5.1.0' into feature/bookmarks 2018-03-19 12:10:49 +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 3e60e495a0 Merge branch 'develop' into feature/svg-icons 2018-03-04 23:49:46 +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
Julia Radzhabova 7cbbdeccc9 [DE] Change hyperlink settings. 2018-02-27 14:55:58 +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 0b18b03060 [DE] Add bookmarks. 2018-02-19 14:56:44 +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
Maxim Kadushkin e2f86ace35 in button added icon for 150% of zoom 2018-02-01 17:15:56 +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
Julia Radzhabova 4c17a79725 Change layout for table of contents. 2017-12-21 13:56:48 +03:00
Julia Radzhabova 909e73270a [DE] Added methods for table of content. 2017-12-21 11:44:06 +03:00
Julia Radzhabova 760493b15a Fix expand/collapse for treeview. 2017-12-20 14:09:31 +03:00
Julia Radzhabova e198458d58 [DE] Added document structure in the left panel. 2017-12-19 16:30:58 +03:00
Julia Radzhabova e7b722c021 [DE] Updated icons. Added context menu for content controls. 2017-12-13 16:52:14 +03:00
Julia Radzhabova eb3efa3778 [DE] Insert content controls. 2017-12-12 14:14:27 +03:00
Julia Radzhabova 0d2cfcd189 Update icons. 2017-12-11 12:19:42 +03:00
Julia Radzhabova ea06c24422 Change font size in the password fields. 2017-12-06 14:40:18 +03:00
Julia Radzhabova 94aa389f1c Added icons for Protection tab. 2017-11-28 16:26:31 +03:00
Julia Radzhabova 26aa0afc45 Signature refactoring. 2017-11-28 15:54:12 +03:00
Julia Radzhabova 5623c7dd3e SynchronizeTip: added 'left' placement, added option for changing link text and visibility.
Bug with creating several synchronize tips.
2017-11-28 14:19:54 +03:00
Julia Radzhabova 74c000c941 Signature refactoring. 2017-11-24 14:47:48 +03:00
Julia Radzhabova 802cbac017 SynchronizeTip: added 'left' placement, added option for changing link text and visibility. 2017-11-08 17:35:23 +03:00
Julia Radzhabova db3475a6e6 Merge branch 'feature/collaboration-tab' into develop 2017-10-27 16:03:03 +03:00
Julia Radzhabova ce5bd464ed Debug style for users colors. 2017-10-18 17:10:49 +03:00
Julia Radzhabova b7d6e75ed6 Update icons for collaboration tab. 2017-10-18 15:55:32 +03:00
Julia Radzhabova aec113963d [PE] Added collaboration tab. 2017-10-12 12:22:31 +03:00
Julia Radzhabova b74afc68e5 [Common] Disabled style for listview. 2017-10-11 15:21:31 +03:00
Julia Radzhabova 76cbae43d5 Merge branch 'develop' into feature/new-toolbar-pivot-table 2017-10-11 12:14:58 +03:00
Julia Radzhabova cae3819434 [DE] Added Chat button to the collaborative tab in the toolbar. 2017-10-10 15:14:27 +03:00
Julia Radzhabova 1577c8a26e [DE] Added version history to the collaboration tab. 2017-10-09 15:37:12 +03:00
Alexey Golubev fce84eef7a v5.0.1 2017-10-05 14:48:08 +03:00
Julia Radzhabova c1e8ec1017 Merge branch 'develop' into feature/new-toolbar-pivot-table 2017-09-29 11:26:45 +03:00
Julia Radzhabova 161bd0ee3d Fix Bug 35896. 2017-09-28 14:02:33 +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 a76214961d Disable up/down buttons in the scrollable menu (language menu). 2017-09-19 12:03:15 +03:00
Julia Radzhabova a701bbae4f Merge branch 'develop' into feature/new-toolbar-pivot-table 2017-09-07 16:15:13 +03:00
Julia Radzhabova 43222dfa9d Merge pull request #4 from ONLYOFFICE/release/v5.0.0
Release/v5.0.0
2017-09-07 11:49:02 +03:00
Julia Radzhabova f658bda9b8 [SSE] Update icons for flags (Bug 34517). 2017-09-06 15:05:26 +03:00
Maxim Kadushkin d1faebc08d [Common] wrong button's layout in Firefox for mac on hdpi display 2017-08-31 11:20:47 +03:00
Julia Radzhabova 97b20715f0 [DE] Fix Bug 35750. 2017-08-31 11:15:03 +03:00
Julia Radzhabova 876eb58f8b Merge branch 'develop' into feature/new-toolbar-pivot-table 2017-08-30 15:12:25 +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 076960a38a Change font color for textarea in the comment window. 2017-08-25 12:48:32 +03:00
Julia Radzhabova f04d626df0 [DE] Update icons. 2017-08-24 11:25:32 +03:00
Julia Radzhabova 57a8cdadb4 [DE] Set display mode for review. 2017-08-23 17:49:56 +03:00
Julia Radzhabova 0a1d11cd18 Merge branch 'develop' into feature/new-toolbar-pivot-table 2017-08-22 14:31:14 +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 e2c9f6f9c7 Fix Bug 35607. 2017-08-22 11:40:23 +03:00
Julia Radzhabova f5a32b57d4 Fix bug with default logo in About page. 2017-08-17 17:03:36 +03:00
Julia Radzhabova 9412d9bf12 Prevent user-select plugins modal window. 2017-08-17 11:40:50 +03:00
Julia Radzhabova 33a08d6df0 Change size for plugin icon. 2017-08-16 17:59:06 +03:00
Julia Radzhabova d822aacd47 Change opacity for editor modal-mask. 2017-08-16 15:46:30 +03:00
Maxim Kadushkin 891a4dc91f [Common] locked click on branding logo 2017-08-15 19:30:16 +03:00
Julia Radzhabova a264c1f687 [DE] Fix bug with move-buttons in Insert Footnote button in the toolbar. 2017-08-15 16:15:21 +03:00
Maxim Kadushkin 2071162fb8 Merge branch 'release/v5.0.0' into develop 2017-08-15 14:58:24 +03:00
Maxim Kadushkin 0bb1d90bb3 [Common] rename document in title 2017-08-15 14:44:59 +03:00
Maxim Kadushkin 88588a8fba fix bug 35586, 35591, 35593 2017-08-15 14:26:40 +03:00
Julia Radzhabova 789530e173 Fix Bug 35594. 2017-08-15 14:11:12 +03:00
Maxim Kadushkin f802cc735a strange section and button movement in toolbar in IE 2017-08-14 18:04:04 +03:00
Julia Radzhabova c62aca7aa2 Fix Bug 35588. 2017-08-14 17:01:02 +03:00
Maxim Kadushkin dad9b2127d unlocked plugins in toolbar 2017-08-11 14:01:27 +03:00
Maxim Kadushkin 2cf4c10d0b Merge branch 'develop' 2017-08-09 20:03:01 +03:00
Maxim Kadushkin fb8eb5ddea [Common] debug button's layout 2017-08-09 19:58:47 +03:00
Julia Radzhabova 1b79fa38ff Fix Bug 35554, Fix Bug 35556. 2017-08-09 14:37:27 +03:00
Julia Radzhabova 436588340a Merge branch 'develop' into feature/new-toolbar-pivot-table 2017-08-08 17:06:32 +03:00
Julia Radzhabova f2b129b362 Update close button icon. 2017-08-08 15:14:18 +03:00
Julia Radzhabova 06bbdabb21 [SSE] Update pivot templates when edit grand totals. 2017-08-03 12:53:07 +03:00
Julia Radzhabova 0ca3e9fc41 Merge branch 'feature/new-toolbar' into feature/new-toolbar-pivot-table 2017-08-01 15:23:54 +03:00
Maxim Kadushkin 75626ea68b [Common] dimension picker didn't render correctly 2017-08-01 15:17:01 +03:00
Maxim Kadushkin 8513705b1e [Common] added 'document rename' 2017-08-01 15:14:19 +03:00
Maxim Kadushkin 9d4604b8ae repaired svg sprite 2017-07-21 14:10:37 +03:00
nekurill 588c85c784 Change some big icons for toolbar. Add changed toolbarbig@2x.png. 2017-07-21 13:58:15 +03:00
Maxim Kadushkin 079cbe0a60 updated toolbar styles according to drafts 2017-07-21 13:48:02 +03:00
Julia Radzhabova a2e75a00e1 Merge branch 'feature/new-toolbar' into feature/new-toolbar-pivot-table 2017-07-18 15:49:14 +03:00
nekurill 394638e40d Add icon svg-btn-edit 2017-07-17 18:18:51 +03:00
Maxim Kadushkin 2f54b983a2 [Common] debug styles for header buttons 2017-07-13 12:37:22 +03:00