Commit graph

306 commits

Author SHA1 Message Date
Maxim Kadushkin f62aa45b18 Merge branch 'develop' into feature/multiZoom5.5
# Conflicts:
#	apps/common/main/resources/img/toolbar/1x/big/.css.handlebars
#	apps/common/main/resources/less/asc-mixins.less
#	apps/common/main/resources/less/buttons.less
#	apps/common/main/resources/less/checkbox.less
#	apps/common/main/resources/less/combo-dataview.less
#	apps/common/main/resources/less/comments.less
#	apps/common/main/resources/less/common.less
#	apps/common/main/resources/less/dataview.less
#	apps/common/main/resources/less/dropdown-menu.less
#	apps/common/main/resources/less/listview.less
#	apps/common/main/resources/less/multislider-gradient.less
#	apps/common/main/resources/less/radiobox.less
#	apps/common/main/resources/less/scroller.less
#	apps/common/main/resources/less/separator.less
#	apps/common/main/resources/less/theme-colorpalette.less
#	apps/common/main/resources/less/toolbar.less
#	apps/common/main/resources/less/window.less
#	apps/documenteditor/main/resources/less/advanced-settings.less
#	apps/documenteditor/main/resources/less/filemenu.less
#	apps/documenteditor/main/resources/less/leftmenu.less
#	apps/documenteditor/main/resources/less/rightmenu.less
#	apps/documenteditor/main/resources/less/statusbar.less
#	apps/documenteditor/main/resources/less/toolbar.less
#	apps/presentationeditor/main/resources/less/leftmenu.less
#	apps/presentationeditor/main/resources/less/rightmenu.less
#	apps/presentationeditor/main/resources/less/statusbar.less
#	apps/spreadsheeteditor/main/resources/less/celleditor.less
#	apps/spreadsheeteditor/main/resources/less/leftmenu.less
#	apps/spreadsheeteditor/main/resources/less/rightmenu.less
#	apps/spreadsheeteditor/main/resources/less/statusbar.less
#	apps/spreadsheeteditor/main/resources/less/toolbar.less
2021-02-10 15:40:30 +03:00
Julia Radzhabova 85f899410d [DE] Add tab Forms in the fill forms mode. Add prev/next, submit buttons 2021-02-04 23:19:43 +03:00
Julia Radzhabova c5a4982382 Hide styles for combined charts 2021-01-30 16:15:25 +03:00
Julia Radzhabova b2dd7d02d6
Merge pull request #682 from ONLYOFFICE/release/v6.2.0
Release/v6.2.0
2021-01-28 12:07:00 +03:00
Julia Radzhabova 88f77575db [DE] Fix form settings 2021-01-27 17:33:50 +03:00
Julia Radzhabova 01b8120449 [DE] Bug 48441 2021-01-27 17:20:55 +03:00
Julia Radzhabova 70b6a5b3cb
Merge pull request #663 from ONLYOFFICE/feature/bug-42912
Feature/bug 42912
2021-01-20 12:44:27 +03:00
Julia Radzhabova e8eba05a54 Merge branch 'release/v6.2.0' into develop 2021-01-19 18:05:55 +03:00
Julia Radzhabova 977b6c9d30 [DE] Add paragraph indents to right panel 2021-01-19 11:17:04 +03:00
Julia Radzhabova 9b561aab66 [DE] Bug 42912 2021-01-18 16:41:49 +03:00
Julia Radzhabova dae5509b6d Fix translation 2020-12-25 10:47:57 +03:00
Julia Radzhabova 1474c14019 Change styles for toolbar 2020-12-22 14:45:08 +03:00
Maxim Kadushkin 5202ba939c [DE] correct elements border 2020-12-11 21:26:40 +03:00
Julia Radzhabova dc696c5afb [DE] Show count of connected values for form settings 2020-11-10 21:46:20 +03:00
Julia Radzhabova 460ff7e6f3 Merge branch 'feature/de-new-controls' into develop 2020-10-31 19:11:19 +03:00
Julia Radzhabova 7115adc514 Refactoring 2020-10-31 18:32:19 +03:00
Julia Radzhabova 7ae4da5f7e [DE] Add border for new text form 2020-10-20 19:26:31 +03:00
Julia Radzhabova cb1a4b670e [DE] Change buttons for table of figures 2020-10-16 16:46:45 +03:00
Julia Radzhabova 44749d0094 [DE] Add table of figures 2020-10-15 10:32:46 +03:00
Julia Radzhabova 0a9d8773cd [DE] Turn on/off fill form mode from Forms tab 2020-10-08 11:11:34 +03:00
Julia Radzhabova b357198994 [DE] Add icons 2020-10-07 15:44:36 +03:00
Julia Radzhabova c35bf4bdcd [DE] Add Forms tab 2020-10-07 10:43:34 +03:00
Julia Radzhabova 71f6386199 [DE] Change image for picture control 2020-10-06 20:52:17 +03:00
Julia Radzhabova 80d3f5f026 [DE] Add lock property for controls 2020-10-06 19:25:49 +03:00
Julia Radzhabova 701f505be9 [DE] Add settings for list controls 2020-09-30 15:46:19 +03:00
Julia Radzhabova b46ab4e0bd [DE] Add check/radio form settings 2020-09-30 13:25:18 +03:00
Julia Radzhabova 3234492ccc [DE] Refactoring form settings 2020-09-30 10:33:38 +03:00
Julia Radzhabova 301af74045 [DE] Fix line numbering 2020-09-29 00:02:30 +03:00
Julia Radzhabova 1f04c90813 [DE] Add form control settings to the right panel 2020-09-28 19:06:12 +03:00
Julia Svinareva 2bbd1e5937 [DE] Line Numbers 2020-09-27 21:44:56 +03:00
Julia Svinareva 83aeabb623 [DE] Line Numbers
Автор: Julia Svinareva <julia.svinaryova@onlyoffice.com>
Дата: 19 сентября 2019 г. 10:20:21
2020-09-27 21:44:19 +03:00
Julia Radzhabova f61c7bbbb7 [DE] Add cross-reference 2020-09-22 16:48:45 +03:00
Julia Radzhabova c56fadc6df [DE] Shape and TextArt settings: add gradient angle 2020-09-10 15:00:58 +03:00
Julia Radzhabova 8233cc2388 Merge branch 'release/v6.0.0' into develop 2020-09-09 13:55:55 +03:00
Julia Radzhabova 2876a19bd3 Fix Bug 33599: fix layout for paragraph settings 2020-08-25 18:46:54 +03:00
JuliaSvinareva 457aff48ac Merge branch 'develop' into feature/gradient-fill 2020-07-09 15:53:07 +03:00
JuliaSvinareva a8e9c71d52 [DE] Bug 43708 (Text art settings, Shape settings: add buttons (position, add thumb, remove thumb), change gradient slider style) 2020-07-09 15:44:30 +03:00
Julia Radzhabova 5a059744d2 [DE] Fix text field settings 2020-06-25 14:13:08 +03:00
Julia Radzhabova 9c30933ef0 [DE] Show text field settings 2020-06-23 20:45:38 +03:00
Julia Radzhabova eb36fff041 [DE] Show new control settings 2020-06-23 17:50:08 +03:00
JuliaSvinareva af9eb000d9 [All] Update jquery (fix bugs) 2020-06-05 16:10:48 +03:00
Julia Radzhabova c4aac9cde3 [DE] Bug 42913: load image for filling shape from storage. 2020-05-13 14:57:50 +03:00
Julia Radzhabova fad29ce911 [DE] Bug 42913: replace image from storage. 2020-05-13 14:28:14 +03:00
Julia Radzhabova 6bc7c8ff8b [DE] Bug 42913: load watermark image from storage. 2020-05-13 12:47:45 +03:00
Julia Radzhabova 3e352d5c80 ListView refactoring 2020-04-09 16:29:04 +03:00
Julia Radzhabova acba0c11d1 [DE] Change placeholder for content control 2020-04-02 17:38:47 +03:00
Julia Radzhabova b20217d187 [DE] Bug 36585: insert date/time 2020-03-03 11:08:15 +03:00
Julia Radzhabova 74bce86ddd [DE][SSE] Add autofit settings for shape 2020-02-25 16:47:53 +03:00
Julia Svinareva 050d1a697e [DE] Bug 42429 2019-12-13 15:20:13 +03:00
Julia Radzhabova ded99f23fb [DE] Change settings for check box content control 2019-12-02 14:47:02 +03:00
Julia Radzhabova a2a05ca474 Add icons 2019-11-29 16:29:52 +03:00
Maxim Kadushkin 670b6cf2c6 merge with develop 2019-11-28 17:11:18 +03:00
Maxim Kadushkin 8a7aa454ac [DE] build icon sprite from source images 2019-11-21 10:58:05 +03:00
Julia Radzhabova 6c55bd0f24 Image settings: fix buttons size 2019-11-19 15:43:26 +03:00
Julia Radzhabova c40c8d6a2d [DE] Add settings for date content control 2019-11-15 11:11:34 +03:00
Julia Radzhabova 475e9c0306 [DE] Add settings for check box. Refactoring symbol table 2019-11-14 16:28:28 +03:00
Julia Radzhabova 01ff598622 Merge branch 'develop' into feature/de-controls 2019-11-14 13:53:46 +03:00
Julia Radzhabova 73f268aa54 Add symbol table dialog 2019-11-08 11:34:53 +03:00
Julia Radzhabova f6ce4273a0 [DE] Add settings for date content control 2019-11-06 14:15:23 +03:00
Julia Radzhabova 8803f6e1d6 [DE] Add settings for combobox and dropdown list controls 2019-11-06 13:24:04 +03:00
Julia Radzhabova ad70b9ab15 [DE] Change content control settings 2019-11-05 14:35:08 +03:00
Alexander Yuzhin 50e93373c3 [DE] Fixed display dummy document on loading 2019-10-30 11:29:17 +03:00
Julia Radzhabova 475a2bcbbe [DE] Add caption for object 2019-09-11 17:26:20 +03:00
Julia Radzhabova 1d6a469960 [DE] Fix Bug 40580 2019-08-20 12:16:28 +03:00
Julia Radzhabova 18bb1b42cc [DE] Hide outline level for charts 2019-08-12 10:16:23 +03:00
Julia Svinareva 331bb11f76 [DE] [PE] [SSE] Display none Outline level and preview 2019-08-09 17:11:51 +03:00
Julia Svinareva 16b1c2df1e [DE] [PE] [SSE] Fix translations 2019-08-09 16:48:27 +03:00
Julia Svinareva 1b597d7830 [SSE] [PE] [DE] Fix paragraph settings layout 2019-08-09 13:07:59 +03:00
Julia Svinareva 4ac912188b Merge branch 'develop' into feature/de-settings 2019-08-07 10:34:47 +03:00
Julia Svinareva bfd3116618 [DE] Fix paragraph settings layout 2019-08-06 11:55:20 +03:00
Julia Radzhabova d20bd24010 Add shape shadow 2019-08-05 14:12:50 +03:00
Julia Svinareva 4af90803b0 [DE] Fix paragraph settings layout (Tabs) 2019-08-05 09:30:33 +03:00
Julia Radzhabova 49dbcefce3 [DE] Fix paragraph settings layout 2019-07-31 14:54:10 +03:00
Julia Svinareva aacf8db129 [DE] Fix Paragraph - Advanced Settings (Bug 40580) 2019-07-31 13:55:08 +03:00
Julia Svinareva c370141f8c [DE] Fix Paragraph - Advanced Settings (Bug 40580) 2019-07-31 11:45:21 +03:00
Julia Svinareva 25984a5d42 [DE] Bug 40580 (Paragraph - Advanced Settings) 2019-07-29 12:24:16 +03:00
Julia Radzhabova 152a8d53f3 Merge branch 'feature/watermark' into develop 2019-06-19 11:30:46 +03:00
Julia Radzhabova 45a82b8442 [DE] Watermark: save language settings 2019-06-18 16:20:52 +03:00
Julia Radzhabova 4ac3503435 [DE] Get/put watermark settings 2019-06-17 17:05:27 +03:00
Julia Radzhabova 8962ca6400 [DE] Watermark: load text for different languages 2019-05-08 14:38:39 +03:00
Julia Radzhabova 08dc88dc98 [DE] Add crop for images 2019-04-05 17:36:15 +03:00
Julia Radzhabova a982f24fba [DE] Change watermark layout 2019-04-05 15:03:01 +03:00
Julia Radzhabova 5b3ede3a79 [DE] Add watermark settings 2019-04-05 14:28:51 +03:00
Julia Radzhabova a02151af4f Merge branch 'develop' into feature/de-table-formula 2019-02-27 13:12:51 +03:00
Julia Radzhabova 9d177228df Fix toolbar disable in two-line header mode 2019-02-05 14:46:26 +03:00
Julia Radzhabova 8831597e4d Fix layout 2019-02-04 17:38:44 +03:00
Julia Radzhabova 7d54f26372 Fix Bug 35911 2019-01-28 16:51:07 +03:00
Julia Radzhabova 0fa44aa21d [DE] Add formula to table cell 2019-01-22 11:29:24 +03:00
Julia Radzhabova 34700233a6 [DE] Add blank page 2018-11-20 12:57:29 +03:00
Julia Radzhabova a8482985e8 [DE] Add 'Save Copy As' action to file menu. Bug 23603, Bug 32790 2018-08-22 11:13:37 +03:00
Julia Radzhabova 18332d6059 [DE] Add rotation to image and shape settings in the right panel 2018-08-10 09:16:15 +03:00
Julia Radzhabova 0bf55a17fd [DE] Bug 19378 2018-08-03 14:00:54 +03:00
Julia Radzhabova 0069f46e55 [DE] Update layout for mail merge dialog 2018-06-15 16:26:46 +03:00
Julia Radzhabova d1f49d4a0d Fix view mode 2018-05-17 11:37:24 +03:00
Maxim Kadushkin 345e19e135 [All] refactoring tabs redering and selection 2018-05-16 17:41:47 +03:00
Julia Radzhabova 869bc1a7a6 [DE] Show File and Plugins tabs in view mode 2018-05-15 15:37:26 +03:00
Maxim Kadushkin a4a32ee321 merge with develop 2018-04-03 13:57:02 +03:00
Maxim Kadushkin dbf06b62fe [ALL] added menu for 'options' button 2018-03-21 14:28:28 +03:00
Julia Radzhabova f307c90ae8 Merge branch 'release/v5.1.0' into feature/bookmarks 2018-03-19 12:10:49 +03:00
Maxim Kadushkin 03e6994738 Merge branch 'develop' into feature/desktop-new 2018-03-14 18:08:19 +03:00
Julia Radzhabova bc30e303da [DE] Fix Bug 37163 2018-03-12 14:50:41 +03:00
Maxim Kadushkin b50749f572 element with id=title inserted in some data views 2018-03-09 01:01:28 +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 0b18b03060 [DE] Add bookmarks. 2018-02-19 14:56:44 +03:00
Julia Radzhabova c172b0c69d [DE] Change name and layout for Links tab. 2018-02-16 12:14:20 +03:00
Maxim Kadushkin 8be206fa33 Merge branch 'develop' into feature/desktop-new 2018-02-13 11:26:16 +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 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
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 1cdc4f1e6d [DE] Fix bug with file menu. 2018-01-24 17:31:47 +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 f77dc3d45f [DE] Added table settings: change width/height, distribute rows/columns. 2018-01-18 17:26:31 +03:00
Julia Radzhabova 4a43eaa151 [DE] Change settings for header/footer: page numbering. 2018-01-18 14:14:33 +03:00
Julia Radzhabova 6ee6336001 Merge branch 'develop' into feature/table-of-contents 2018-01-16 11:12:47 +03:00
Julia Radzhabova 833f9fc1b1 Merge branch 'hotfix/v5.0.7' into develop 2018-01-15 16:11:11 +03:00
Julia Radzhabova ac78e89a58 [DE] Update left menu icon for table of contents. 2018-01-10 13:23:11 +03:00
Julia Radzhabova 8ca83c7144 [DE] Added hyperlink button to the Links tab. 2017-12-26 10:32:52 +03:00
Julia Radzhabova be416c5ed2 Add Note editing button to the Links tab. 2017-12-25 15:55:26 +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 e198458d58 [DE] Added document structure in the left panel. 2017-12-19 16:30:58 +03:00
Julia Radzhabova eb3efa3778 [DE] Insert content controls. 2017-12-12 14:14:27 +03:00
Julia Radzhabova d48e76e5c6 [DE] Change signature settings layout in the right panel. 2017-11-28 15:30:26 +03:00
Julia Radzhabova ceb0cd4b5e [DE] Refactoring signature settings in the right and left panels. 2017-11-28 15:29:14 +03:00
Julia Radzhabova f49404e8b5 Feature/new toolbar signature 2017-11-27 14:15:10 +03:00
Julia Radzhabova 354e9d1a9b [DE] Change signature settings layout in the right panel. 2017-11-16 16:06:55 +03:00
Julia Radzhabova 1bcb080cf7 [DE] Refactoring signature settings in the right and left panels. 2017-11-15 15:52:37 +03:00
Julia Radzhabova 4bfd4bf211 [DE] Added tab leader. 2017-11-03 16:23:19 +03:00
Julia Radzhabova db3475a6e6 Merge branch 'feature/collaboration-tab' into develop 2017-10-27 16:03:03 +03:00
Julia Radzhabova 7d1a4e14c9 [DE] Remove spellcheck and document language buttons from the toolbar collaboration tab. 2017-10-09 15:03:50 +03:00
Julia Radzhabova 2f92c81749 [DE] View signatures in the right panel. 2017-09-13 11:29:05 +03:00
Julia Radzhabova 6034531a2d [DE] Adding signature from the left menu. 2017-09-13 11:01:30 +03:00
Maxim Kadushkin 71d36de7f0 [DE] changed 'Layout' buttons order 2017-08-08 15:40:31 +03:00
Maxim Kadushkin 079cbe0a60 updated toolbar styles according to drafts 2017-07-21 13:48:02 +03:00
Maxim Kadushkin 27fd54d45e [DE] updated toolbar layout 2017-07-11 11:27:56 +03:00
Maxim Kadushkin 1167d13814 styles: adjusted distance between buttons 2017-07-04 17:24:15 +03:00
Maxim Kadushkin 52750c5907 [DE] big 'Dropcap' button 2017-06-30 17:35:48 +03:00
Maxim Kadushkin 043594c5f4 [DE] debug toolbar's layout 2017-06-27 13:36:29 +03:00
Maxim Kadushkin 0ec42dad0e [DE] replaced 'insert' buttons 2017-06-26 16:11:50 +03:00
Maxim Kadushkin 5911176848 [Common] skiped marker for active tab 2017-06-16 11:50:21 +03:00
Maxim Kadushkin 73d2690100 toolbar's redesigne 2017-06-08 18:14:36 +03:00
Maxim Kadushkin 4bb630132e [DE] changed layout of 'insert' panel 2017-05-04 15:41:56 +03:00
Julia Radzhabova 26b6527e26 [DE][PE] Refactoring header, toolbar 2017-04-28 13:44:03 +03:00
Julia Radzhabova 720e8e5afa [DE] Chart/Shape Settings: change wrapping style to ComboDataView. 2017-04-27 16:26:12 +03:00
Julia Radzhabova 8f9ea6907e [DE] ImageSettings: added fit to margin. 2017-04-27 14:49:17 +03:00
Julia Radzhabova ba6ef75fd8 [DE] ImageSettings: change wrapping style to ComboDataView. 2017-04-26 16:28:36 +03:00
Maxim Kadushkin 77e62ed696 [DE] debug of "FileMenu" 2017-04-20 13:37:18 +03:00