Commit graph

1272 commits

Author SHA1 Message Date
Julia Radzhabova 5ab470ec5f [SSE] Add sparklines 2021-03-22 22:21:03 +03:00
Julia Radzhabova 5609945406 [SSE] Add conditional formatting from right panel 2021-03-15 23:10:47 +03:00
Julia Radzhabova 06291bb30d [SSE] Change rules in the toolbar 2021-03-15 18:31:39 +03:00
Julia Radzhabova 35cab5fe73 [SSE] Change rules in the toolbar 2021-03-15 17:44:09 +03:00
Julia Radzhabova afdb5b343f [SSE] Fix rules lock 2021-03-12 12:41:05 +03:00
Julia Radzhabova b5433c25db Merge branch 'develop' into feature/sse-conditional-formatting 2021-03-12 11:35:19 +03:00
Julia Radzhabova eecb45cb52 [SSE] Add conditional formatting from context menu 2021-03-11 23:11:07 +03:00
Julia Radzhabova 1b6dadb801 [SSE] Add rules from toolbar 2021-03-10 12:14:44 +03:00
Julia Radzhabova b0fedaa13f Merge branch 'master' into release/v6.3.0 2021-03-04 13:51:02 +03:00
Julia Radzhabova 0f1288e198 [SSE] Fix icons sets presets 2021-03-03 14:05:31 +03:00
Julia Radzhabova 84e7d66330 [SSE] Change applying conditional format presets 2021-03-03 00:30:04 +03:00
Julia Radzhabova 6c7ebc300a Update icons 2021-02-26 16:36:24 +03:00
Julia Radzhabova 8e282825f1 [SSE] Add icon sets presets 2021-02-25 23:15:05 +03:00
Julia Radzhabova f6e15bda2a [SSE] Add presets for conditional formatting 2021-02-25 18:45:24 +03:00
Julia Radzhabova 40a35856b5 [SSE] Fix rule settings 2021-02-24 18:49:05 +03:00
Julia Radzhabova bf7b439134 [SSE] For Bug 48857 2021-02-24 16:50:28 +03:00
Maxim Kadushkin b07a01bb0f [all] hide "Dark theme" option from "View settings" menu 2021-02-21 21:40:41 +03:00
Julia Radzhabova 0075983c9f Merge branch 'develop' into feature/sse-conditional-formatting 2021-02-20 19:15:44 +03:00
Julia Radzhabova b4e8567481 Charts refactoring 2021-02-20 16:54:09 +03:00
Julia Radzhabova edefa48180 For Bug 48811 2021-02-19 13:16:19 +03:00
Julia Radzhabova e543142c26 Fix scroll in combobox, listview. 2021-02-18 20:38:46 +03:00
Maxim Kadushkin f34cb00e98 [dark theme] hide theme's option for IE 2021-02-16 15:08:39 +03:00
Julia Radzhabova 2a0da2b625 [SSE] Bug 48708 2021-02-16 14:49:13 +03:00
Maxim Kadushkin 436e232b2e [all] refactoring 2021-02-14 00:44:12 +03:00
Maxim Kadushkin db3a344760 [all] added "dark theme" item in button "Options" 2021-02-14 00:43:51 +03:00
Maxim Kadushkin e641628a63 [all] refactoring 2021-02-12 12:08:53 +03:00
Julia Radzhabova 8dfd43ec0e Change api parameter reviewGroups 2021-02-11 19:26:06 +03:00
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 30ebb561e6 [SSE] Add/remove rules 2021-01-28 18:21:07 +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 e8359bea7a Refactoring 2021-01-26 19:41:51 +03:00
Julia Radzhabova 729b8a8b10 [SSE] Apply settings for conditional formatting 2021-01-26 11:38:05 +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