Commit graph

69 commits

Author SHA1 Message Date
Maxim Kadushkin 5b57ee760b Merge branch 'develop' into feature/colors-table
# Conflicts:
#	apps/common/main/resources/less/loadmask.less
#	apps/documenteditor/main/app/controller/Main.js
#	apps/documenteditor/main/app/view/FileMenuPanels.js
#	apps/documenteditor/main/resources/less/toolbar.less
#	apps/presentationeditor/main/app/controller/Main.js
#	apps/presentationeditor/main/app/controller/RightMenu.js
#	apps/presentationeditor/main/app/view/FileMenuPanels.js
#	apps/presentationeditor/main/app/view/SlideSettings.js
#	apps/spreadsheeteditor/main/app/controller/Main.js
#	apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
#	apps/spreadsheeteditor/main/resources/less/toolbar.less
2021-02-06 14:42:56 +03:00
Maxim Kadushkin 5f6956ac0f [stylesheets] repaired stylesheets 2021-01-04 00:58:06 +03:00
Julia Radzhabova a30176fae1 Add/remove file to favorites 2020-12-14 22:45:30 +03:00
Julia Radzhabova e3dd2bc5dd Merge branch 'feature/chart-svg-icons' into develop 2020-05-06 18:20:30 +03:00
Julia Radzhabova fd5c8d5f79 [DE] Fix svg icon for chart type 2020-05-06 17:17:03 +03:00
Julia Radzhabova 5904c08e15 Refactoring button component 2020-04-29 10:36:53 +03:00
Maxim Kadushkin e5a0e50eda Merge with develop 2019-12-04 15:26:53 +03:00
Maxim Kadushkin 670b6cf2c6 merge with develop 2019-11-28 17:11:18 +03:00
Julia Radzhabova 5ad8e3a0ca Fix changing caption for button 2019-11-06 17:19:43 +03:00
Maxim Kadushkin e8a746ab37 [component] refactoring 2019-11-06 16:50:12 +03:00
Maxim Kadushkin a72d14d421 [desktop] send 'save' button changed icon 2019-11-05 15:28:33 +03:00
Maxim Kadushkin a0616e8f17 [common] refactoring 2019-11-05 15:17:48 +03:00
Maxim Kadushkin 891e3435d4 [DE] applied 1.5x icons on toolbar (svg + png) 2019-10-15 16:11:19 +03:00
Maxim Kadushkin 1407e01f4c Merge branch 'develop' into feature/svg-icons
# Conflicts:
#	apps/documenteditor/main/index.html
2019-10-07 16:55:17 +03:00
Julia Radzhabova 8d3ec85ca2 Merge branch 'develop' into feature/optimization 2019-09-18 16:32:26 +03:00
Julia Radzhabova 9b7c0f5894 Fix Bug 30244 2019-09-02 14:01:42 +03:00
Maxim Kadushkin 4725e80119 [common] refactoring for components 2019-07-29 14:24:20 +03:00
Julia Radzhabova bb1ed09138 Fix Bug 41686 2019-05-24 12:58:06 +03:00
Julia Radzhabova 08dc88dc98 [DE] Add crop for images 2019-04-05 17:36:15 +03:00
Julia Radzhabova 048b8480ce Merge branch 'hotfix/v5.2.8' into develop 2019-02-05 16:43:52 +03:00
Alexander.Trofimov c10009a464 [copyright] Update Copyright
Limited -> SIA
2019-01-17 16:05:03 +03:00
Alexander.Trofimov 68a1691d28 [copyright] For bug 39644
Change address Latvian office.
2019-01-17 16:00:34 +03:00
Alexander.Trofimov 1c9e684698 [copyright] Update Copyright
2018 -> 2019
2019-01-17 15:58:05 +03:00
Julia Radzhabova 173b5b5373 Fix bug when disable buttons (page break) 2018-11-20 12:54:31 +03:00
Julia Radzhabova f12c6f5c48 Fix Bug 38265 2018-07-20 13:28:54 +03:00
Julia Radzhabova d2da2ac656 Hide button menu when button is disabled 2018-07-19 16:41:52 +03:00
Maxim Kadushkin af8edb29ca merge with develop 2018-07-18 15:24:51 +03:00
Julia Radzhabova aa7e09b311 [PE] Fix Bug 37566 2018-04-24 13:46:07 +03:00
Julia Radzhabova a774753614 [PE] Fix Bug 37543 (bug in arrays concatenation) 2018-04-23 14:16:37 +03:00
Maxim Kadushkin 03e6994738 Merge branch 'develop' into feature/desktop-new 2018-03-14 18:08:19 +03:00
Pavel Lobashov 06da18bf2d Update copyright to 2018 2018-03-01 15:16:38 +03:00
Maxim Kadushkin 6d0a353d78 [Common] refactoring. defined $icon element for a button 2018-02-26 16:23:07 +03:00
Maxim Kadushkin 5f1b291886 [DE][PE][SSE] synchronize extra buttons state through events 2018-02-16 02:56:17 +03:00
Maxim Kadushkin 0fb072b9fa refactoring. created controller for set of buttons 2018-02-13 17:37:22 +03:00
Maxim Kadushkin e2f86ace35 in button added icon for 150% of zoom 2018-02-01 17:15:56 +03:00
Julia Radzhabova 1b26f5a94d [Common] Change setVisible, isVisible methods for Button component. 2017-11-16 12:37:41 +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
Maxim Kadushkin 88588a8fba fix bug 35586, 35591, 35593 2017-08-15 14:26:40 +03:00
Julia Radzhabova 83d91f5044 Fix Bug 35491. 2017-08-09 16:25:39 +03:00
Julia Radzhabova 8130efcafb [Common] Split button: set different hints to main button and caret button. Neet to set hint: ['Main hint', 'Caret hint'] 2017-08-03 16:38:52 +03:00
Maxim Kadushkin d5bfc3244d [Common] debug button's layout 2017-07-11 11:26:42 +03:00
Maxim Kadushkin f5bb8c8ed8 [Common] refactoring 2017-06-26 12:19:08 +03:00
Julia Radzhabova d503fd94fc Fix bug with tooltips on disabled buttons after loading. 2017-04-24 15:46:46 +03:00
Julia Radzhabova fde00ea2d2 Update jquery to 3.2.1. 2017-04-21 11:20:40 +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 aa03115dd2 Fix Bug 34570. + Bug with closing menus by clicking to the input fields: open context menu or combobox, click at any of metric spinners or editable comboboxes -> menu closed, focus goes from spinner/combobox to canvas. 2017-04-12 12:45:16 +03:00
Julia Radzhabova d2f949fc39 Fix Bug 33669. 2017-04-11 17:07:46 +03:00
Maxim Kadushkin f751aac0ab [Common] changed layout for the huge buttons 2017-03-29 11:49:42 +03:00
Maxim Kadushkin 7a2b4dab48 [Common] changed logic for the 'split' button 2017-03-23 16:00:24 +03:00