Commit graph

426 commits

Author SHA1 Message Date
Maxim Kadushkin c93bfb68cb Merge branch 'hotfix/v6.3.1' into develop 2021-07-04 23:39:04 +03:00
maxkadushkin 15df027586
[SSE] lock 'protect' buttons while cell editing (#921) 2021-06-10 18:43:36 +03:00
Julia Radzhabova 45d7980212 Merge branch 'release/v6.3.0' into develop 2021-05-21 12:28:54 +03:00
Julia Radzhabova be4a444adb Fix Bug 50298 2021-05-11 15:24:53 +03:00
Julia Radzhabova acc4cca3a0 [SSE] Fix changing char type 2021-05-06 16:43:46 +03:00
Julia Radzhabova c8e5f8e086 [SSE] Fix changing chart type 2021-05-04 12:24:14 +03:00
Julia Radzhabova 1e632df252
Merge pull request #776 from ONLYOFFICE/feature/sse-sparkline
Feature/sse sparkline
2021-04-01 13:45:46 +03:00
Julia Radzhabova b1d3ba3fc0 Merge branch 'release/v6.3.0' into develop 2021-03-29 16:33:45 +03:00
Julia Radzhabova 35237831f5 [SSE] Fix ranges for sparklines 2021-03-24 18:39:00 +03:00
Julia Radzhabova 9b56b8b253 [SSE] Fix Bug 49232 2021-03-23 18:16:31 +03:00
Julia Radzhabova 8489136021 [SSE] Add sparkline 2021-03-23 17:51:50 +03:00
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 1b6dadb801 [SSE] Add rules from toolbar 2021-03-10 12:14:44 +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 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
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
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 ff43f0dc71 [SSE] Bug 48248: Add auto color for cell borders 2021-01-20 18:38:07 +03:00
Maxim Kadushkin 29951e266e [stylesheets] repired some components according to colors table 2021-01-18 12:19:38 +03:00
Julia Radzhabova b06f78acc0 Fix show collaboration tab 2020-12-22 15:37: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 351286c8d1 [SSE] Show data validation settings 2020-11-11 23:55:11 +03:00
Julia Radzhabova 278e09a741 [SSE] Fix Bug 45923 2020-11-02 13:12:42 +03:00
Julia Radzhabova 222113d277 Merge branch 'release/v6.1.0' into develop 2020-10-27 21:55:00 +03:00
Julia Radzhabova e83008ee6e Add dialog with radiobox options 2020-10-15 14:09:23 +03:00
Julia Radzhabova 47621b7ce1 Fix Bug 46841 2020-10-09 14:20:31 +03:00
Julia Radzhabova c769995941 Fix opening symbol dialog: select first symbol from the selected text or recent symbol 2020-10-05 17:32:18 +03:00
Julia Radzhabova 4c10324957 [SSE] Select chart data in diagramm mode 2020-10-02 18:33:07 +03:00
Julia Radzhabova bc908cc7bf Merge branch 'feature/sse-views' into develop 2020-09-28 19:18:37 +03:00
Julia Radzhabova 2493571d17 [SSE] Add pivot table button to the Insert tab. 2020-09-23 21:15:45 +03:00
Julia Radzhabova 09eba3c88b Merge branch 'release/v6.0.0' into develop 2020-09-17 18:26:57 +03:00
Julia Radzhabova edfcd54b95 [SSE] Refactoring 2020-09-17 17:00:17 +03:00
Julia Radzhabova a4965064eb [SSE] Fix styles updating 2020-09-17 16:29:48 +03:00