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 |
|
GoshaZotov
|
7e623c5406
|
Merge branch 'develop' into feature/sse-slicer
|
2020-05-14 17:18:30 +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 |
|
|
GoshaZotov
|
c1aa4a962e
|
Merge branch 'develop' into feature/sse-slicer
|
2020-05-12 11:31:47 +03:00 |
|
|
Julia Radzhabova
|
d35cb91f2e
|
Merge branch 'develop' into feature/sse-conditional-formatting
|
2020-04-23 17:45:26 +03:00 |
|
|
Julia Radzhabova
|
6573cc7a84
|
Merge branch 'hotfix/v5.5.1' into develop
|
2020-04-15 15:04:23 +03:00 |
|
|
Julia Radzhabova
|
fd4716eb72
|
[SSE] Add rules manager for conditional formatting
|
2020-04-14 20:32:48 +03:00 |
|
|
Julia Radzhabova
|
c47d09be76
|
[SSE] Move color scheme button to Layout tab
|
2020-04-14 16:08:14 +03:00 |
|
|
Julia Radzhabova
|
30c42cf26e
|
[SSE] Add slicer settings
|
2020-04-14 14:58:40 +03:00 |
|
|
Julia Radzhabova
|
48fa6dbf8f
|
[SSE] Remove duplicates in table from the right panel
|
2020-04-13 12:45:11 +03:00 |
|
|
Julia Radzhabova
|
c394393bba
|
[SSE] Insert slicers. Bug 30397
|
2020-04-10 17:50:58 +03:00 |
|
|
Julia Radzhabova
|
3e352d5c80
|
ListView refactoring
|
2020-04-09 16:29:04 +03:00 |
|
|
Julia Radzhabova
|
438c3287d2
|
[SSE] Remove duplicate values
|
2020-04-07 15:48:45 +03:00 |
|
|
Julia Radzhabova
|
9024a6fa46
|
[SSE] Use InputFieldBtn component for selecting data
|
2020-04-06 17:46:22 +03:00 |
|
|
Julia Radzhabova
|
268668577e
|
Fix translation
|
2020-03-26 13:03:25 +03:00 |
|
|
Julia Radzhabova
|
a882b4530c
|
[SSE] Add "Print titles" option to print dialog and page options
|
2020-03-17 17:55:37 +03:00 |
|
|
Julia Radzhabova
|
8d88fe6aca
|
[SSE] Bug 43869
|
2020-03-17 15:06:40 +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
|
a4aac1aa0e
|
[SSE] Add overflow settings for shape
|
2020-02-26 14:24:58 +03:00 |
|
|
Julia Radzhabova
|
54335503c4
|
[SSE] Add named ranges button to formula tab
|
2020-02-26 13:49:57 +03:00 |
|
|
Julia Radzhabova
|
74bce86ddd
|
[DE][SSE] Add autofit settings for shape
|
2020-02-25 16:47:53 +03:00 |
|
|
Julia Radzhabova
|
325ac8096c
|
Update translation (#298)
|
2020-01-14 17:11:59 +03:00 |
|
|
Julia Svinareva
|
eb7cbca182
|
[DE] [SSE] [PE] Bug 42429
|
2019-12-16 13:55:13 +03:00 |
|
|
Julia Svinareva
|
7dd4e731d9
|
[DE] [SSE] [PE] Fix bug 42429
|
2019-12-13 17:18:11 +03:00 |
|
|
Julia Radzhabova
|
df4acc4bb8
|
Merge with develop
|
2019-12-12 12:07:58 +03:00 |
|
|
Julia Radzhabova
|
45304408a7
|
[SSE] Change layout for sort dialog
|
2019-12-12 10:18:57 +03:00 |
|
|
Julia Radzhabova
|
1ace993ea8
|
Merge branch 'develop' into feature/sse-pivot-settings
|
2019-12-06 15:28:39 +03:00 |
|
|
Maxim Kadushkin
|
2e68bb0a32
|
[SSE] added 'function' button's icon
|
2019-12-04 13:38:27 +03:00 |
|
|
Julia Radzhabova
|
01da19cf26
|
Merge branch 'feature/sse-custom-sort' into develop
|
2019-12-02 15:17:35 +03:00 |
|
|
Julia Radzhabova
|
08f3f53272
|
Change styles for ratio and zoom buttons
|
2019-12-02 14:48:50 +03:00 |
|
|
Julia Svinareva
|
2a239c2cf9
|
[SSE] Fix cell fill: hide color fill while loading
|
2019-11-29 17:15:22 +03:00 |
|
|
Julia Radzhabova
|
a2a05ca474
|
Add icons
|
2019-11-29 16:29:52 +03:00 |
|
|
Julia Radzhabova
|
18df7d80b6
|
Fix scale icon class
|
2019-11-29 14:21:27 +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 |
|