Commit graph

15 commits

Author SHA1 Message Date
Julia Radzhabova 45d7980212 Merge branch 'release/v6.3.0' into develop 2021-05-21 12:28:54 +03:00
Maxim Kadushkin 2e8a4ddc38 [scaling] fix bug 50164 2021-04-30 23:44:16 +03:00
Maxim Kadushkin 97474af94d Merge branch 'release/v6.3.0' into develop
# Conflicts:
#	apps/common/main/lib/controller/Plugins.js
#	apps/common/main/lib/view/Header.js
#	apps/documenteditor/main/app/controller/Main.js
#	apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js
#	apps/documenteditor/main/app/view/Toolbar.js
#	apps/documenteditor/main/locale/sl.json
#	apps/presentationeditor/main/app/view/ParagraphSettingsAdvanced.js
#	apps/presentationeditor/main/locale/ja.json
#	apps/spreadsheeteditor/main/app/controller/Main.js
#	apps/spreadsheeteditor/main/app/template/Toolbar.template
#	apps/spreadsheeteditor/main/app/view/ParagraphSettingsAdvanced.js
2021-04-29 23:31:07 +03:00
Maxim Kadushkin a1c9daae8e [common] debug 2021-04-24 23:21:15 +03:00
Maxim Kadushkin 0aa4aa0c72 [common] correct item position in combobox of border's size 2021-04-24 19:49:01 +03:00
Maxim Kadushkin ba31d2f163 [common] fix bug 49731 2021-04-19 23:57:54 +03:00
Julia Radzhabova 0075983c9f Merge branch 'develop' into feature/sse-conditional-formatting 2021-02-20 19:15:44 +03:00
Maxim Kadushkin 7388008716 [stylesheets] repaired combobox for border size 2020-12-31 21:05:43 +03:00
Maxim Kadushkin 3f7e982b79 [stylesheets] changed less variables 2020-12-19 22:44:34 +03:00
Maxim Kadushkin 86273f4959 [stylesheets] change colors to variables 2020-12-17 11:16:45 +03:00
Maxim Kadushkin c90d98a7ab [dark theme] changed colors definition in common stylesheets 2020-11-20 16:03:31 +03:00
Julia Radzhabova 04a2b32cc1 Change ComboBoxColor component: show displayValue 2020-04-16 18:42:54 +03:00
Julia Radzhabova 5e38c59787 Fix Bug 43986 2020-04-03 20:21:00 +03:00
Maxim Kadushkin be54167b60 refactoring for css-embedded images 2016-11-10 14:57:07 +03:00
Maxim Kadushkin 741b10515d webapps added 2016-03-10 21:48:53 -03:00