Skip to content

Commit

Permalink
Updated "deck paths" PR and merging master (#99)
Browse files Browse the repository at this point in the history
  • Loading branch information
@mistercrunch @lyft-buildnotify
mistercrunch authored and lyft-buildnotify committed Dec 19, 2017
1 parent 20281c5 commit 7f61885
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion upstream
Submodule upstream updated 39 files
+869 −266 superset/assets/backendSync.json
+6 −3 superset/assets/javascripts/chart/Chart.jsx
+1 −0 superset/assets/javascripts/chart/ChartContainer.jsx
+69 −27 superset/assets/javascripts/chart/chartAction.js
+53 −6 superset/assets/javascripts/chart/chartReducer.js
+2 −2 superset/assets/javascripts/dashboard/actions.js
+3 −1 superset/assets/javascripts/dashboard/components/GridCell.jsx
+2 −0 superset/assets/javascripts/dashboard/components/GridLayout.jsx
+22 −0 superset/assets/javascripts/dashboard/components/SliceHeader.jsx
+21 −25 superset/assets/javascripts/dashboard/reducers.js
+609 −0 superset/assets/javascripts/explore/components/controls/AnnotationLayer.jsx
+177 −0 superset/assets/javascripts/explore/components/controls/AnnotationLayerControl.jsx
+2 −0 superset/assets/javascripts/explore/components/controls/index.js
+18 −1 superset/assets/javascripts/explore/exploreUtils.js
+2 −1 superset/assets/javascripts/explore/index.jsx
+1 −0 superset/assets/javascripts/explore/main.css
+15 −19 superset/assets/javascripts/explore/stores/controls.jsx
+3 −1 superset/assets/javascripts/explore/stores/visTypes.js
+94 −0 superset/assets/javascripts/modules/AnnotationTypes.js
+2 −0 superset/assets/package.json
+6 −4 superset/assets/spec/javascripts/explore/chartActions_spec.js
+8 −0 superset/assets/stylesheets/dashboard.css
+1 −1 superset/assets/stylesheets/superset.less
+5 −7 superset/assets/visualizations/deckgl/path.jsx
+88 −42 superset/assets/visualizations/main.js
+29 −0 superset/assets/visualizations/nvd3_vis.css
+187 −64 superset/assets/visualizations/nvd3_vis.js
+7 −0 superset/assets/visualizations/table.js
+1 −1 superset/connectors/druid/models.py
+37 −0 superset/connectors/sqla/models.py
+1 −1 superset/db_engine_specs.py
+60 −0 superset/migrations/versions/21e88bc06c02_annotation_migration.py
+1 −0 superset/models/annotations.py
+5 −2 superset/models/core.py
+29 −9 superset/utils.py
+127 −17 superset/views/core.py
+11 −28 superset/viz.py
+75 −1 tests/utils_tests.py
+5 −1 tests/viz_tests.py

0 comments on commit 7f61885

Please sign in to comment.