Commit graph

89 commits

Author SHA1 Message Date
Maxim Kadushkin 51dd5071a1 [all] refactoring header's icons 2022-04-21 19:36:42 +03:00
Maxim Kadushkin f85c11b4aa [all] skip inlined svg 2022-03-31 23:54:28 +03:00
Julia Radzhabova a8a11d20db [SSE] Change buttons in the header 2022-02-06 14:50:17 +03:00
Julia Radzhabova 89a66ab06a Merge branch 'release/v7.0.0' into develop 2021-12-24 17:32:14 +03:00
Maxim Kadushkin 140364aeab [desktop] for bug 54434 2021-12-14 17:06:36 +03:00
Julia Radzhabova a696863e34 Fix Bug 54457 2021-12-09 13:54:03 +03:00
Julia Radzhabova afe26fc355 Fix merge 2021-12-07 23:45:12 +03:00
Maxim Kadushkin 4e69950665 [all] fix bug 54107 2021-12-07 20:56:14 +03:00
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 1e175f338a [all] fix bug 50414 2021-05-14 15:32:03 +03:00
Maxim Kadushkin f900a3480b [all] extend options on desktop app launch 2021-05-12 16:41:59 +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 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
Maxim Kadushkin c7e6a7a316 [all] fix compiled app launch 2021-02-13 13:05:16 +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 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 1cd0586ed6 [dark theme] changed script for deployment 2021-02-06 13:08:20 +03:00
papacarlo 3262edd742 Merge branch release/v6.1.0 into develop 2020-12-24 07:51:18 +00:00
Julia Radzhabova cd710c97e9 Fix loader layout 2020-12-23 20:22:31 +03:00
Maxim Kadushkin 23d1d5204e [all][xp] fix bug 47868 2020-12-07 13:22:38 +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
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 6573cc7a84 Merge branch 'hotfix/v5.5.1' into develop 2020-04-15 15:04:23 +03:00
Julia Radzhabova c13d0dc8e9 Check origin in messages 2020-03-19 17:38:09 +03:00
Maxim Kadushkin ebbbbdcb7f [all] hide logo on skeleton for desktop mode 2020-03-12 19:40:41 +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
Maxim Kadushkin e5a0e50eda Merge with develop 2019-12-04 15:26:53 +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