Commit Graph

160 Commits

Author SHA1 Message Date
25735a04d8 Merge pull request #2294 from ONLYOFFICE/feature/scaling-250
Feature/scaling 250
2023-03-25 00:15:20 +03:00
6584d95749 Merge branch 'develop' into feature/scaling-250 2023-01-28 01:10:19 +03:00
13c5b69997 Merge branch 'develop' into fix/Bug-51943 2023-01-11 15:44:11 +03:00
0c2e5806a2 bug 51943 2023-01-09 16:41:50 +03:00
744526841a Merge branch 'release/v7.3.0' into develop 2022-12-27 21:52:16 +03:00
0575fca939 bug-58294 2022-12-05 10:54:52 +03:00
5251f9f5e3 [DE] Update icons for roles windows 2022-11-25 13:02:20 +03:00
545e585ccc [DE] load icon's svg dynamically 2022-10-15 11:05:07 +03:00
57b9ec255a Merge branch 'develop' into feature/equation-toolbar 2022-07-28 14:41:22 +03:00
0926c905fe [DE] Add icons for equation toolbar 2022-07-21 00:29:28 +03:00
631460edf5 [all] correct external logo color theme dependency 2022-07-14 11:19:36 +03:00
024adfe49c [all] fix support for new theme in editors 2022-07-13 13:02:39 +03:00
793f350a07 [DE] Add cut and select all buttons to the toolbar 2022-06-29 12:37:51 +03:00
40061edafa Merge branch 'release/v7.1.0' into develop 2022-05-15 11:25:31 +03:00
648f0bdec7 Fix for IE11 2022-05-06 11:52:33 +03:00
51dd5071a1 [all] refactoring header's icons 2022-04-21 19:36:42 +03:00
f85c11b4aa [all] skip inlined svg 2022-03-31 23:54:28 +03:00
b1a58e9f61 Merge branch 'release/v7.1.0' into develop 2022-03-05 13:05:49 +03:00
c33d67f792 [DE] Fix downloading pdf/xps/oxps/djvu files 2022-02-11 17:54:01 +03:00
39ecf9170b [DE] Fix header in loader 2022-02-04 23:47:04 +03:00
a696863e34 Fix Bug 54457 2021-12-09 13:54:03 +03:00
308ec711c8 Merge branch 'release/v7.0.0' into develop 2021-11-19 15:34:25 +03:00
b757e3cbc4 Merge branch 'feature/config-customization' into develop 2021-11-10 19:13:28 +03:00
7b275174bb [DE] changed skeleton stylesheet in deploy 2021-11-04 23:02:35 +03:00
937501deea [DE] fix skeleton dark theme 2021-11-04 22:44:24 +03:00
c3c2519bee [DE] Download as oform and docxf 2021-10-08 19:54:58 +03:00
b738928629 Fix loader z-index 2021-10-08 10:51:28 +03:00
87a608d0af Use dark logo on loader 2021-10-04 23:58:27 +03:00
d767fa5399 Merge branch 'release/v6.4.0' into develop 2021-07-28 00:03:49 +03:00
c8e30ead12 Fix Bug 51343 2021-07-27 18:20:52 +03:00
148bc3e179 Add download as docm/pptm/xlsm 2021-07-20 21:30:09 +03:00
656715a52b Merge branch 'release/v6.4.0' into develop 2021-07-19 14:37:16 +03:00
f63dab0827 [DE] fix skeleton theme colors 2021-06-28 17:26:13 +03:00
d484103500 [themes] load external themes 2021-06-25 11:55:33 +03:00
06b42d4d6d [SSE DE] changed skeleton's stylesheet 2021-05-09 00:39:17 +03:00
c4b69233e5 [all] fix bug 49886 2021-04-24 21:23:24 +03:00
dba13ffbdf [all] fixed logo on bundled app version 2021-03-31 19:52:05 +03:00
753a74a055 [all] fix bug 49214 2021-03-29 23:58:53 +03:00
b4814420f7 [all] fix skeleton stylesheets for IE 2021-02-22 17:23:58 +03:00
78f9fa7637 [dark theme] support themes in loader 2021-02-22 16:58:25 +03:00
348a771171 Refactoring editors loading 2021-02-11 15:52:38 +03:00
5330e3a3c8 [all] skeleton support for 150% 2021-02-10 23:42:55 +03:00
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
2cccba627f [DE] Add new formats for downloading: fb2, html, epub 2021-02-08 21:22:14 +03:00
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
c879fa6c80 [dark theme] changed storage key name 2021-02-06 12:55:47 +03:00
40a7e66834 [dark theme] keep theme name for next session 2021-02-02 15:37:00 +03:00
edca282ea7 [scaling] skip to apply initial zoom 2021-01-21 00:05:31 +03:00
cd710c97e9 Fix loader layout 2020-12-23 20:22:31 +03:00
76af81e1b4 Fix skeleton scale: don't add zoom for mobile devices
fix rev. 11749376c4, f052e70417
2020-08-26 17:24:52 +03:00