Commit graph

162 commits

Author SHA1 Message Date
Maxim Kadushkin c93bfb68cb Merge branch 'hotfix/v6.3.1' into develop 2021-07-04 23:39:04 +03:00
Maxim Kadushkin d9aa035d71 [all] fix bug 50656 2021-05-31 21:15:49 +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
Julia Radzhabova fc66f37f43 Change groups paddings 2021-04-27 21:21:11 +03:00
Maxim Kadushkin 4533ceafd7 [all] fix bug 49741 2021-04-24 21:12:57 +03:00
Maxim Kadushkin 38cc5ee7fa [common] fix bug 49741 2021-04-20 16:37:09 +03:00
Maxim Kadushkin 21ae480d3e [common] refactoring 2021-04-19 23:58:59 +03:00
Julia Radzhabova 9b6ec674de
Merge pull request #779 from ONLYOFFICE/release/v6.3.0
Release/v6.3.0
2021-04-02 11:53:39 +03:00
Maxim Kadushkin dba13ffbdf [all] fixed logo on bundled app version 2021-03-31 19:52:05 +03:00
Maxim Kadushkin 753a74a055 [all] fix bug 49214 2021-03-29 23:58:53 +03:00
Julia Radzhabova b1d3ba3fc0 Merge branch 'release/v6.3.0' into develop 2021-03-29 16:33:45 +03:00
maxkadushkin 1d6fe573a1
Update toolbar.less 2021-03-14 17:20:27 +03:00
Maxim Kadushkin bda2dd7873 [all] some changes for components stylesheet 2021-03-06 00:52:06 +03:00
Julia Radzhabova 6c7ebc300a Update icons 2021-02-26 16:36:24 +03:00
Julia Radzhabova 8e282825f1 [SSE] Add icon sets presets 2021-02-25 23:15:05 +03:00
Julia Radzhabova f6e15bda2a [SSE] Add presets for conditional formatting 2021-02-25 18:45:24 +03:00
Maxim Kadushkin 1fed5dc207 [dark theme] correct some components 2021-02-18 00:27:58 +03:00
Maxim Kadushkin fcdb2ee898 [dark theme] fix common styles for IE 2021-02-16 10:21:22 +03:00
Julia Radzhabova 47f079dcb3 Merge branch 'develop' into feature/new-chart-types 2021-02-11 17:22:09 +03:00
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
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 3ef5d0e738 [themes] apply theme to "presenter" view 2021-02-03 10:12:26 +03:00
Maxim Kadushkin 8e81a7b0e1 [scaling] repaired some elements 2021-01-22 00:18:15 +03:00
Maxim Kadushkin 29951e266e [stylesheets] repired some components according to colors table 2021-01-18 12:19:38 +03:00
Maxim Kadushkin ed7f30f957 [scaling] repaired style for some components 2021-01-15 18:58:54 +03:00
Julia Radzhabova 86e628b6b6 Add new chart types 2021-01-14 12:57:22 +03:00
Julia Radzhabova 64f81a2984 Merge branch 'feature/guest-name' into develop 2020-12-30 11:24:02 +03:00
Julia Radzhabova d6e183b52f Compact toolbar: add user button to header for changing guest name 2020-12-29 10:39:00 +03:00
Maxim Kadushkin c81778a5a6 [stylesheets] repaired some components 2020-12-26 17:44:36 +03:00
Julia Radzhabova 96e720858f Change toolbar styles 2020-12-22 15:11:46 +03:00
Julia Radzhabova 1474c14019 Change styles for toolbar 2020-12-22 14:45:08 +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 72a9a84fb5 [DE] colors changed according to colors table 2020-12-16 22:39:42 +03:00
Maxim Kadushkin 5202ba939c [DE] correct elements border 2020-12-11 21:26:40 +03:00
Maxim Kadushkin c90d98a7ab [dark theme] changed colors definition in common stylesheets 2020-11-20 16:03:31 +03:00
Maxim Kadushkin 25f56d381a [dark theme] changed @primary and @primary-hover 2020-11-18 20:08:12 +03:00
Maxim Kadushkin 0b43033456 [dark theme] changed @secondary and @secondary-hover 2020-11-18 18:58:41 +03:00
Maxim Kadushkin 5e29e5e9d2 [dark theme] changed @gray-light and @gray-lighter 2020-11-17 18:54:43 +03:00
Maxim Kadushkin 6f20a5b958 [dark theme] @gray-deep to @text-normal, @gray to @border-regular-control 2020-11-17 15:27:32 +03:00
Maxim Kadushkin 3d44274c2c [dark theme] @gray-dark to @border-toolbar 2020-11-16 20:26:04 +03:00
Julia Radzhabova a48997fee4 Fix using customization.toolbarHideFileName parameter 2020-10-23 17:46:34 +03:00
Julia Radzhabova e3dd2bc5dd Merge branch 'feature/chart-svg-icons' into develop 2020-05-06 18:20:30 +03:00
Julia Radzhabova 0a54513e47 [SSE][PE] Set svg icons for chart types 2020-05-06 18:04:48 +03:00
Julia Radzhabova 506919df1b [SSE] Fix spark icons 2020-04-29 22:17:38 +03:00
maxkadushkin c0e8ff2438
changes from design dep 2020-04-28 10:26:36 +03:00
Julia Radzhabova b639b12d98 Refactoring toolbar resize: hide buttons captions in right-to-left order 2020-04-13 17:45:30 +03:00
Julia Radzhabova f4aee180e9 [DE] Use svg icons for chart type 2020-01-31 13:53:58 +03:00
Julia Radzhabova eae1645df5 Table/Cell settings: change border buttons 2019-12-17 15:18:06 +03:00
Maxim Kadushkin d1e175076f [build] optimized output css 2019-12-02 14:20:19 +03:00