|  josdejong | c8622b7923 | Merge remote-tracking branch 'origin/develop' into develop | 11 years ago | 
				
					
						|  Alex de Mulder | 8f472d8438 | removed SVGtimeline from jake | 11 years ago | 
				
					
						|  josdejong | 72e71c59ff | Merge remote-tracking branch 'origin/develop' into develop | 11 years ago | 
				
					
						|  Alex de Mulder | cde8901c2c | Merge remote-tracking branch 'origin/develop' into alex_dev | 11 years ago | 
				
					
						|  Alex de Mulder | cdb939c45f | Added physics configuration, removed svgTimeline from this branch | 11 years ago | 
				
					
						|  Alex de Mulder | e12406b59a | renamed frameResize to resize | 11 years ago | 
				
					
						|  Alex de Mulder | 9335aec242 | svg timeline work and refactoring. | 11 years ago | 
				
					
						|  Alex de Mulder | ff246743f5 | initial working version | 11 years ago | 
				
					
						|  Alex de Mulder | 92bf75d669 | svgTimeline v0.1 | 11 years ago | 
				
					
						|  Alex de Mulder | b9406e72f6 | svg timeline experiment | 11 years ago | 
				
					
						|  Alex de Mulder | b86855f99a | removed superfluous events | 11 years ago | 
				
					
						|  Alex de Mulder | 683dad09df | added click and doubleclick events and extended events documentation | 11 years ago | 
				
					
						|  Alex de Mulder | 2cc11d4e9b | bug fix, typo fix, clarified docs | 11 years ago | 
				
					
						|  josdejong | a94d528e2d | Merge remote-tracking branch 'origin/develop' into develop Conflicts:
	dist/vis.js
	dist/vis.min.js | 11 years ago | 
				
					
						|  Alex de Mulder | c0c62bfd67 | Added directions for hierarchical view as per #25 | 11 years ago | 
				
					
						|  Alex de Mulder | 5262fa059a | Updated zoomExtent and added to methods as per #39, removed width property from zoom extent -> getrange. typos. | 11 years ago | 
				
					
						|  Alex de Mulder | db77b1ed3b | Updated example 22 a little, normalized zoom in response to issue #39 | 11 years ago | 
				
					
						|  josdejong | 07f3c44b38 | Merge branch 'master' into develop | 11 years ago | 
				
					
						|  josdejong | ba0ae0923e | Added minified css file | 11 years ago | 
				
					
						|  josdejong | d2526830e8 | Updated version number to 0.6.0-SNAPSHOT | 11 years ago | 
				
					
						|  josdejong | fb19813511 | Removed download folder (is available on gh-pages branch) | 11 years ago | 
				
					
						|  josdejong | 29a1c08860 | Released version 0.5.1 | 11 years ago | 
				
					
						|  josdejong | 88a12e486f | Fixed ./dist folder being ignored (needed for bower) | 11 years ago | 
				
					
						|  josdejong | ca7cf0a5fb | Released version 0.5.0 | 11 years ago | 
				
					
						|  josdejong | 6742ccead3 | Removed iconPath | 11 years ago | 
				
					
						|  josdejong | 7a5fb1492d | Merged all css files in vis.css, restructured image locations | 11 years ago | 
				
					
						|  Alex de Mulder | 0fce7926ef | typos | 11 years ago | 
				
					
						|  josdejong | 1760dbfa40 | Cleanup some unused code | 11 years ago | 
				
					
						|  josdejong | 03583167c6 | Updated history | 11 years ago | 
				
					
						|  josdejong | 82736d7c19 | Merge branch 'alex_dev' into develop Conflicts:
	src/graph/Graph.js | 11 years ago | 
				
					
						|  josdejong | 014a2d3c28 | Updated history | 11 years ago | 
				
					
						|  Alex de Mulder | d32a3dfca4 | small doc change. | 11 years ago | 
				
					
						|  josdejong | b4117473b3 | Updated intro | 11 years ago | 
				
					
						|  josdejong | c769569a0d | Merge remote-tracking branch 'origin/alex_dev' into develop Conflicts:
	docs/graph.html | 11 years ago | 
				
					
						|  Alex de Mulder | 8a3c45eab9 | added hierarchical layout | 11 years ago | 
				
					
						|  josdejong | 2c71164c6f | Some updates in documentation | 11 years ago | 
				
					
						|  josdejong | b4a77aaf87 | Renamed example 8 to 08_edit_items.html | 11 years ago | 
				
					
						|  josdejong | 9c8f5cb61f | Updated history | 11 years ago | 
				
					
						|  josdejong | 429974e593 | Using new DataSet API consistently | 11 years ago | 
				
					
						|  josdejong | b2cfcc5318 | Fixed scrolling to zoom not working on IE in standards mode | 11 years ago | 
				
					
						|  Alex de Mulder | 2591b8abae | added icons for new examples. minor tweaks (code styling) | 11 years ago | 
				
					
						|  Alex de Mulder | 89b225b066 | new docs, added fixed parameter to nodes | 11 years ago | 
				
					
						|  josdejong | 3b611ef243 | Merge branch 'alex_dev' into develop | 11 years ago | 
				
					
						|  Alex de Mulder | 3eaab04ebf | Merge branch 'alex_dev' of https://github.com/almende/vis into alex_dev | 11 years ago | 
				
					
						|  Alex de Mulder | 9f643b964c | tweaks and minor bugfix | 11 years ago | 
				
					
						|  josdejong | e11f0c2b59 | Fixed some more merge conflicts | 11 years ago | 
				
					
						|  josdejong | a8a8519e4c | Merge branch 'alex_dev' into develop Conflicts:
	Jakefile.js
	examples/graph/index.html
	src/graph/Edge.js
	src/graph/Graph.js
	src/graph/graphMixins/ClusterMixin.js
	src/graph/graphMixins/SelectionMixin.js
	src/timeline/Controller.js
	src/timeline/Range.js
	src/timeline/Timeline.js
	src/timeline/component/ItemSet.js
	src/timeline/component/RootPanel.js
	src/timeline/component/item/Item.js
	src/util.js | 11 years ago | 
				
					
						|  josdejong | d48fd1ed69 | Fixed filename case errors | 11 years ago | 
				
					
						|  josdejong | ad39a54d7d | Fixed filename case errors | 11 years ago | 
				
					
						|  josdejong | 81ac56c0e2 | Merge remote-tracking branch 'origin/alex_dev' into alex_dev Conflicts:
	dist/vis.js | 11 years ago |