Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | improve path computations speedHEADmaster | Nicolas Bornand | 2014-05-12 | 3 | -4/+171 |
| | |||||
* | add songs | Nicolas Bornand | 2014-05-11 | 5 | -208/+171 |
| | |||||
* | add songs | Nicolas Bornand | 2014-05-11 | 1 | -0/+1 |
| | |||||
* | Merge branch 'master' of github.com:jodersky/playGraph | Jakob Odersky | 2014-05-11 | 2 | -32/+119 |
|\ | |||||
| * | Merge origin/master | Nicolas Bornand | 2014-05-11 | 3 | -2/+7 |
| |\ | |||||
| * | | add songs | Nicolas Bornand | 2014-05-11 | 2 | -32/+119 |
| | | | |||||
* | | | Merge branch 'master' of github.com:jodersky/playGraph | Jakob Odersky | 2014-05-11 | 3 | -4/+7 |
|\ \ \ | | |/ | |/| | | | | | | | Conflicts: app/index.html | ||||
| * | | New | Ludovic Barman | 2014-05-11 | 1 | -1/+1 |
| | | | |||||
| * | | CSS Updated | Ludovic Barman | 2014-05-11 | 1 | -0/+6 |
| | | | |||||
| * | | new | Ludovic Barman | 2014-05-11 | 1 | -1/+0 |
| |/ | |||||
* / | resize video | Jakob Odersky | 2014-05-11 | 1 | -1/+1 |
|/ | |||||
* | LBARMAN final | Ludovic Barman | 2014-05-11 | 3 | -8/+15 |
| | |||||
* | Merge branch 'master' of github.com:jodersky/playGraph | Jakob Odersky | 2014-05-11 | 1 | -0/+13 |
|\ | |||||
| * | add song | Nicolas Bornand | 2014-05-11 | 1 | -3/+11 |
| | | |||||
| * | Go | Ludovic Barman | 2014-05-11 | 1 | -0/+5 |
| | | |||||
* | | update dummy data | Jakob Odersky | 2014-05-11 | 1 | -26/+26 |
| | | |||||
* | | undo previous changes | Jakob Odersky | 2014-05-11 | 2 | -22/+2 |
| | | |||||
* | | refactor app.css | Jakob Odersky | 2014-05-11 | 3 | -3/+15 |
|/ | |||||
* | Merge branch 'master' of github.com:jodersky/playGraph | Jakob Odersky | 2014-05-11 | 6 | -13/+59 |
|\ | | | | | | | | | Conflicts: app/js/directives.js | ||||
| * | Working version YoutubePlayer | Ludovic Barman | 2014-05-11 | 3 | -5/+32 |
| | | |||||
| * | color changes | Nicolas Bornand | 2014-05-11 | 2 | -2/+7 |
| | | |||||
* | | refactor line drawing | Jakob Odersky | 2014-05-11 | 3 | -4/+52 |
|/ | |||||
* | do some cleanup | Jakob Odersky | 2014-05-11 | 3 | -59/+8 |
| | |||||
* | remove world padding | Jakob Odersky | 2014-05-11 | 1 | -4/+0 |
| | |||||
* | Merge branch 'jodersky' | Jakob Odersky | 2014-05-11 | 1 | -5/+1 |
|\ | |||||
| * | add graphing | Jakob Odersky | 2014-05-11 | 1 | -5/+1 |
| | | |||||
* | | Merge origin/master | Nicolas Bornand | 2014-05-11 | 4 | -42/+36 |
|\| | |||||
| * | Merge branch 'jodersky' | Jakob Odersky | 2014-05-11 | 4 | -42/+36 |
| |\ | |||||
| | * | refactor playlist to playseq | Jakob Odersky | 2014-05-11 | 3 | -13/+13 |
| | | | |||||
| | * | reinstore scope for adding graph edges | Jakob Odersky | 2014-05-11 | 2 | -4/+13 |
| | | | |||||
| | * | remove ability to move timeline | Jakob Odersky | 2014-05-11 | 2 | -31/+16 |
| | | | |||||
* | | | song label | Nicolas Bornand | 2014-05-11 | 3 | -32/+60 |
|/ / | |||||
* | | song label | Nicolas Bornand | 2014-05-11 | 4 | -6/+22 |
| | | |||||
* | | 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 | 5 | -0/+299 |
|\ | |||||
| * | add template | Ludovic Barman | 2014-05-11 | 5 | -0/+299 |
| | | |||||
* | | 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 |
| |/ |/| |