Commit graph

5385 commits

Author SHA1 Message Date
Julia Radzhabova 78f55ce4f2 [SSE] Conditional formatting: load format settings 2020-05-19 22:13:07 +03:00
Julia Radzhabova bdb79f3b48 [SSE] Add format settings to conditional formatting 2020-05-19 19:57:24 +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 bb4efe5840 [SSE] Fix 2020-05-15 14:09:24 +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
Maxim Kadushkin 5e200c6ed9 [desktop] fix bug 45266 2020-05-14 14:17:34 +03:00
Julia Radzhabova 2af9094a34 Merge remote-tracking branch 'origin/develop' into develop 2020-05-14 13:03:21 +03:00
Julia Radzhabova fc8cf6edd2 [SSE] Pivot refactoring 2020-05-14 12:56:34 +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
JuliaSvinareva 7440ad31af Merge branch 'feature/mobile-review' into develop 2020-05-13 19:10:46 +03:00
JuliaSvinareva a9984c8eee [DE mobile] Change review template 2020-05-13 18:59:42 +03:00
Julia Radzhabova 0ff27c9f24
Merge pull request #397 from ONLYOFFICE/feature/Bug-42913
Feature/bug 42913
2020-05-13 18:08:07 +03:00
Julia Radzhabova c6f7518d3b Refactoring 2020-05-13 17:59:16 +03:00
Julia Radzhabova a3f8ade2cd Bug 42913: replace image from context menu 2020-05-13 17:43:45 +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 c4aac9cde3 [DE] Bug 42913: load image for filling shape from storage. 2020-05-13 14:57:50 +03:00
Julia Radzhabova fad29ce911 [DE] Bug 42913: replace image from storage. 2020-05-13 14:28:14 +03:00
Julia Radzhabova 6bc7c8ff8b [DE] Bug 42913: load watermark image from storage. 2020-05-13 12:47:45 +03:00
Julia Radzhabova 211306acc9 [SSE] Add tooltips, Fix Bug 36285 2020-05-12 11:12:08 +03:00
Julia Radzhabova 37e1834091 Fix Bug 45283, Bug 25773 2020-05-08 21:48:46 +03:00
Julia Radzhabova 556315ab0b Merge remote-tracking branch 'origin/develop' into develop 2020-05-08 20:19:42 +03:00
Julia Radzhabova e0d01f5b43 [SSE] Bug 36285 2020-05-08 20:18:53 +03:00
Alexander Trofimov b8b3a00bf1 [SSE] Rename
asc_getFill2 -> asc_getFill
2020-05-08 19:01:15 +03:00
Julia Radzhabova 291417d667 [SSE] Fix color for formatting rules 2020-05-08 16:38:15 +03:00
Alexander Trofimov cb1c4437f7 [SSE] Fix
Use asc_getFillColor
2020-05-08 15:09:44 +03:00
JuliaSvinareva ea5fcd1027 [mobile] fix comments 2020-05-08 14:39:15 +03:00
Julia Radzhabova 8e2b6c270f
Merge pull request #396 from ONLYOFFICE/hotfix/v5.5.3
Hotfix/v5.5.3
2020-05-08 13:06:21 +03:00
Julia Radzhabova 99cee6f85e Send encryptionKeys 2020-05-08 11:58:31 +03:00
JuliaSvinareva 3b6a11dd53 Merge branch 'develop' of https://github.com/ONLYOFFICE/web-apps into develop 2020-05-07 21:11:20 +03:00
JuliaSvinareva aa03022115
Merge pull request #395 from ONLYOFFICE/feature/mobile-comments
Feature/mobile comments
2020-05-07 20:13:25 +03:00
JuliaSvinareva 4bab80b0f7
Merge branch 'develop' into feature/mobile-comments 2020-05-07 20:09:29 +03:00
JuliaSvinareva fe17bdab26 Merge branch 'feature/mobile-comments' into develop 2020-05-07 20:06:00 +03:00
Julia Radzhabova 9d8f314157 [SSE] Add hotkey Shift+F3 for function insert 2020-05-07 19:42:27 +03:00
JuliaSvinareva b944ddccfc [mobile] Comments (remove textarea border, increased font, remove tabs animation, add placeholder, changed modal window of delete comment draft) 2020-05-07 19:28:58 +03:00
Julia Radzhabova 5caf5c74eb [SSE] Change caption for insert function menu item 2020-05-07 18:03:43 +03:00
Julia Radzhabova 5f07ed72b5 [SSE] Add AVERAGE function to quick access 2020-05-07 17:40:10 +03:00
Julia Radzhabova b528c26570 Fix Bug 19846: search by function name 2020-05-07 17:08:59 +03:00
Maxim Kadushkin 56420dc147 [all] copy loader for 'embed' mode 2020-05-06 19:36:01 +03:00
Julia Radzhabova 48934472b5 Fix new file templates 2020-05-06 18:24:20 +03:00
Julia Radzhabova e3dd2bc5dd Merge branch 'feature/chart-svg-icons' into develop 2020-05-06 18:20:30 +03:00
Julia Radzhabova 0a54513e47 [SSE][PE] Set svg icons for chart types 2020-05-06 18:04:48 +03:00
Julia Radzhabova fd5c8d5f79 [DE] Fix svg icon for chart type 2020-05-06 17:17:03 +03:00