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
|
3f228da263
|
[stylesheets] refactoring
|
2021-02-07 00:30:24 +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
|
acb17c9e08
|
[multiscaling] correct some elements
|
2021-01-31 22:35:09 +03:00 |
|
Julia Radzhabova
|
e83357f86a
|
[PE] Fix Bug 46920: add highlight button
|
2021-01-29 17:31:46 +03:00 |
|
Julia Radzhabova
|
b003a5c021
|
[PE] Bug 46920: Add change case button
|
2021-01-29 16:06:51 +03:00 |
|
Julia Radzhabova
|
b2dd7d02d6
|
Merge pull request #682 from ONLYOFFICE/release/v6.2.0
Release/v6.2.0
|
2021-01-28 12:07:00 +03:00 |
|
Maxim Kadushkin
|
8e81a7b0e1
|
[scaling] repaired some elements
|
2021-01-22 00:18:15 +03:00 |
|
Maxim Kadushkin
|
4412524e82
|
[multiscaling] repaired some components
|
2021-01-21 13:14:36 +03:00 |
|
Julia Radzhabova
|
791d86c1be
|
Update help
|
2021-01-20 20:42:21 +03:00 |
|
Julia Radzhabova
|
e8eba05a54
|
Merge branch 'release/v6.2.0' into develop
|
2021-01-19 18:05:55 +03:00 |
|
Maxim Kadushkin
|
d7a2a47979
|
[stylesheets] repaired components according to colors table
|
2021-01-18 23:27:47 +03:00 |
|
Maxim Kadushkin
|
29951e266e
|
[stylesheets] repired some components according to colors table
|
2021-01-18 12:19:38 +03:00 |
|
Maxim Kadushkin
|
ed7f30f957
|
[scaling] repaired style for some components
|
2021-01-15 18:58:54 +03:00 |
|
Julia Radzhabova
|
c9dc69901f
|
Update help
|
2021-01-14 14:37:06 +03:00 |
|
Maxim Kadushkin
|
5f6956ac0f
|
[stylesheets] repaired stylesheets
|
2021-01-04 00:58:06 +03:00 |
|
Maxim Kadushkin
|
c81778a5a6
|
[stylesheets] repaired some components
|
2020-12-26 17:44:36 +03:00 |
|
Julia Radzhabova
|
1474c14019
|
Change styles for toolbar
|
2020-12-22 14:45:08 +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 |
|
Julia Radzhabova
|
0cdea5cec9
|
[PE] Fix Bug 26518
|
2020-11-28 00:23:26 +03:00 |
|
Julia Radzhabova
|
b3119b7c18
|
Merge branch 'release/v6.1.0' into develop
|
2020-11-26 19:17:55 +03:00 |
|
Julia Radzhabova
|
73a832242d
|
Update help, Fix Bug 47620
|
2020-11-23 17:56:11 +03:00 |
|
Julia Radzhabova
|
b6f31fc7d1
|
[PE] Fix Bug 47621
|
2020-11-22 21:14:27 +03:00 |
|
Julia Radzhabova
|
8c24af4aa7
|
Fix Bug 47617: rename images
|
2020-11-22 21:00:44 +03:00 |
|
Maxim Kadushkin
|
89f733ae30
|
[all] unlocked adapt to 150% system scaling
|
2020-11-20 22:57:20 +03:00 |
|
Julia Radzhabova
|
e22690eb7e
|
Update help
|
2020-11-20 19:47:05 +03:00 |
|
Julia Radzhabova
|
d57f57692f
|
Merge branch 'release/v6.1.0' into develop
|
2020-11-19 23:36:48 +03:00 |
|
Maxim Kadushkin
|
25f56d381a
|
[dark theme] changed @primary and @primary-hover
|
2020-11-18 20:08:12 +03:00 |
|
Maxim Kadushkin
|
0b43033456
|
[dark theme] changed @secondary and @secondary-hover
|
2020-11-18 18:58:41 +03:00 |
|
Maxim Kadushkin
|
5e29e5e9d2
|
[dark theme] changed @gray-light and @gray-lighter
|
2020-11-17 18:54:43 +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
|
2366867ab2
|
[PE] Fix help
|
2020-11-16 16:07:30 +03:00 |
|
Julia Radzhabova
|
8d85d458e6
|
[PE] Fix help
|
2020-11-16 15:53:13 +03:00 |
|
Julia Radzhabova
|
1ade42b8fe
|
Help: add files
|
2020-11-16 14:06:42 +03:00 |
|
Julia Radzhabova
|
0192613da9
|
Help: remove unused files
|
2020-11-16 12:28:08 +03:00 |
|
Julia Radzhabova
|
38a288309e
|
Update help
|
2020-11-13 16:35:26 +03:00 |
|
Julia Radzhabova
|
27c9bf1413
|
Add limited license
|
2020-11-09 14:52:21 +03:00 |
|
Julia Radzhabova
|
58fd71e163
|
Change label for trial/developer mode
|
2020-11-03 13:41:26 +03:00 |
|
Julia Radzhabova
|
92d4fec022
|
Show beta version label
|
2020-11-02 23:26:17 +03:00 |
|
papacarlo
|
14cc5e0eb4
|
Merge branch hotfix/v6.0.1 into release/v6.1.0
|
2020-10-28 14:30:23 +00:00 |
|
papacarlo
|
adb4eb8eda
|
Merge branch hotfix/v6.0.1 into develop
|
2020-10-28 14:30:06 +00:00 |
|
Julia Radzhabova
|
cb584be006
|
Update help
|
2020-10-01 15:19:50 +03:00 |
|
Julia Radzhabova
|
09eba3c88b
|
Merge branch 'release/v6.0.0' into develop
|
2020-09-17 18:26:57 +03:00 |
|
Julia Radzhabova
|
bd3c2650de
|
Update help
|
2020-09-14 15:21:50 +03:00 |
|
Julia Radzhabova
|
8233cc2388
|
Merge branch 'release/v6.0.0' into develop
|
2020-09-09 13:55:55 +03:00 |
|
Julia Radzhabova
|
2718a692c0
|
Add translation
|
2020-08-12 14:25:32 +03:00 |
|
Julia Radzhabova
|
1b5abe0aa9
|
[DE][PE] File menu refactoring
|
2020-08-07 13:51:26 +03:00 |
|