Commit graph

253 commits

Author SHA1 Message Date
Julia Radzhabova b5438c6648 [SSE] Import data from text/csv file 2021-03-19 17:00:05 +03:00
Julia Radzhabova 5609945406 [SSE] Add conditional formatting from right panel 2021-03-15 23:10:47 +03:00
Julia Radzhabova b5433c25db Merge branch 'develop' into feature/sse-conditional-formatting 2021-03-12 11:35:19 +03:00
Julia Radzhabova 58c2a2ff7b [SSE] Refactoring 2021-03-11 20:52:32 +03:00
Julia Radzhabova 1bef03a545 [SSE] Lock/unlock rules 2021-03-11 14:54:37 +03:00
Julia Radzhabova b0fedaa13f Merge branch 'master' into release/v6.3.0 2021-03-04 13:51:02 +03:00
Julia Radzhabova 0075983c9f Merge branch 'develop' into feature/sse-conditional-formatting 2021-02-20 19:15:44 +03:00
Julia Radzhabova 756d638043 Fix layout for IE 2021-02-16 17:53:01 +03:00
Julia Radzhabova 60ca0ddafe [SSE] Add cell indent 2021-02-15 11:35:48 +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 acb17c9e08 [multiscaling] correct some elements 2021-01-31 22:35:09 +03:00
Maxim Kadushkin d7a2a47979 [stylesheets] repaired components according to colors table 2021-01-18 23:27:47 +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 07a44d4ebb [SSE] Change buttons in the diagram mode 2020-12-10 16:49:57 +03:00
Julia Radzhabova e84335b357 Add translation 2020-12-08 23:10:38 +03:00
Julia Radzhabova 42a14bf6d0 Refactoring 2020-12-08 15:29:05 +03:00
Julia Radzhabova 52742b6d54 [SSE] Change chart type in diagram mode 2020-12-08 12:48:23 +03:00
Julia Radzhabova 9f3b5efc9c [SSE] Add format for axis label 2020-12-07 16:22:18 +03:00
Julia Radzhabova 96881ba763 [SSE] Change axis settings for multicharts 2020-12-05 23:42:28 +03:00
Julia Radzhabova 251dea4412 [SSE] Add settings for chart type 2020-12-04 11:27:27 +03:00
Julia Radzhabova 1d632aa2ad [SSE] Refactoring data validation dialog 2020-11-13 22:55:21 +03:00
Julia Radzhabova 0369ff1604 [SSE] Add dialog for data validation 2020-11-13 15:06:45 +03:00
Julia Radzhabova 351286c8d1 [SSE] Show data validation settings 2020-11-11 23:55:11 +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 b9ce71728c Merge branch 'develop' into feature/sse-views 2020-09-14 14:06:03 +03:00
Julia Radzhabova 2e638816d9 [SSE] Shape, TextArt settings: add gradient angle 2020-09-10 21:40:54 +03:00
Julia Radzhabova 8233cc2388 Merge branch 'release/v6.0.0' into develop 2020-09-09 13:55:55 +03:00
Julia Radzhabova 2876a19bd3 Fix Bug 33599: fix layout for paragraph settings 2020-08-25 18:46:54 +03:00
Julia Radzhabova accbea96e5 Merge branch 'release/v6.0.0' into develop 2020-07-29 11:09:38 +03:00
JuliaSvinareva b89a1c784c Merge branch 'develop' into feature/gradient-fill 2020-07-22 13:02:09 +03:00
Julia Radzhabova fe44adc9a0 [SSE] Hide option for slicer from pivot table 2020-07-20 14:30:14 +03:00
Julia Radzhabova a5f0371a9e
Merge pull request #423 from ONLYOFFICE/feature/sse-chart-data
Feature/sse chart data
2020-07-20 11:30:04 +03:00
Julia Radzhabova c35e34e1f6 Merge branch 'develop' into feature/sse-views 2020-07-17 11:35:16 +03:00
Julia Radzhabova a964fb89df [SSE] Change icons for pivot table 2020-07-14 16:23:55 +03:00
Julia Radzhabova a91e1801ee [SSE] Table settings: change action buttons 2020-07-14 14:27:45 +03:00
Julia Radzhabova ce19f6f1fc [SSE] Move views to paid features 2020-07-10 15:42:39 +03:00
JuliaSvinareva 457aff48ac Merge branch 'develop' into feature/gradient-fill 2020-07-09 15:53:07 +03:00
JuliaSvinareva cefc64988b [SSE] Bug 43708 (Text art settings: add buttons (position, add thumb, remove thumb), change gradient slider style) 2020-07-09 15:43:30 +03:00
Julia Radzhabova 0acbad6fa0 [SSE] Add View tab 2020-07-09 14:53:22 +03:00
Julia Radzhabova 96704a1f1f [SSE] Remove data settings from chart settings dialog (use chart data dialog instead) 2020-07-08 16:07:57 +03:00
JuliaSvinareva e8234bc9e4 [SSE] Bug 43708 (Shape settings: add gradient buttons (position, add thumb, remove thumb)) 2020-07-06 20:20:22 +03:00
Julia Radzhabova 9f51fc7761 Revert rev. fb683cb086 [fb683cb]
[SSE]  Change chart settings: for Bug 43763
2020-07-06 20:01:11 +03:00
JuliaSvinareva 0b9ff0405d [SSE] Bug 43708 (Cell settings: add buttons (position, add thumb, remove thumb), change gradient slider style) 2020-07-03 15:42:26 +03:00
Julia Radzhabova fb683cb086 [SSE] Change chart settings: for Bug 43763 2020-06-30 17:35:10 +03:00
Julia Radzhabova e536772dcb [SSE] Add pivot table from the right panel 2020-06-22 16:01:05 +03:00