Commit graph

1480 commits

Author SHA1 Message Date
Julia Radzhabova 35cab5fe73 [SSE] Change rules in the toolbar 2021-03-15 17:44:09 +03:00
Julia Radzhabova b5433c25db Merge branch 'develop' into feature/sse-conditional-formatting 2021-03-12 11:35:19 +03:00
Julia Radzhabova 196ec1f261 [SSE] Add format presets for rules 2021-03-11 14:54:07 +03:00
Julia Radzhabova b0fedaa13f Merge branch 'master' into release/v6.3.0 2021-03-04 13:51:02 +03:00
Julia Radzhabova 0f1288e198 [SSE] Fix icons sets presets 2021-03-03 14:05:31 +03:00
Julia Radzhabova 2fb370418f [DE] Refactoring 2021-03-01 18:07:12 +03:00
Julia Radzhabova c3b0f9c2b6 [DE] Fix new track changes 2021-02-27 12:43:32 +03:00
Julia Radzhabova 526732cc53 [DE] Change track revisions 2021-02-26 15:11:57 +03:00
Maxim Kadushkin 203496dca5 [desktop] added 'themes' feature for editor 2021-02-25 23:56:18 +03:00
Maxim Kadushkin 683a87fbe5 [dark theme] changes for desktop app 2021-02-24 23:34:05 +03:00
Julia Radzhabova 0075983c9f Merge branch 'develop' into feature/sse-conditional-formatting 2021-02-20 19:15:44 +03:00
Julia Radzhabova 7014d076a4 Merge branch 'feature/new-track-changes' into develop 2021-02-19 20:35:56 +03:00
Julia Radzhabova 6205f6be76
Merge pull request #719 from ONLYOFFICE/feature/help-tips
Feature/help tips
2021-02-19 20:20:22 +03:00
Julia Radzhabova 28238bc902 Fix signature dialog 2021-02-19 15:23:55 +03:00
Julia Radzhabova d18bd76701 Fix icons 2021-02-19 14:10:25 +03:00
Maxim Kadushkin c8559792e1 [SSE] fixed launch for scaled DiagramEditor 2021-02-19 13:26:55 +03:00
Julia Radzhabova b8a36e8f6d Fix Bug 48723 2021-02-19 12:07:55 +03:00
Julia Radzhabova 8a4194eea8 [Signature] Send guid when editing signature 2021-02-19 11:42:49 +03:00
Julia Radzhabova e543142c26 Fix scroll in combobox, listview. 2021-02-18 20:38:46 +03:00
Maxim Kadushkin 166b54f728 [common] correct zoom value 2021-02-18 17:33:58 +03:00
Maxim Kadushkin 10cee7a927 [common] changed function to check scaling value 2021-02-18 16:44:18 +03:00
Maxim Kadushkin 42987446fb [common] changed function to check scaling value 2021-02-18 16:39:23 +03:00
Maxim Kadushkin c9d533a00e [common] correct condition to apply 150% scaling styles 2021-02-18 11:12:17 +03:00
Maxim Kadushkin 1fed5dc207 [dark theme] correct some components 2021-02-18 00:27:58 +03:00
Maxim Kadushkin 86a441c3a3 [multiscaling] locked 150% scaling for IE 2021-02-18 00:27:20 +03:00
Maxim Kadushkin d7e889332c [multiscaling] wrong scaling mark 2021-02-18 00:26:32 +03:00
Maxim Kadushkin 842609d80c [dark theme] stylesheets didn't apply on next app start 2021-02-18 00:25:27 +03:00
Julia Radzhabova 1dff1aaae3 Show tooltips with dark theme description 2021-02-17 21:11:04 +03:00
Julia Radzhabova 17a1ec78e4 Change synchronize tip component: add new placements 2021-02-17 20:25:30 +03:00
Maxim Kadushkin 7b7d037176 [dark theme] fixed themes switching 2021-02-17 18:58:24 +03:00
Maxim Kadushkin f34cb00e98 [dark theme] hide theme's option for IE 2021-02-16 15:08:39 +03:00
Maxim Kadushkin fcdb2ee898 [dark theme] fix common styles for IE 2021-02-16 10:21:22 +03:00
Maxim Kadushkin 6c5710506b [common] fixed condition for pixel ratio 2021-02-16 10:16:46 +03:00
Maxim Kadushkin db3a344760 [all] added "dark theme" item in button "Options" 2021-02-14 00:43:51 +03:00
Julia Radzhabova f3bf733cf6
Merge pull request #707 from ONLYOFFICE/feature/new-chart-types
Feature/new chart types
2021-02-13 12:55:59 +03:00
Maxim Kadushkin 3636bf78c4 [all] fix for device scaling checking 2021-02-12 12:08:33 +03:00
Julia Radzhabova 47f079dcb3 Merge branch 'develop' into feature/new-chart-types 2021-02-11 17:22:09 +03:00
Maxim Kadushkin 839d9e67e3 [common] check pixel ratio via common function 2021-02-10 23:43:49 +03:00
Maxim Kadushkin 5330e3a3c8 [all] skeleton support for 150% 2021-02-10 23:42:55 +03:00
Julia Radzhabova cf38ed40fe Fix the problem with font combobox 2021-02-10 17:00:47 +03:00
Julia Radzhabova fe73a1a7fb [DE] Fix for track changes plugin 2021-02-10 16:40:31 +03:00
KirillovIlya 49b2c49a84 Fix the problem with font combobox 2021-02-10 16:06:02 +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
Julia Radzhabova 7e822933ca Hide track changes tip on timeout 2021-02-10 13:40:53 +03:00
Julia Radzhabova 4b232db539 [DE] Save track changes to file: set 4 variants of track changes mode 2021-02-10 13:09:21 +03:00
Julia Radzhabova 616f77d34d [DE] Change synchronize tip: show at the bottom of toolbar 2021-02-08 19:19:19 +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 f938e668ef [dark theme] added 'Themes' controller 2021-02-06 13:03:46 +03:00
Maxim Kadushkin c879fa6c80 [dark theme] changed storage key name 2021-02-06 12:55:47 +03:00
Maxim Kadushkin 5586caa7a8 [dark theme] changed Window component 2021-02-06 12:53:01 +03:00