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
|
f938e668ef
|
[dark theme] added 'Themes' controller
|
2021-02-06 13:03:46 +03:00 |
|
Julia Radzhabova
|
f17b8d1c76
|
Change review permissions: deprecate customization.reviewPermissions parameter. Use permissions.reviewGroup instead: list of groups, that current user can accept/reject.
|
2021-02-05 13:51:37 +03:00 |
|
|
Julia Radzhabova
|
60cbd47725
|
Add new parameters to "permissions" section of config: editCommentAuthorOnly (can edit your own comments only if true), deleteCommentAuthorOnly (can delete your own comments only if true).
Deprecate customization.commentAuthorOnly parameter.
|
2021-02-04 12:39:56 +03:00 |
|
|
Maxim Kadushkin
|
40a7e66834
|
[dark theme] keep theme name for next session
|
2021-02-02 15:37:00 +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 |
|
|
Julia Radzhabova
|
6014823eb3
|
[SSE] Fix font name.
Fix for rev. ab48174165 [ab48174]
11 ноября 2020 г. 15:32:19
Improve performance
|
2021-01-23 16:40:40 +03:00 |
|
|
Julia Radzhabova
|
c240e0e89e
|
[SSE] Fix Bug 48247
|
2021-01-22 00:45:44 +03:00 |
|
|
Julia Radzhabova
|
c295698704
|
Refactoring color buttons
|
2021-01-21 22:48:27 +03:00 |
|
|
Julia Radzhabova
|
25fb714042
|
Merge pull request #666 from ONLYOFFICE/feature/bug-48248
Feature/bug 48248
|
2021-01-21 16:00:35 +03:00 |
|
|
Maxim Kadushkin
|
4412524e82
|
[multiscaling] repaired some components
|
2021-01-21 13:14:36 +03:00 |
|
|
Julia Radzhabova
|
76e21de5c4
|
[SSE] For Bug 47374
|
2021-01-21 12:39:17 +03:00 |
|
|
Julia Radzhabova
|
e6a7ab5dfb
|
Fix updating guest user name
|
2021-01-20 23:49:01 +03:00 |
|
|
Julia Radzhabova
|
3e6090ca71
|
Remove warning when open protected files (saving files with password implemented for online files)
|
2021-01-20 19:32:42 +03:00 |
|
|
Julia Radzhabova
|
ff43f0dc71
|
[SSE] Bug 48248: Add auto color for cell borders
|
2021-01-20 18:38:07 +03:00 |
|
|
Julia Radzhabova
|
e8eba05a54
|
Merge branch 'release/v6.2.0' into develop
|
2021-01-19 18:05:55 +03:00 |
|
|
Julia Radzhabova
|
0dd5a8a5de
|
Merge branch 'hotfix/v6.1.1' into release/v6.2.0
|
2021-01-19 11:26:24 +03:00 |
|
|
Maxim Kadushkin
|
29951e266e
|
[stylesheets] repired some components according to colors table
|
2021-01-18 12:19:38 +03:00 |
|
|
Julia Radzhabova
|
28fb3ff98d
|
[SSE] Fix diagram mode
|
2021-01-13 12:32:38 +03:00 |
|
|
Julia Radzhabova
|
64f81a2984
|
Merge branch 'feature/guest-name' into develop
|
2020-12-30 11:24:02 +03:00 |
|
|
Julia Radzhabova
|
fc9530d919
|
Add customization parameter for setting anonymous name.
|
2020-12-29 23:48:47 +03:00 |
|
|
Julia Radzhabova
|
35b7ff277f
|
[SSE] Fix Bug 48044
|
2020-12-23 16:47:13 +03:00 |
|
|
Julia Radzhabova
|
b06f78acc0
|
Fix show collaboration tab
|
2020-12-22 15:37:05 +03:00 |
|
|
Julia Radzhabova
|
2784812084
|
Refactoring
|
2020-12-21 17:38:32 +03:00 |
|
|
Julia Radzhabova
|
dbfcca5652
|
Disable favorite button for offline files
|
2020-12-21 14:07:00 +03:00 |
|
|
Julia Radzhabova
|
88eb04e0d3
|
Fix changing guest name
|
2020-12-20 12:22:46 +03:00 |
|
|
Maxim Kadushkin
|
a60b6e4934
|
[SSE] repaired stylesheets
|
2020-12-19 22:45:36 +03:00 |
|
|
Julia Radzhabova
|
e7877564d6
|
Fix set name for ie11
|
2020-12-18 19:20:31 +03:00 |
|
|
Julia Radzhabova
|
e8dcb54c78
|
Fix changing user name
|
2020-12-18 13:23:14 +03:00 |
|
|
Julia Radzhabova
|
2c5e7f8d00
|
Fix favorites
|
2020-12-15 17:28:12 +03:00 |
|
|
Julia Radzhabova
|
a30176fae1
|
Add/remove file to favorites
|
2020-12-14 22:45:30 +03:00 |
|
|
Julia Radzhabova
|
d067d3572c
|
Show custom message for protected files
|
2020-12-14 14:47:48 +03:00 |
|
|
Julia Radzhabova
|
d190e67c41
|
Fix error
|
2020-12-11 15:26:52 +03:00 |
|
|
Julia Radzhabova
|
c6b6a7a0d0
|
Allow password for web apps
|
2020-12-10 17:25:39 +03:00 |
|
|
Julia Radzhabova
|
f9fb61d2f0
|
Merge pull request #619 from ONLYOFFICE/feature/sse-multichart
Feature/sse multichart
|
2020-12-10 14:53:11 +03:00 |
|
|
Julia Radzhabova
|
3adb8f9629
|
[SSE] Bug 47433
|
2020-12-09 14:45:05 +03:00 |
|
|
Julia Radzhabova
|
52742b6d54
|
[SSE] Change chart type in diagram mode
|
2020-12-08 12:48:23 +03:00 |
|
|
Julia Radzhabova
|
ca01b519f9
|
[SSE] Show errors when set combo chart type
|
2020-12-08 11:48:28 +03:00 |
|
|
Julia Radzhabova
|
5794800988
|
[SSE] Change axis label format
|
2020-12-07 22:20:22 +03:00 |
|
|
Julia Radzhabova
|
48b0079c61
|
[SSE] Fix data validation
|
2020-12-04 12:34:27 +03:00 |
|
|
Julia Radzhabova
|
8ae33e0789
|
Merge pull request #598 from ONLYOFFICE/feature/data-validation
Feature/data validation
|
2020-11-30 16:13:20 +03:00 |
|
|
Julia Radzhabova
|
89c68bb64e
|
[SSE] Fix Bug 46974
|
2020-11-27 00:25:44 +03:00 |
|
|
Julia Radzhabova
|
b3119b7c18
|
Merge branch 'release/v6.1.0' into develop
|
2020-11-26 19:17:55 +03:00 |
|
|
Julia Radzhabova
|
3fdff95136
|
Fix license
|
2020-11-25 17:27:53 +03:00 |
|
|
Julia Radzhabova
|
2d250c6802
|
Fix Bug 47094
|
2020-11-24 15:31:51 +03:00 |
|
|
Julia Radzhabova
|
67745e22b1
|
Fix Bug 47637
|
2020-11-24 14:54:41 +03:00 |
|
|
Julia Radzhabova
|
d57f57692f
|
Merge branch 'release/v6.1.0' into develop
|
2020-11-19 23:36:48 +03:00 |
|
|
Julia Radzhabova
|
9125d3de78
|
[SSE] Fix Bug 47544
|
2020-11-18 17:30:43 +03:00 |
|
|
Julia Radzhabova
|
df3825ec80
|
[SSE] Refactoring data validation
|
2020-11-12 11:30:05 +03:00 |
|