Skip to content

Conversation

@buunguyen
Copy link

  • Gulp build pipeline for legacy and single-file modes
  • Bower-ify all dependencies
  • Restructure lib & demos
  • Fix modules to support UMD

buunguyen and others added 5 commits April 18, 2015 17:30
Minor fixes to make HelloWorld.html and test.html work in non-build scenario.

Signed-off-by: Gordon Smith <[email protected]>
Conflicts:
	widgets/src/tree/Dendrogram.js
Conflicts:
	bower.json
	demos/HelloWorld.html
	demos/config.js
	demos/test.html
Conflicts:
	viz/c3/Area.js
	viz/c3/Bar.js
	viz/c3/Column.js
	viz/c3/Common.js
	viz/c3/Common1D.js
	viz/c3/Common2D.js
	viz/c3/CommonND.js
	viz/c3/Donut.js
	viz/c3/Gauge.js
	viz/c3/Line.js
	viz/c3/Pie.js
	viz/c3/Scatter.js
	viz/c3/Step.js
	viz/chart/Bubble.js
	viz/chart/Column.js
	viz/chart/I1DChart.js
	viz/chart/I2DChart.js
	viz/chart/INDChart.js
	viz/chart/Line.js
	viz/chart/MultiChart.js
	viz/chart/MultiChartSurface.js
	viz/chart/Pie.js
	viz/chart/XYAxis.js
	viz/common/FAChar.js
	viz/common/Icon.js
	viz/common/Menu.js
	viz/common/Palette.js
	viz/common/ResizeSurface.js
	viz/common/Shape.js
	viz/common/Surface.js
	viz/common/Text.js
	viz/common/TextBox.js
	viz/common/Transition.js
	viz/google/Bar.js
	viz/google/Column.js
	viz/google/Common.js
	viz/google/Common2D.js
	viz/google/CommonND.js
	viz/google/Line.js
	viz/google/Pie.js
	viz/graph/Edge.js
	viz/graph/Graph.js
	viz/graph/GraphData.js
	viz/graph/GraphLayouts.js
	viz/graph/IGraph.js
	viz/graph/Vertex.js
	viz/layout/Cell.js
	viz/layout/Grid.js
	viz/layout/Surface.js
	viz/map/Choropleth.js
	viz/map/ChoroplethCounties.js
	viz/map/ChoroplethCountries.js
	viz/map/ChoroplethStates.js
	viz/map/GMap.js
	viz/map/IChoropleth.js
	viz/map/IGMap.js
	viz/marshaller/Graph.js
	viz/marshaller/HTML.js
	viz/marshaller/HipieDDL.js
	viz/other/Audio.js
	viz/other/Bag.js
	viz/other/Comms.js
	viz/other/MorphText.js
	viz/other/Persist.js
	viz/other/PropertyEditor.js
	viz/other/Slider.js
	viz/other/Table.js
	viz/other/WordCloud.js
	viz/tree/CirclePacking.js
	viz/tree/Dendrogram.js
	viz/tree/ITree.js
	viz/tree/SunburstPartition.js
@GordonSmith
Copy link
Owner

@buunguyen - if you can issue a pull request of just the UMD_FIX against upstream/master like: hpcc-systems#297

@buunguyen
Copy link
Author

Can you clarify a bit? I submitted a PR from hmsonline/master to gordensmith/UMD_FIX as you asked for. I don't have/need local UMD_FIX branch in hmsonline Besides, what's upstream/master?

@buunguyen
Copy link
Author

Great. Is this PR ready to merge or is there something else you need? Also, I suppose I should keep using this branch as my upstream, since I will still likely push more code when I work on the integration.

@buunguyen buunguyen closed this Apr 22, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants