Merge remote-tracking branch 'origin/develop' into develop
Conflicts: examples/timeline/03_much_data.html
No related branches found
No related tags found
Showing
- HISTORY.md 1 addition, 1 deletionHISTORY.md
- dist/vis.js 164 additions, 119 deletionsdist/vis.js
- dist/vis.min.js 10 additions, 10 deletionsdist/vis.min.js
- examples/timeline/01_basic.html 3 additions, 18 deletionsexamples/timeline/01_basic.html
- examples/timeline/03_much_data.html 3 additions, 3 deletionsexamples/timeline/03_much_data.html
- src/graph/Edge.js 1 addition, 1 deletionsrc/graph/Edge.js
- src/graph/Graph.js 36 additions, 5 deletionssrc/graph/Graph.js
- src/graph/Node.js 1 addition, 0 deletionssrc/graph/Node.js
- src/graph/graphMixins/ClusterMixin.js 4 additions, 2 deletionssrc/graph/graphMixins/ClusterMixin.js
- src/graph/graphMixins/HierarchicalLayoutMixin.js 3 additions, 3 deletionssrc/graph/graphMixins/HierarchicalLayoutMixin.js
- src/graph/graphMixins/ManipulationMixin.js 0 additions, 2 deletionssrc/graph/graphMixins/ManipulationMixin.js
- src/graph/graphMixins/MixinLoader.js 6 additions, 6 deletionssrc/graph/graphMixins/MixinLoader.js
- src/graph/graphMixins/SelectionMixin.js 1 addition, 1 deletionsrc/graph/graphMixins/SelectionMixin.js
- src/graph/graphMixins/physics/BarnesHut.js 23 additions, 0 deletionssrc/graph/graphMixins/physics/BarnesHut.js
- src/graph/graphMixins/physics/PhysicsMixin.js 29 additions, 1 deletionsrc/graph/graphMixins/physics/PhysicsMixin.js
- src/timeline/component/ItemSet.js 57 additions, 95 deletionssrc/timeline/component/ItemSet.js
Loading
Please register or sign in to comment