Commit graph

2087 commits

Author SHA1 Message Date
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 900a179f7e [dark theme] added ui themes switcher 2021-02-06 13:06:33 +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 310c00b245 Deprecate api parameters: document.info.author, document.info.created. Use document.info.owner and document.info.uploaded instead. 2021-02-04 16:05:49 +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
Julia Radzhabova 254a57b834 [SSE] Show warning before deleting named range 2021-02-02 21:22:02 +03:00
Julia Radzhabova 61e2292801 [SSE] Remove extra function 2021-02-02 18:56:25 +03:00
Maxim Kadushkin 40a7e66834 [dark theme] keep theme name for next session 2021-02-02 15:37:00 +03:00
Maxim Kadushkin acb17c9e08 [multiscaling] correct some elements 2021-01-31 22:35:09 +03:00
Julia Radzhabova c5a4982382 Hide styles for combined charts 2021-01-30 16:15:25 +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 d7a2a47979 [stylesheets] repaired components according to colors table 2021-01-18 23:27:47 +03:00
Julia Radzhabova cdffc1a6e3 Fix Bug 48258 2021-01-18 13:26:39 +03:00
Julia Radzhabova 06c8df4bc4 [SSE] Fix data validation 2021-01-18 12:25:31 +03:00
Maxim Kadushkin 29951e266e [stylesheets] repired some components according to colors table 2021-01-18 12:19:38 +03:00
Julia Radzhabova b51aec35cf Remove caption from chart type menu 2021-01-13 14:14:36 +03:00
Julia Radzhabova 28fb3ff98d [SSE] Fix diagram mode 2021-01-13 12:32:38 +03:00
Julia Radzhabova 30337a0a56 Fix changing units of measurement.
Fix form settings.
2021-01-11 18:06:12 +03:00
Maxim Kadushkin bd6c34b66d [stylesheets] repaired some components 2021-01-06 20:33:01 +03:00
Julia Radzhabova bcaaf5ea24 Fix translations 2020-12-30 13:59:12 +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 22b7c727c9
Merge pull request #643 from ONLYOFFICE/fix/bug-48118
Fix/bug 48118
2020-12-28 15:35:51 +03:00
Julia Radzhabova b8a6231026 [SSE] Fix warning for custom format 2020-12-28 15:14:50 +03:00
Julia Radzhabova 527125c0c8 [SSE] Fix Bug 48141 2020-12-26 11:56:01 +03:00
Julia Radzhabova 0d17921b4c [SSE] Fix Bug 48118 2020-12-25 14:50:01 +03:00
Julia Radzhabova f13c8ed33d [DE] Fix Bug 48107 2020-12-24 11:50:09 +03:00
Julia Radzhabova 35b7ff277f [SSE] Fix Bug 48044 2020-12-23 16:47:13 +03:00
Julia Radzhabova 84782593af [SSE] Fix data validation 2020-12-23 13:41:18 +03:00
Julia Radzhabova d94a8b6336 [SSE] Fix translation 2020-12-23 13:39:55 +03:00
Julia Radzhabova b06f78acc0 Fix show collaboration tab 2020-12-22 15:37:05 +03:00
Julia Radzhabova d31aaac45b Fix toolbar styles 2020-12-22 15:30:52 +03:00
Julia Radzhabova 96e720858f Change toolbar styles 2020-12-22 15:11:46 +03:00
Julia Radzhabova 1474c14019 Change styles for toolbar 2020-12-22 14:45:08 +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