Commit graph

503 commits

Author SHA1 Message Date
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
Julia Radzhabova 624c4ef8a6 [SSE] Fix Bug 37059 2020-09-17 12:39:59 +03:00
Julia Radzhabova 8a08de3c95 [SSE] Fix style updating 2020-09-16 23:30:12 +03:00
Julia Radzhabova 930d78807c [SSE] Bug 46590: disable filter button for table with slicer 2020-09-16 22:44:15 +03:00
Julia Radzhabova 0669c65b67 [SSE] Fix styles updating 2020-09-16 17:43:49 +03:00
Julia Radzhabova 791e967609 [SSE] Optimize styles update 2020-09-16 16:40:09 +03:00
Julia Radzhabova b9ce71728c Merge branch 'develop' into feature/sse-views 2020-09-14 14:06:03 +03:00
Julia Radzhabova 1188155f15 Fix inserting special characters 2020-08-27 18:54:14 +03:00
Julia Radzhabova e67c257caa [SSE] Fix Bug 46112 2020-08-20 11:14:36 +03:00
Julia Radzhabova d326eacaed [SSE] Bug 36285, Bug 46126 2020-08-15 14:55:19 +03:00
Julia Radzhabova 6fc5bc7cfe [SSE] Fix Bug 46126 2020-08-14 16:58:41 +03:00
Julia Radzhabova 043d1c231b [SSE] Fix Bug 46126 2020-08-13 15:03:53 +03:00
Julia Radzhabova c46b885148 [SSE] For bug 45923 2020-07-22 15:25:07 +03:00
Julia Radzhabova c35e34e1f6 Merge branch 'develop' into feature/sse-views 2020-07-17 11:35:16 +03:00
Julia Radzhabova d5764f0b99
Merge pull request #419 from ONLYOFFICE/feature/pivot-filters
Feature/pivot filters
2020-07-10 20:18:35 +03:00
Julia Radzhabova 1f49644924 [SSE] Lock view settings 2020-07-10 16:19:07 +03:00
Julia Radzhabova ce19f6f1fc [SSE] Move views to paid features 2020-07-10 15:42:39 +03:00
Julia Radzhabova 0acbad6fa0 [SSE] Add View tab 2020-07-09 14:53:22 +03:00
Julia Radzhabova cd2048a00a [SSE] Set decimal, thousands separators when convert text to columns and in special paste. 2020-06-26 20:44:54 +03:00
Julia Radzhabova 4a246ef70f Merge branch 'develop' into feature/sse-conditional-formatting 2020-06-16 16:09:39 +03:00
Julia Radzhabova 7c2fc19882 [SSE] Fix named ranges for slicers 2020-06-10 13:38:50 +03:00
Julia Radzhabova ce8bc7f4c9 [SSE] Enable sort and clear filter buttons for pivot table 2020-06-10 11:30:08 +03:00
Julia Radzhabova fa09377a35 [SSE] Disable toolbar buttons when slicer is selected 2020-06-05 19:28:11 +03:00
Julia Radzhabova 69042abd2b Merge branch 'develop' into feature/sse-slicer 2020-06-04 18:27:08 +03:00
Julia Radzhabova 33ec257571 [SSE] Bug 24245 2020-06-03 13:10:31 +03:00
GoshaZotov a035c19757 Merge branch 'develop' into feature/sse-slicer 2020-06-02 13:48:36 +03:00
Julia Radzhabova c0813053cc [SSE] Refactoring text orientation in shape 2020-06-02 12:42:07 +03:00
Julia Radzhabova 4cd77292af Merge branch 'develop' into feature/sse-slicer 2020-05-29 15:22:29 +03:00
Julia Radzhabova 33557ba72d [SSE] Fix adding slicer 2020-05-28 18:09:35 +03:00
Julia Radzhabova 5c3b2638f5 [SSE] Set vertical text for cell 2020-05-28 13:17:21 +03:00
Julia Radzhabova 0ba1760176 [SSE] Add slicer for pivot and formatted table 2020-05-26 19:47:24 +03:00
GoshaZotov 67bbc60070 Merge branch 'develop' into feature/sse-slicer 2020-05-26 18:08:30 +03:00
Julia Radzhabova 5552d9f845 Merge branch 'feature/sse-function-wizard' into develop 2020-05-22 19:04:34 +03:00
Julia Radzhabova bdb79f3b48 [SSE] Add format settings to conditional formatting 2020-05-19 19:57:24 +03:00
GoshaZotov f19437168f Merge remote-tracking branch 'remotes/origin/develop' into feature/sse-slicer 2020-05-15 15:17:46 +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
Julia Radzhabova 0b4f282ac9 [SSE] Add new methods in sdk 2020-05-15 13:52:52 +03:00
Julia Radzhabova 5c1774efcf [SSE] Add new methods in sdk 2020-05-15 11:32:21 +03:00
Alexander Trofimov b0a526c263 [SSE] New
Use new methods in selection info
2020-05-15 10:42:00 +03:00
GoshaZotov 7e623c5406 Merge branch 'develop' into feature/sse-slicer 2020-05-14 17:18:30 +03:00
Julia Radzhabova 2af9094a34 Merge remote-tracking branch 'origin/develop' into develop 2020-05-14 13:03:21 +03:00
Julia Radzhabova 7c69720f1d [SSE] Refactoring 2020-05-14 12:56:09 +03:00
Alexander Trofimov 00fc3770d5 [SSE] Move
Move asc_getMerge to cell info
2020-05-14 12:16:27 +03:00
Alexander Trofimov e0268a7bee [SSE] Move
Move asc_getWrapText to cell info
2020-05-14 12:01:20 +03:00
Alexander Trofimov f50d32b597 [SSE] Move
Move asc_getLockText to cell info
2020-05-14 11:50:34 +03:00
Alexander Trofimov 4a282e307a [SSE] Move
Move asc_getMultiselect to cell info
2020-05-14 11:45:23 +03:00
Alexander Trofimov a33df0aabe [SSE] Move
Move asc_getSelectionType to cell info
2020-05-14 11:39:04 +03:00
Julia Radzhabova d497e4b761 [SSE] Enable text orientation button for shape without text, use asc_getAngle() for shapes.
Fix vertical align for shapes (deselect all buttons, when alignment=null)
2020-05-13 20:47:56 +03:00
Julia Radzhabova fc4de46980 [PE][SSE] Bug 42913: load image for filling shape, slide and replacing image from storage. 2020-05-13 17:20:58 +03:00
Julia Radzhabova 9526166140 Merge branch 'develop' into feature/sse-slicer 2020-05-12 13:17:52 +03:00
Julia Radzhabova e0d01f5b43 [SSE] Bug 36285 2020-05-08 20:18:53 +03:00
Alexander Trofimov cb1c4437f7 [SSE] Fix
Use asc_getFillColor
2020-05-08 15:09:44 +03:00
Julia Radzhabova 9d8f314157 [SSE] Add hotkey Shift+F3 for function insert 2020-05-07 19:42:27 +03:00
Julia Radzhabova d35cb91f2e Merge branch 'develop' into feature/sse-conditional-formatting 2020-04-23 17:45:26 +03:00
Julia Radzhabova fb86d517b1 [SSE] asc_insertFormula -> asc_insertInCell 2020-04-23 13:10:34 +03:00
Julia Radzhabova 67dd73e767 Refactoring 2020-04-22 12:35:55 +03:00
Julia Radzhabova 753ff60e2d [SSE] Refactoring conditional formatting 2020-04-17 14:16:09 +03:00
Julia Radzhabova 07cd5d3267 [SSE] Load conditional formatting settings 2020-04-15 20:08:56 +03:00
Julia Radzhabova fd4716eb72 [SSE] Add rules manager for conditional formatting 2020-04-14 20:32:48 +03:00
Julia Radzhabova ba22351c91 [SSE] Add conditional formatting 2020-04-14 17:31:47 +03:00
Julia Radzhabova c394393bba [SSE] Insert slicers. Bug 30397 2020-04-10 17:50:58 +03:00
Julia Radzhabova acd9eb20da [SSE] Fix removing duplicates 2020-04-08 11:51:55 +03:00
Julia Radzhabova 27dbfcae82 Refactoring symbol table, don't show special chars when using in list settings. 2020-04-02 16:14:45 +03:00
Julia Radzhabova 308428d83f Fix Bug 44916 2020-03-31 16:49:33 +03:00
Julia Radzhabova 43ff8d3788 [SSE] Check pivot feature 2020-03-20 17:58:03 +03:00
Julia Radzhabova 4c62e7367f [SSE] Hide pivot settings in desktop 2020-03-20 17:38:58 +03:00
Julia Radzhabova 664fae40e5 [SSE] Get link to the internal range 2020-03-20 15:29:47 +03:00
Julia Radzhabova e5c35c772e [SSE] Fix print titles 2020-03-18 10:08:47 +03:00
Julia Radzhabova 0ef9620d9b [SSE] Fix print titles 2020-03-17 18:03:42 +03:00
Julia Radzhabova 42ccd21630 [SSE] Fix printing tities 2020-03-17 15:24:23 +03:00
Julia Radzhabova 8d88fe6aca [SSE] Bug 43869 2020-03-17 15:06:40 +03:00
Julia Radzhabova e6c0127698 [SSE] Fix internal links 2020-03-16 13:30:51 +03:00
Julia Radzhabova d76fc24f4b
Merge pull request #364 from ONLYOFFICE/feature/internal-link
Feature/internal link
2020-03-12 14:10:33 +03:00
Julia Radzhabova 5f283b11ce Merge branch 'feature/sse-pivot-settings' into develop 2020-03-11 17:46:21 +03:00
Julia Radzhabova 8d852e957a Merge branch 'release/v5.5.0' into develop 2020-03-05 13:34:31 +03:00
Julia Radzhabova 952d4347ab [SSE] Add hyperlink to named ranges 2020-03-04 10:28:12 +03:00
Julia Radzhabova 54335503c4 [SSE] Add named ranges button to formula tab 2020-02-26 13:49:57 +03:00
Julia Radzhabova 51128892c8 [SSE] Fix Bug 44393 2020-02-06 11:26:19 +03:00
Julia Radzhabova ebe8e87b34 [SSE] Fix Bug 44219 (#308) 2020-01-21 15:02:42 +03:00
Julia Radzhabova f714a26da7 Change color scheme by index 2019-12-19 11:00:49 +03:00
Julia Radzhabova 1ace993ea8 Merge branch 'develop' into feature/sse-pivot-settings 2019-12-06 15:28:39 +03:00
Julia Radzhabova 01da19cf26 Merge branch 'feature/sse-custom-sort' into develop 2019-12-02 15:17:35 +03:00
Maxim Kadushkin 670b6cf2c6 merge with develop 2019-11-28 17:11:18 +03:00
Julia Radzhabova 0e4bee102e Merge branch 'develop' into feature/sse-custom-sort 2019-11-27 11:45:21 +03:00
Maxim Kadushkin aa48aca058 [SSE] build icons sprite from source images 2019-11-21 19:15:47 +03:00
Maxim Kadushkin 5238c494ae [DE SSE] removed unused buttons 2019-11-20 17:58:55 +03:00
Maxim Kadushkin fa5c9d5626 [all] changed 'notify' button state 2019-11-20 12:42:39 +03:00
Julia Radzhabova 9199b69881 Refactoring symbol table: change sdk method 2019-11-15 16:57:55 +03:00
Julia Radzhabova f2d2ef5fc3 Show collaboration tab in the comment mode (show add/remove comment buttons) 2019-11-15 14:01:08 +03:00
Julia Radzhabova b811606de9 Merge branch 'develop' into feature/remove-comments 2019-11-15 11:52:22 +03:00
Julia Radzhabova bdbde4cde6 [PE][SSE] Add symbol from symbol table 2019-11-14 11:48:58 +03:00
Julia Radzhabova cfb06354ca Refactoring add/remove comments buttons: change icons, change caption of buttons on Collaboration tab. 2019-11-06 17:22:12 +03:00
Julia Radzhabova c77e94c188 [SSE] Disable adding comment to spreadsheet for customization->compatibleFeatures parameter 2019-11-01 11:42:43 +03:00
Maxim Kadushkin 2f2bcb516d [all] roolback bugfix 42885 for smooth skeleton 2019-10-29 11:30:08 +03:00
Julia Svinareva fe4a450465 [SSE] Scale to Fit (fix disabled) 2019-10-21 17:43:34 +03:00
Julia Svinareva e424611cfe [SSE] Fix scale 2019-10-15 15:07:03 +03:00
Julia Radzhabova 99d35ff276 Merge with develop 2019-10-04 17:12:54 +03:00
Julia Radzhabova 30e5e09766 [SSE] Add lock for controls on the Pivot tab 2019-10-04 16:17:05 +03:00
Julia Radzhabova f68a6ee68b [SSE] Fix Bug 35507 2019-10-02 10:15:36 +03:00
Julia Radzhabova ef8a9c8d0d Add custom sort button 2019-10-01 14:20:52 +03:00
Maxim Kadushkin 2c4a281998 [all] fix toolbar's rendering dependensies 2019-09-25 12:50:58 +03:00
Maxim Kadushkin 0e5aed194b [SSE] fix bug 42885 2019-09-23 18:39:59 +03:00
Maxim Kadushkin 6345ebca47 [all] fix bug 42885 2019-09-23 17:26:30 +03:00
Julia Radzhabova 4b70e94c85 [SSE] Add translation for table styles 2019-09-19 13:31:23 +03:00
Julia Radzhabova bd44f6b773 Merge branch feature/window-refactoring into develop 2019-09-18 17:54:16 +03:00
Julia Radzhabova 8d3ec85ca2 Merge branch 'develop' into feature/optimization 2019-09-18 16:32:26 +03:00
Julia Radzhabova 0c9f29897b
Merge pull request #247 from ONLYOFFICE/hotfix/v5.4.1
Hotfix/v5.4.1
2019-09-18 15:54:52 +03:00
Julia Radzhabova be8286ea67
Merge pull request #244 from ONLYOFFICE/feature/new-settings
Feature/new settings
2019-09-18 15:14:47 +03:00
Julia Svinareva 10da1b3748 [SSE] Scale to Fit (custom scale) 2019-09-18 13:23:25 +03:00
Julia Radzhabova 5e38d632a4 Merge branch 'feature/new-settings' into develop
[SSE] Add scaling options
2019-09-17 17:45:53 +03:00
Julia Svinareva 8db4c469b4 [SSE] Scale to Fit (custom scale) 2019-09-13 17:45:09 +03:00
Julia Svinareva 51fb491a1a [SSE] Scale to Fit (dropdown menu) 2019-09-12 10:15:07 +03:00
Julia Radzhabova 0f6a2c99e3 [SSE] Fix Bug 42789 2019-09-11 16:21:12 +03:00
Julia Radzhabova 60574efd18 Refactoring window component 2019-09-10 09:47:19 +03:00
Julia Svinareva cbb2e0583d [SSE] Scale (set lock) 2019-09-06 13:49:56 +03:00
Julia Svinareva 780dea554b [SSE] Fix Custom Scaling 2019-09-05 10:52:49 +03:00
Julia Radzhabova 195607ec47 [SSE] Fix Bug 42599 2019-09-04 17:58:43 +03:00
Julia Radzhabova 374f7d122f [SSE] Optimize textart loading 2019-09-03 13:52:52 +03:00
Julia Radzhabova b4530a252a [PE][SSE] Refactoring loading chart types 2019-09-02 12:52:14 +03:00
Julia Radzhabova 23db6a35c6 Refactoring 2019-08-30 16:24:15 +03:00
Julia Svinareva 28d8ad8df7 [SSE] Scale Dialog (add set defaults, get settings) 2019-08-28 13:12:52 +03:00
Julia Radzhabova e9bf021e17 Refactoring loading textarts 2019-08-21 17:08:21 +03:00
Julia Radzhabova 71d1f2a262 Merge branch 'develop' into feature/optimization 2019-08-21 15:04:07 +03:00
Julia Svinareva f7009ddf8c [SSE] Add Scale into Toolbar 2019-08-21 13:55:40 +03:00