Alex de Mulder
							
						 | 
						
							
							
							
								
							
								3d4983dcd4
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/v4' into v4
							
							
							
							
								
							
							
						 | 
						10 years ago | 
					
				
					
						
							
							
								   Alex de Mulder
							
						 | 
						
							
							
							
								
							
								92180442e5
								
							
								
							
						 | 
						
							
							
								
								consistency in physics
							
							
							
							
								
							
							
						 | 
						10 years ago | 
					
				
					
						
							
							
								   jos
							
						 | 
						
							
							
							
								
							
								c9da1b1575
								
							
								
							
						 | 
						
							
							
								
								Fixed clickToUse
							
							
							
							
								
							
							
						 | 
						10 years ago | 
					
				
					
						
							
							
								   jos
							
						 | 
						
							
							
							
								
							
								69dbe80e89
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/v4' into v4
							
							
							
							
								
							
							
						 | 
						10 years ago | 
					
				
					
						
							
							
								   jos
							
						 | 
						
							
							
							
								
							
								7ec67156e4
								
							
								
							
						 | 
						
							
							
								
								Upgraded dependencies to the latest version (including a fix in propagating-hammerjs)
							
							
							
							
								
							
							
						 | 
						10 years ago | 
					
				
					
						
							
							
								   Alex de Mulder
							
						 | 
						
							
							
							
								
							
								d600bf71c0
								
							
								
							
						 | 
						
							
							
								
								implemented error notification when not giving an unicode for the icon
							
							
							
							
								
							
							
						 | 
						10 years ago | 
					
				
					
						
							
							
								   jos
							
						 | 
						
							
							
							
								
							
								2d8604b8ee
								
							
								
							
						 | 
						
							
							
								
								Some fixes in Timeline after merging develop
							
							
							
							
								
							
							
						 | 
						10 years ago | 
					
				
					
						
							
							
								   jos
							
						 | 
						
							
							
							
								
							
								33a76d824e
								
							
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into v4
							
							
							
							
							
							
								
							
							
							Conflicts:
	HISTORY.md
	bower.json
	dist/vis.js
	dist/vis.map
	dist/vis.min.css
	dist/vis.min.js
	lib/network/Network.js
	lib/network/mixins/ManipulationMixin.js
	lib/timeline/component/ItemSet.js
	lib/timeline/component/graph2d_types/bar.js
	lib/timeline/component/item/Item.js
	package.json
	test/timeline.html 
							
						 | 
						10 years ago | 
					
				
					
						
							
							
								   jos
							
						 | 
						
							
							
							
								
							
								af1579ba7c
								
							
								
							
						 | 
						
							
							
								
								Updated test file
							
							
							
							
								
							
							
						 | 
						10 years ago | 
					
				
					
						
							
							
								   Alex de Mulder
							
						 | 
						
							
							
							
								
							
								f88863eecb
								
							
								
							
						 | 
						
							
							
								
								changed the dashes options, fixed event bugs in drag
							
							
							
							
								
							
							
						 | 
						10 years ago | 
					
				
					
						
							
							
								   Alex de Mulder
							
						 | 
						
							
							
							
								
							
								ec5f644d12
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/v4' into v4
							
							
							
							
							
							
								
							
							
							Conflicts:
	lib/network/modules/InteractionHandler.js 
							
						 | 
						10 years ago | 
					
				
					
						
							
							
								   Alex de Mulder
							
						 | 
						
							
							
							
								
							
								867f033078
								
							
								
							
						 | 
						
							
							
								
								changed the dashes options, fixed bug
							
							
							
							
								
							
							
						 | 
						10 years ago | 
					
				
					
						
							
							
								   jos
							
						 | 
						
							
							
							
								
							
								4eff172c61
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/v4' into v4
							
							
							
							
								
							
							
						 | 
						10 years ago | 
					
				
					
						
							
							
								   jos
							
						 | 
						
							
							
							
								
							
								28f8367f11
								
							
								
							
						 | 
						
							
							
								
								Fixed the touch and release events being fired twice each time. Fixed a bug with dragging in the InteractionHandler
							
							
							
							
								
							
							
						 | 
						10 years ago | 
					
				
					
						
							
							
								   Alex de Mulder
							
						 | 
						
							
							
							
								
							
								68b75d57ee
								
							
								
							
						 | 
						
							
							
								
								fixed css
							
							
							
							
								
							
							
						 | 
						10 years ago | 
					
				
					
						
							
							
								   Alex de Mulder
							
						 | 
						
							
							
							
								
							
								28e48828c3
								
							
								
							
						 | 
						
							
							
								
								tweaked options, simplified edge:color:inherit option
							
							
							
							
								
							
							
						 | 
						10 years ago | 
					
				
					
						
							
							
								   jos
							
						 | 
						
							
							
							
								
							
								bc3e4a26d1
								
							
								
							
						 | 
						
							
							
								
								Fixed #782: Contents of items created from a template being unnecessary recreated on click, causing mouse events to get lost.
							
							
							
							
								
							
							
						 | 
						10 years ago | 
					
				
					
						
							
							
								   jos
							
						 | 
						
							
							
							
								
							
								41cdb2f389
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/v4' into v4
							
							
							
							
								
							
							
						 | 
						10 years ago | 
					
				
					
						
							
							
								   jos
							
						 | 
						
							
							
							
								
							
								670c8a0cb9
								
							
								
							
						 | 
						
							
							
								
								Fixed issues with preventDefault and with clicking achors/buttons in items on mobile devices
							
							
							
							
								
							
							
						 | 
						10 years ago | 
					
				
					
						
							
							
								   Alex de Mulder
							
						 | 
						
							
							
							
								
							
								6d8974bda0
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/v4' into v4
							
							
							
							
								
							
							
						 | 
						10 years ago | 
					
				
					
						
							
							
								   Alex de Mulder
							
						 | 
						
							
							
							
								
							
								06ce63eb42
								
							
								
							
						 | 
						
							
							
								
								removed duplicate code
							
							
							
							
								
							
							
						 | 
						10 years ago | 
					
				
					
						
							
							
								   Alex de Mulder
							
						 | 
						
							
							
							
								
							
								cc129694f6
								
							
								
							
						 | 
						
							
							
								
								bug fixes, methods added and options changed to clean up code and to adhere to docs
							
							
							
							
								
							
							
						 | 
						10 years ago | 
					
				
					
						
							
							
								   jos
							
						 | 
						
							
							
							
								
							
								48278b921c
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/v4' into v4
							
							
							
							
								
							
							
						 | 
						10 years ago | 
					
				
					
						
							
							
								   jos
							
						 | 
						
							
							
							
								
							
								3ddd43adba
								
							
								
							
						 | 
						
							
							
								
								Fixed outputting errors from webpack/babel-loader
							
							
							
							
								
							
							
						 | 
						10 years ago | 
					
				
					
						
							
							
								   Alex de Mulder
							
						 | 
						
							
							
							
								
							
								de9334458b
								
							
								
							
						 | 
						
							
							
								
								renamed option showNavigationIcons to navigationButtons
							
							
							
							
								
							
							
						 | 
						10 years ago | 
					
				
					
						
							
							
								   Alex de Mulder
							
						 | 
						
							
							
							
								
							
								8fe1b70c0a
								
							
								
							
						 | 
						
							
							
								
								fixed bug in navigation
							
							
							
							
								
							
							
						 | 
						10 years ago | 
					
				
					
						
							
							
								   Alex de Mulder
							
						 | 
						
							
							
							
								
							
								3292c02e5a
								
							
								
							
						 | 
						
							
							
								
								rebuilt
							
							
							
							
								
							
							
						 | 
						10 years ago | 
					
				
					
						
							
							
								   Alex de Mulder
							
						 | 
						
							
							
							
								
							
								8a57330192
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/v4' into v4
							
							
							
							
								
							
							
						 | 
						10 years ago | 
					
				
					
						
							
							
								   Alex de Mulder
							
						 | 
						
							
							
							
								
							
								6393f3eda1
								
							
								
							
						 | 
						
							
							
								
								added shadow option to nodes and edges
							
							
							
							
								
							
							
						 | 
						10 years ago | 
					
				
					
						
							
							
								   jos
							
						 | 
						
							
							
							
								
							
								29ea22b611
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/v4' into v4
							
							
							
							
								
							
							
						 | 
						10 years ago | 
					
				
					
						
							
							
								   jos
							
						 | 
						
							
							
							
								
							
								1e98740b3f
								
							
								
							
						 | 
						
							
							
								
								Refactored css of manipulation menu
							
							
							
							
								
							
							
						 | 
						10 years ago | 
					
				
					
						
							
							
								   jos
							
						 | 
						
							
							
							
								
							
								31599b9fd8
								
							
								
							
						 | 
						
							
							
								
								Refactored css of network navigation
							
							
							
							
								
							
							
						 | 
						10 years ago | 
					
				
					
						
							
							
								   Alex de Mulder
							
						 | 
						
							
							
							
								
							
								9b5fb0cd35
								
							
								
							
						 | 
						
							
							
								
								rebuilt again after merge
							
							
							
							
								
							
							
						 | 
						10 years ago | 
					
				
					
						
							
							
								   Alex de Mulder
							
						 | 
						
							
							
							
								
							
								8c1a4706d1
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/v4' into v4
							
							
							
							
								
							
							
						 | 
						10 years ago | 
					
				
					
						
							
							
								   Alex de Mulder
							
						 | 
						
							
							
							
								
							
								8d509ed4c5
								
							
								
							
						 | 
						
							
							
								
								rebuilt
							
							
							
							
								
							
							
						 | 
						10 years ago | 
					
				
					
						
							
							
								   jos
							
						 | 
						
							
							
							
								
							
								cdaf6682b2
								
							
								
							
						 | 
						
							
							
								
								Renamed `unified` to `shared`
							
							
							
							
								
							
							
						 | 
						10 years ago | 
					
				
					
						
							
							
								   jos
							
						 | 
						
							
							
							
								
							
								0d2cd482e1
								
							
								
							
						 | 
						
							
							
								
								Refactored css of ColorPicker and Popup
							
							
							
							
								
							
							
						 | 
						10 years ago | 
					
				
					
						
							
							
								   Alex de Mulder
							
						 | 
						
							
							
							
								
							
								3c8d01eaa8
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/v4' into v4
							
							
							
							
								
							
							
						 | 
						10 years ago | 
					
				
					
						
							
							
								   Alex de Mulder
							
						 | 
						
							
							
							
								
							
								0469a7c6a2
								
							
								
							
						 | 
						
							
							
								
								reworked some of the options
							
							
							
							
								
							
							
						 | 
						10 years ago | 
					
				
					
						
							
							
								   jos
							
						 | 
						
							
							
							
								
							
								7c836534e8
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/v4' into v4
							
							
							
							
								
							
							
						 | 
						10 years ago | 
					
				
					
						
							
							
								   jos
							
						 | 
						
							
							
							
								
							
								b3e3dccad7
								
							
								
							
						 | 
						
							
							
								
								Refactored the css of Timeline and Graph2d to have a `vis-` prefix everywhere. (Still a small issue in Graph2d)
							
							
							
							
								
							
							
						 | 
						10 years ago | 
					
				
					
						
							
							
								   Alex de Mulder
							
						 | 
						
							
							
							
								
							
								6e7553bc35
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/v4' into v4
							
							
							
							
								
							
							
						 | 
						10 years ago | 
					
				
					
						
							
							
								   Alex de Mulder
							
						 | 
						
							
							
							
								
							
								b12044333d
								
							
								
							
						 | 
						
							
							
								
								updated option stucture to use static methods to avoid duplicate definitions
							
							
							
							
								
							
							
						 | 
						10 years ago | 
					
				
					
						
							
							
								   jos
							
						 | 
						
							
							
							
								
							
								ef470ff0a6
								
							
								
							
						 | 
						
							
							
								
								Beep on error
							
							
							
							
								
							
							
						 | 
						10 years ago | 
					
				
					
						
							
							
								   jos
							
						 | 
						
							
							
							
								
							
								e6dd6712ea
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/v4' into v4
							
							
							
							
							
							
								
							
							
							Conflicts:
	lib/network/modules/components/edges/BezierEdgeDynamic.js 
							
						 | 
						10 years ago | 
					
				
					
						
							
							
								   jos
							
						 | 
						
							
							
							
								
							
								8613f79195
								
							
								
							
						 | 
						
							
							
								
								Updated dependencies
							
							
							
							
								
							
							
						 | 
						10 years ago | 
					
				
					
						
							
							
								   jos
							
						 | 
						
							
							
							
								
							
								e881a78462
								
							
								
							
						 | 
						
							
							
								
								replaced `6to5` with `babel`, letting webpack output errors, minor fix
							
							
							
							
								
							
							
						 | 
						10 years ago | 
					
				
					
						
							
							
								   Alex de Mulder
							
						 | 
						
							
							
							
								
							
								517263a27e
								
							
								
							
						 | 
						
							
							
								
								minor changes, adhere to ES6 in bezier edge dynamic
							
							
							
							
								
							
							
						 | 
						10 years ago | 
					
				
					
						
							
							
								   Alex de Mulder
							
						 | 
						
							
							
							
								
							
								2d7a1b2a1f
								
							
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/v4' into v4
							
							
							
							
								
							
							
						 | 
						10 years ago | 
					
				
					
						
							
							
								   jos
							
						 | 
						
							
							
							
								
							
								7248587d67
								
							
								
							
						 | 
						
							
							
								
								Removed spam
							
							
							
							
								
							
							
						 | 
						10 years ago |