Commit graph

337 commits

Author SHA1 Message Date
JuliaSvinareva b9b94a6453
Merge branch 'develop' into feature/Bug_20632 2021-08-18 19:46:55 +03:00
JuliaSvinareva 286876fe3d [SSE] Change statusbar, set compact by default, add status block in compact statusbar, add opportunity to hide this block by context menu 2021-08-10 18:34:00 +03:00
Julia Radzhabova 8cbdfcedfb Merge branch 'develop' into feature/sse-protection 2021-08-05 13:49:29 +03:00
OVSharova c1af534783 First change 2021-07-29 04:25:33 +03:00
JuliaSvinareva 3f0cc17039 [SSE] Made changing of status items in statusbar 2021-07-28 19:49:34 +03:00
Julia Radzhabova f947224a95 Merge branch 'feature/sse-version-history' into develop 2021-07-27 21:20:33 +03:00
JuliaSvinareva eda6510de0 [SSE] Add methods and styles to change compact mode of statusbar 2021-07-26 16:57:01 +03:00
JuliaSvinareva f217483d9d [SSE] Add second line in statusbar, add hide statusbar button in options 2021-07-20 12:30:09 +03:00
Julia Radzhabova 656715a52b Merge branch 'release/v6.4.0' into develop 2021-07-19 14:37:16 +03:00
Julia Radzhabova ef6b13059b [SSE] Refactoring 2021-07-13 22:30:34 +03:00
Julia Radzhabova ad2926db43 [SSE] Add "no icon" to format rule. Fix Bug 51270 2021-07-13 22:08:32 +03:00
Julia Radzhabova c20d006606 [SSE] Fix Bug 51240 2021-07-12 18:20:49 +03:00
JuliaSvinareva 147bffff21 Fix hint manager 2021-07-02 14:58:27 +03:00
JuliaSvinareva a443fcfd2a Merge branch 'develop' into feature/alt-keys 2021-07-01 16:47:01 +03:00
JuliaSvinareva dc5268069e [SSE] Bug 46767 (fix locked, fix close after click on item) 2021-06-30 15:36:53 +03:00
Julia Radzhabova 3f429b0bc8 [SSE] Add version history 2021-06-28 20:18:53 +03:00
JuliaSvinareva f28422fb9c [SSE] Bug 46767 (add icon) 2021-06-28 13:06:49 +03:00
JuliaSvinareva 7719d51d28 [SSE] Fix bug 46767 2021-06-26 16:16:33 +03:00
JuliaSvinareva db54743eca Hint Manager: add direction exceptions for filter buttons, add ability to add specific hints to buttons 2021-06-23 18:41:38 +03:00
Julia Radzhabova 2e6bff5c0e [SSE] Show protected ranges 2021-06-23 00:46:43 +03:00
JuliaSvinareva 529d6c2ad0 [SSE] Hint manager: add hints into right menu and file menu 2021-06-10 23:05:49 +03:00
JuliaSvinareva 9ec0a305b3 [SSE] Hint Manager: add hints into toolbar and right menu 2021-06-08 17:26:10 +03:00
JuliaSvinareva f120ccf6be [SSE] Hint Manager: add hints into toolbar 2021-06-07 21:00:13 +03:00
Julia Radzhabova f1f613451c [SSE] Add show zero option 2021-05-21 18:01:49 +03:00
Maxim Kadushkin 97474af94d Merge branch 'release/v6.3.0' into develop
# Conflicts:
#	apps/common/main/lib/controller/Plugins.js
#	apps/common/main/lib/view/Header.js
#	apps/documenteditor/main/app/controller/Main.js
#	apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js
#	apps/documenteditor/main/app/view/Toolbar.js
#	apps/documenteditor/main/locale/sl.json
#	apps/presentationeditor/main/app/view/ParagraphSettingsAdvanced.js
#	apps/presentationeditor/main/locale/ja.json
#	apps/spreadsheeteditor/main/app/controller/Main.js
#	apps/spreadsheeteditor/main/app/template/Toolbar.template
#	apps/spreadsheeteditor/main/app/view/ParagraphSettingsAdvanced.js
2021-04-29 23:31:07 +03:00
Julia Radzhabova fc66f37f43 Change groups paddings 2021-04-27 21:21:11 +03:00
Julia Radzhabova da687f3e78 [SSE] Fix up/down buttons 2021-04-15 16:32:09 +03:00
Julia Radzhabova d0a4de80ec Fix up/down buttons 2021-04-15 02:03:33 +03:00
Julia Radzhabova ff39f7d581 [SSE] Add focus for checkbox 2021-04-14 01:12:59 +03:00
Julia Radzhabova 77cd81322c Merge branch 'feature/sse-from-text' into develop 2021-04-05 11:34:54 +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
Maxim Kadushkin a2c14d92e5 [all] fix bug 49251 2021-03-28 01:23:14 +03:00
Julia Radzhabova 5ab470ec5f [SSE] Add sparklines 2021-03-22 22:21:03 +03:00
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
Julia Radzhabova 4a246ef70f Merge branch 'develop' into feature/sse-conditional-formatting 2020-06-16 16:09:39 +03:00
JuliaSvinareva acfa15889a Merge branch 'develop' into feature/update-jquery-3.5 2020-06-05 16:28:37 +03:00
JuliaSvinareva af9eb000d9 [All] Update jquery (fix bugs) 2020-06-05 16:10:48 +03:00
Julia Radzhabova 4f8a48e635 [SSE] Add slicer from the right panel 2020-06-05 13:42:20 +03:00
Julia Radzhabova 4cd77292af Merge branch 'develop' into feature/sse-slicer 2020-05-29 15:22:29 +03:00
Julia Radzhabova d9af2ca0e9 [SSE] Add cell settings (wrap text and shrink to fit) to the right panel 2020-05-29 15:14:16 +03:00
Julia Radzhabova bb7c716a38 [SSE] Add sort settings for slicer to the right menu 2020-05-28 19:01:50 +03:00
Julia Radzhabova b87b9f956f [SSE] Fix size settings for slicer 2020-05-28 17:59:49 +03:00
Julia Radzhabova dc77c54de7 [SSE] Add icons for slicer 2020-05-28 17:58:32 +03:00
Julia Radzhabova 64904a2a0b [SSE] Fix slicer settings 2020-05-28 17:05:20 +03:00
Julia Radzhabova 040b22ed81 [SSE] Cell snapping settings for slicer 2020-05-27 20:20:08 +03:00
Julia Radzhabova ebe0f338cf [SSE] Set slicer style settings 2020-05-27 18:34:15 +03:00
Julia Radzhabova c3eb5132da [SSE] Show slicer settings in the right menu 2020-05-27 16:33:34 +03:00
Julia Radzhabova 15b036daf8 [SSE] Get slicer style 2020-05-26 23:26:36 +03:00
Julia Radzhabova 95a6e48e16 [SSE] Load slicer settings 2020-05-26 17:14:58 +03:00
Julia Radzhabova b54c2e4d10 Merge branch 'develop' into feature/sse-conditional-formatting
# Conflicts:
#	apps/spreadsheeteditor/main/app/controller/Toolbar.js
2020-05-15 14:29:20 +03:00