Commit graph

311 commits

Author SHA1 Message Date
Maxim Kadushkin 6641e9419c Merge branch 'hotfix/v6.3.1' into release/v6.4.0 2021-07-04 23:44:01 +03:00
Maxim Kadushkin c0c4766574 [SSE PE] fix bug 50724 2021-06-04 10:34:56 +03:00
evgenykatyshev 89f1746dbe Update icons for 125 and 175% 2021-05-25 23:39:55 +03:00
maxkadushkin a68c38f83c
Merge pull request #895 from ONLYOFFICE/feature/hotfix-6-3-1
Feature/hotfix 6 3 1
2021-05-23 21:36:43 +03:00
Julia Radzhabova 45d7980212 Merge branch 'release/v6.3.0' into develop 2021-05-21 12:28:54 +03:00
Maxim Kadushkin 44210f7a5a [all] prepare sprites for 1.25x and 1.75x scaling 2021-05-21 11:19:26 +03:00
Maxim Kadushkin 00b8e67c68 [PE] fix bug 50284 2021-05-19 15:08:04 +03:00
Julia Radzhabova be03943431 Update translation. Bug 50473 2021-05-18 22:47:09 +03:00
Julia Radzhabova f49703ddf7 Update help 2021-05-18 13:38:59 +03:00
Julia Radzhabova 510c43a89c Update help 2021-05-14 18:39:15 +03:00
Julia Radzhabova a6164ccffc [PE] Update help 2021-05-14 17:37:39 +03:00
Julia Radzhabova 33c3c9c887 Update help 2021-05-07 12:37:17 +03:00
Julia Radzhabova 661b937a74 Fix Bug 50031 2021-05-04 18:34:52 +03:00
Julia Radzhabova 79a4ad4542 Update help 2021-05-04 17:26:37 +03:00
Julia Radzhabova e265dd3aaf [PE] Update help 2021-04-30 17:42:55 +03:00
Julia Radzhabova 9569670490 [PE] Update help 2021-04-30 17:19:11 +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 bf6cab4d48 [PE] fix bug 49966 2021-04-26 23:54:50 +03:00
Maxim Kadushkin 57c9c6268e [common] extended theme's object 2021-04-18 17:32:39 +03:00
Julia Radzhabova c2e0ffb2be Merge branch 'release/v6.3.0' into develop 2021-04-15 11:18:07 +03:00
Julia Radzhabova 57b6acfd67 Merge branch 'feature/de-preview-bullets' into develop 2021-04-10 00:37:17 +03:00
Julia Radzhabova 65b9d893d6 [PE] Fix Bug 49569 2021-04-09 15:20:55 +03:00
Julia Radzhabova 2c0c3285b3 [PE] Fix slide num style 2021-04-09 14:53:12 +03:00
Julia Radzhabova c3fc27031f [PE] [DE] Draw list preview in sdk 2021-04-02 23:04:37 +03:00
Julia Radzhabova 630c01105c Merge branch 'release/v6.3.0' into develop 2021-04-02 17:33:33 +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
evgenykatyshev cd69ee0d02 Change icons color to black
One more attempt
2021-04-01 20:41:08 +03:00
Maxim Kadushkin b109057b01 [SSE PE] fix disabled state's icon 2021-04-01 11:15:52 +03:00
Julia Radzhabova 8d54a7d1fb [PE] Fix themes list 2021-03-30 13:23:23 +03:00
Julia Radzhabova b1d3ba3fc0 Merge branch 'release/v6.3.0' into develop 2021-03-29 16:33:45 +03:00
Julia Radzhabova 36e6394f2b [PE] Show version history 2021-03-24 10:39:09 +03:00
evgenykatyshev 5efce72104 Replace gray icons to black 2021-03-19 13:08:58 +03:00
Julia Radzhabova b0fedaa13f Merge branch 'master' into release/v6.3.0 2021-03-04 13:51:02 +03:00
Julia Radzhabova dcfed71c9b Update translation 2021-02-19 16:30:57 +03:00
Julia Radzhabova efa67ab226 Update help 2021-02-19 16:20:53 +03:00
Maxim Kadushkin 64dfc35569 [all] fix bug 448774 2021-02-17 19:00:28 +03:00
Maxim Kadushkin 8847c328a6 [dark theme] fix PE styles for IE 2021-02-16 11:36:00 +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 3f228da263 [stylesheets] refactoring 2021-02-07 00:30:24 +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
Julia Radzhabova 57b1ff417d Update help 2021-02-05 16:07:35 +03:00
Julia Radzhabova 4dca8fad6a Update help 2021-02-02 11:43:46 +03:00
Maxim Kadushkin acb17c9e08 [multiscaling] correct some elements 2021-01-31 22:35:09 +03:00
Julia Radzhabova e83357f86a [PE] Fix Bug 46920: add highlight button 2021-01-29 17:31:46 +03:00
Julia Radzhabova b003a5c021 [PE] Bug 46920: Add change case button 2021-01-29 16:06:51 +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
Maxim Kadushkin 8e81a7b0e1 [scaling] repaired some elements 2021-01-22 00:18:15 +03:00
Maxim Kadushkin 4412524e82 [multiscaling] repaired some components 2021-01-21 13:14:36 +03:00
Julia Radzhabova 791d86c1be Update help 2021-01-20 20:42:21 +03:00
Julia Radzhabova e8eba05a54 Merge branch 'release/v6.2.0' into develop 2021-01-19 18:05:55 +03:00