playGraph - null

	Commit message (Collapse)	Author	Age	Files	Lines
*	merge css	Nicolas Bornand	2014-05-11	3	-29/+9
\|
*	Merge origin/master	Nicolas Bornand	2014-05-11	1	-40/+13
\| \| \| \|	Conflicts: app/js/services.js
*	cleanup after merge	Jakob Odersky	2014-05-11	3	-7/+4
\|
*	Merge branch 'ludo' of github.com:jodersky/playGraph into dirty	Jakob Odersky	2014-05-11	4	-0/+212
\|\
\| *	add template	Ludovic Barman	2014-05-11	4	-0/+212
\| \|
* \|	Merge branch 'master' of github.com:jodersky/playGraph into dirty	Jakob Odersky	2014-05-11	1	-4/+5
\|\ \
\| * \|	Merge origin/master	Nicolas Bornand	2014-05-11	1	-4/+5
\| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: app/js/services.js
* \| \|	add filter (not working)	Jakob Odersky	2014-05-11	2	-6/+4
\|\\| \|
\| * \|	Merge origin/master	Nicolas Bornand	2014-05-11	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: app/js/services.js
\| * \|	Merge origin/master	Nicolas Bornand	2014-05-11	1	-40/+13
\| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: app/js/services.js
\| * \|	Merge origin/master	Nicolas Bornand	2014-05-11	2	-2/+11
\| \|\ \
\| * \| \|	Merge origin/master	Nicolas Bornand	2014-05-11	1	-1/+1
\| \| \|/ \| \|/\| \| \| \| \| \| \|	Conflicts: app/js/services.js
* \| \|	stash	Jakob Odersky	2014-05-11	3	-3/+12
\| \|/ \|/\|
* \|	Merge branch 'master' of github.com:jodersky/playGraph	Jakob Odersky	2014-05-11	1	-1/+3
\|\\|
\| *	Merge origin/master	Nicolas Bornand	2014-05-11	5	-27/+262
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: app/js/services.js
\| * \|	modify the way points are randomly chosen	Nicolas Bornand	2014-05-11	1	-1/+1
\| \| \|
* \| \|	smooth instead of simplify	Jakob Odersky	2014-05-11	2	-2/+11
\| \|/ \|/\|
* \|	working canvas	Jakob Odersky	2014-05-11	4	-5/+19
\| \|
* \|	Merge branch 'master' of github.com:jodersky/playGraph into html	Jakob Odersky	2014-05-11	1	-3/+6
\|\\|
\| *	modify the way points are randomly chosen	Nicolas Bornand	2014-05-10	1	-4/+6
\| \|
\| *	modify the way points are randomly chosen	Nicolas Bornand	2014-05-10	1	-0/+1
\| \|
* \|	new canvas	Jakob Odersky	2014-05-11	4	-46/+138
\| \|
* \|	wip - paperjs directive	Jakob Odersky	2014-05-11	3	-107/+128
\| \|
* \|	stash	Jakob Odersky	2014-05-10	2	-3/+109
\|/
*	modify the way points are randomly chosen	Nicolas Bornand	2014-05-10	1	-15/+7
\|
*	show playlist	Jakob Odersky	2014-05-10	5	-20/+22710
\|
*	add array clone in computePlaylist()	Nicolas Bornand	2014-05-10	1	-5/+6
\|
*	Merge origin/master	Nicolas Bornand	2014-05-10	2	-0/+12905
\|\
\| *	Adds Line-Simplifier.	Ludovic Barman	2014-05-10	2	-0/+12905
\| \|
* \|	add path service	Nicolas Bornand	2014-05-10	1	-3/+3
\|/
*	add path service	Nicolas Bornand	2014-05-10	1	-1/+1
\|
*	add path service	Nicolas Bornand	2014-05-10	1	-1/+0
\|
*	add path service	Nicolas Bornand	2014-05-10	1	-2/+3
\|
*	Merge branch 'master' of github.com:jodersky/playGraph	Jakob Odersky	2014-05-10	2	-6/+37
\|\ \| \| \| \| \| \| \| \|	Conflicts: app/js/controllers.js
\| *	add path service	Nicolas Bornand	2014-05-10	2	-6/+46
\| \|
* \|	Merge branch 'master' of github.com:jodersky/playGraph	Jakob Odersky	2014-05-10	4	-1/+29
\|\\| \| \| \| \| \| \| \| \| \| \|	Conflicts: app/js/app.js app/js/controllers.js
\| *	add path service	Nicolas Bornand	2014-05-10	4	-1/+25
\| \|
* \|	add dummy points	Jakob Odersky	2014-05-10	4	-4/+160
\|/
*	boostrap modified	Nicolas Bornand	2014-05-10	3	-12/+25
\|
*	move to angularjs	Jakob Odersky	2014-05-10	11	-0/+252