Commit graph

130 commits

Author SHA1 Message Date
Julia Radzhabova b757e3cbc4 Merge branch 'feature/config-customization' into develop 2021-11-10 19:13:28 +03:00
Julia Radzhabova b738928629 Fix loader z-index 2021-10-08 10:51:28 +03:00
Julia Radzhabova 87a608d0af Use dark logo on loader 2021-10-04 23:58:27 +03:00
Julia Radzhabova d767fa5399 Merge branch 'release/v6.4.0' into develop 2021-07-28 00:03:49 +03:00
Julia Radzhabova c8e30ead12 Fix Bug 51343 2021-07-27 18:20:52 +03:00
Julia Radzhabova 148bc3e179 Add download as docm/pptm/xlsm 2021-07-20 21:30:09 +03:00
Julia Radzhabova 45d7980212 Merge branch 'release/v6.3.0' into develop 2021-05-21 12:28:54 +03:00
Maxim Kadushkin 06b42d4d6d [SSE DE] changed skeleton's stylesheet 2021-05-09 00:39:17 +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 461106210f [themes] changed skeleton's color 2021-04-27 20:22:21 +03:00
Maxim Kadushkin c4b69233e5 [all] fix bug 49886 2021-04-24 21:23:24 +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 b5433c25db Merge branch 'develop' into feature/sse-conditional-formatting 2021-03-12 11:35:19 +03:00
Julia Radzhabova d5e54fc53d [SSE] Fix loader 2021-02-26 12:22:06 +03:00
Julia Radzhabova f6e15bda2a [SSE] Add presets for conditional formatting 2021-02-25 18:45:24 +03:00
Maxim Kadushkin b4814420f7 [all] fix skeleton stylesheets for IE 2021-02-22 17:23:58 +03:00
Maxim Kadushkin 78f9fa7637 [dark theme] support themes in loader 2021-02-22 16:58:25 +03:00
Maxim Kadushkin c8559792e1 [SSE] fixed launch for scaled DiagramEditor 2021-02-19 13:26:55 +03:00
Julia Radzhabova 348a771171 Refactoring editors loading 2021-02-11 15:52:38 +03:00
Maxim Kadushkin 5330e3a3c8 [all] skeleton support for 150% 2021-02-10 23:42:55 +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 c879fa6c80 [dark theme] changed storage key name 2021-02-06 12:55:47 +03:00
Maxim Kadushkin 40a7e66834 [dark theme] keep theme name for next session 2021-02-02 15:37:00 +03:00
Maxim Kadushkin edca282ea7 [scaling] skip to apply initial zoom 2021-01-21 00:05:31 +03:00
Julia Radzhabova cd710c97e9 Fix loader layout 2020-12-23 20:22:31 +03:00
Julia Radzhabova 76af81e1b4 Fix skeleton scale: don't add zoom for mobile devices
fix rev. 11749376c4, f052e70417
2020-08-26 17:24:52 +03:00
Maxim Kadushkin aab070446a [all] support IE for debug 2020-06-30 17:19:23 +03:00
Julia Radzhabova 1c80bea9fd Change new file panel 2020-06-18 14:43:26 +03:00
Julia Radzhabova 5303389420 Change recent files 2020-06-11 19:36:37 +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 c13d0dc8e9 Check origin in messages 2020-03-19 17:38:09 +03:00
Julia Radzhabova 6b58820098 Feature/bugfix (#300)
* [PE] Bug 42759

* Fux Bug 44131

* [SSE] Update skeleton
2020-01-15 16:12:53 +03:00
Alexander Yuzhin 40bea73251 Feature/sse-skeletone (#299)
* Fix Bug 43987

* [SSE] Update skeleton

Co-authored-by: Julia Radzhabova <Julia.Radzhabova@onlyoffice.com>
2020-01-15 12:52:59 +03:00
Julia Radzhabova a70eff9cb4 Load sdk scripts from sdkjs directory 2019-12-03 13:29:58 +03:00
Maxim Kadushkin 670b6cf2c6 merge with develop 2019-11-28 17:11:18 +03:00
Julia Radzhabova 9e246ec424 Fix loader for compact header mode 2019-11-25 14:23:27 +03:00
Julia Radzhabova e0aecd9704 Fix loader for view mode 2019-11-25 11:13:00 +03:00
Alexander Yuzhin 6b993485e2 [DE][SSE][PE] Skeleton improvement 2019-10-21 16:58:34 +03:00
Maxim Kadushkin 09a2df443f [3dparty] version of Less up to 3.10.3 2019-10-18 11:33:36 +03:00
Alexander Yuzhin 3161d96361 Allow a view mode for the skeletone view 2019-10-11 14:55:39 +03:00
Alexander Yuzhin a0216f0695 [SSE] Fixed loader 2019-10-09 15:49:23 +03:00
Julia Radzhabova a51d386f16 Fix header logo for 4K 2019-10-08 15:33:29 +03:00
Julia Radzhabova f588e9b67a [SSE] Internal mode 2019-10-08 15:12:15 +03:00
Alexander Yuzhin 334539e870 [SSE] Internal mode 2019-10-08 14:06:58 +03:00
Alexander Yuzhin 11749376c4 Bugfix toolbar skeleton scale 2019-10-04 16:12:23 +03:00
Alexander Yuzhin 7152a85f87 [SSE] Append toolbar skeleton 2019-10-04 11:01:51 +03:00