Commit graph

43 commits

Author SHA1 Message Date
OVSharova 6c719bcf17 New variant 2021-10-29 04:15:38 +03:00
Julia Radzhabova 5a3eaa2700 Merge branch 'feature/transitions' into develop 2021-08-11 16:55:22 +03:00
OVSharova 6fcf934299 edit style 2021-07-29 02:50:34 +03:00
OVSharova 66b308e733 Add less 2021-07-26 04:20:39 +03:00
JuliaSvinareva c4e3899ebd
Merge branch 'develop' into feature/alt-keys 2021-07-16 17:45:18 +03:00
Maxim Kadushkin c93bfb68cb Merge branch 'hotfix/v6.3.1' into develop 2021-07-04 23:39:04 +03:00
JuliaSvinareva a443fcfd2a Merge branch 'develop' into feature/alt-keys 2021-07-01 16:47:01 +03:00
JuliaSvinareva eca0abff3b [PE] Hint Manager: add hints in toolbar, right menu 2021-06-16 16:43:51 +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
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 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 2c0c3285b3 [PE] Fix slide num style 2021-04-09 14:53:12 +03:00
Julia Radzhabova 36e6394f2b [PE] Show version history 2021-03-24 10:39: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 a1d23fdda3 [PE] support of dark theme 2020-12-21 13:32:36 +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 89f733ae30 [all] unlocked adapt to 150% system scaling 2020-11-20 22:57:20 +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 8ea4360f6e [SSE, PE] changed @gray-dark to @border-toolbar 2020-11-17 15:04:42 +03:00
Julia Radzhabova d76fc24f4b
Merge pull request #364 from ONLYOFFICE/feature/internal-link
Feature/internal link
2020-03-12 14:10:33 +03:00
Julia Radzhabova 77ab8c41bc [PE] Fix applying hyperlink settings 2020-03-06 16:14:08 +03:00
Julia Radzhabova 83bc8ae4b2 Don't use 1.5x icons: fix rev. 0125ad24f3 2020-01-30 16:30:50 +03:00
Maxim Kadushkin 670b6cf2c6 merge with develop 2019-11-28 17:11:18 +03:00
Maxim Kadushkin 280c9bdd13 [all] added 2x and 1.5x sprites 2019-11-27 20:17:07 +03:00
Maxim Kadushkin 1926f2fee9 [PE] build icons sprite from source images 2019-11-21 19:10:02 +03:00
Julia Radzhabova bdbde4cde6 [PE][SSE] Add symbol from symbol table 2019-11-14 11:48:58 +03:00
Alexander Yuzhin 05a1a6d9ef [PE] Fixed display dummy document on loading 2019-10-31 17:27:53 +03:00
Alexander Yuzhin 302199918d [PE] Fixed display dummy document on loading 2019-10-30 13:54:08 +03:00
Maxim Kadushkin dbf16e5733 [all] refactoring 2019-10-21 16:42:12 +03:00
Alexander Yuzhin 7ee0cc863e [pe] Fixed skeleton layout 2019-10-17 10:46:35 +03:00
Julia Radzhabova 1c83e503a9 Fix skeleton loader (logo icon, presentation loader). Fix embedded mode on IE11. 2019-09-27 18:43:55 +03:00
Julia Radzhabova 1c02ce3219 [PE] Fix skeleton loading 2019-09-02 11:37:37 +03:00
Alexander Yuzhin bdc69aec84 PE skeleton loader 2019-07-22 11:17:53 +03:00
Maxim Kadushkin 104b80338c [all] fix for win xp support 2019-04-29 18:44:16 +03:00
Julia Radzhabova b1ba645bf6 [PE] Added spell check + changing document language. Moved LanguageDialog to Common. 2017-04-26 11:34:55 +03:00
Maxim Kadushkin a578e3c31e [PE] toolbar's new view 2017-04-20 16:34:39 +03:00
Maxim Kadushkin c618f0978f [PE] refactoring 2017-04-20 15:18:22 +03:00
Julia Radzhabova a398c46d8d [PE] Open encrypted pptx. 2016-09-29 16:06:22 +03:00
Julia Radzhabova 7cb5aa9075 [PE] Add plugins. 2016-07-26 14:45:41 +03:00
Maxim Kadushkin 741b10515d webapps added 2016-03-10 21:48:53 -03:00