Commit graph

163 commits

Author SHA1 Message Date
Peter Cottle
15c2224d56 TWO new levels, cherry-pick intro and rebase -i intro, and rebuild for Issue #120 2013-07-28 20:38:04 -07:00
Peter Cottle
d4d7fb21c7 BOOM two new awesome levels before rebase 9000 2013-07-28 18:19:15 -07:00
Peter Cottle
0aadae766f big refactor looking a lot better now 2013-07-28 12:12:00 -07:00
Peter Cottle
e422bdb181 big commands refactor in prep for hackathon 2013-07-27 23:49:27 -07:00
Peter Cottle
5ec8a2916f big command factoring 2013-07-27 22:46:46 -07:00
Peter Cottle
af3d440874 facebook page link and logging 2013-07-27 15:05:23 -07:00
Peter Cottle
740a94ccf6 fixed vis for remote git demonstration views 2013-07-27 14:51:04 -07:00
Peter Cottle
6804403d66 make rmote levels conditional 2013-07-25 09:33:40 -07:00
Peter Cottle
c4ae821cef AWESOME origin compare within trees and levels, visualizations down, finish animation chain fixed, everything is awesome here. ready fororigin levels 2013-07-24 21:41:53 -07:00
Peter Cottle
7a00bd09f6 rebuild with awesome new test coverage 2013-07-24 12:44:22 -07:00
Peter Cottle
debd5f9fed one more test 2013-07-24 09:57:21 -07:00
Peter Cottle
219c36054f Merge branch 'master' into getStringNow
Conflicts:
	build/bundle.min.js
	index.html
	todo.txt

Conflicts:
	build/bundle.min.js
	index.html
	todo.txt
2013-07-21 18:43:20 -07:00
Peter Cottle
2be03a7f1c rebuild for Issue #111 2013-07-21 18:40:45 -07:00
Peter Cottle
a95a56241b Finally fixed async git dispatching and promise chains, fixed rebase level Issue #111 2013-07-21 18:40:26 -07:00
Peter Cottle
62867c9f43 fake teamwork better 2013-07-16 09:11:26 -07:00
Peter Cottle
f7af08c5fe finally have get string now 2013-07-12 18:28:45 -07:00
Peter Cottle
7d3d19b543 rebuild for issue #118 2013-07-12 14:31:39 -07:00
Peter Cottle
d2e418641f demonstration view fix WIP 2013-07-07 23:24:11 -07:00
Peter Cottle
b7fb355b97 awesome faded branches for level comparing done 2013-07-07 21:01:21 -07:00
Peter Cottle
264f245275 WIP on legend for goal 2013-07-07 15:26:03 -07:00
Peter Cottle
67570f716d fixed merge case with existing commits 2013-07-07 14:06:25 -07:00
Peter Cottle
e382004a55 Removed one TODO -- better cloning of all branches, origin/master setup automatically, and fake teamwork anywhere 2013-07-04 18:09:53 -07:00
Peter Cottle
11a3062797 Rebuild for Issue #114 Pull #116 2013-07-04 17:46:31 -07:00
Peter Cottle
92e2e303ed [Origin] Fixed pull command throwing too early during no fetch case 2013-07-04 17:27:03 -07:00
Peter Cottle
63a88a6885 Rebuild for awesome translation work by Joël Thieffry Pull #113 Issue #113 2013-06-29 09:54:03 -07:00
Peter Cottle
62317b8d4c Root commit regression Issue #100 2013-06-29 00:22:41 -07:00
Peter Cottle
fad9661f30 fixed git push target graph difference method bug 2013-06-27 18:47:39 -07:00
Peter Cottle
c974ffed8e bit of remote work2 2013-06-24 08:59:06 -07:00
Peter Cottle
af632eaa5e bit of remote work 2013-06-24 08:59:02 -07:00
Peter Cottle
e99dce8948 Issue 106 exit button on first slide 2013-06-15 21:57:02 -07:00
Peter Cottle
31ad2a586b Issue #105 making objective more discoverable 2013-06-15 20:59:47 -07:00
Peter Cottle
73f7e2638b build for pull --rebase 2013-06-11 20:55:50 -07:00
Peter Cottle
aed8ce29f3 real pull --rebase fixed 2013-06-11 20:52:34 -07:00
Peter Cottle
bbfb4d7512 git pull --rebase now done 2013-06-11 20:41:43 -07:00
Peter Cottle
7b68e0da73 whoops broke all levels Issue #104 2013-06-11 10:03:11 -07:00
Peter Cottle
c7da989845 awesome have part of git push working 2013-06-11 09:28:14 -07:00
Peter Cottle
3458cc17af awesome new pull animation 2013-06-10 21:30:54 -07:00
Peter Cottle
d80ae31adc awesome pull animation now 2013-06-10 21:09:09 -07:00
Peter Cottle
b090cef461 awesome, git fetch working super well 2013-06-10 20:21:50 -07:00
Peter Cottle
6cc0b182cc WIP working on get target graph difference 2013-06-08 22:40:46 -07:00
Peter Cottle
6e75e04daf awesome tree compare coverage for tests, no bugs found though 2013-06-08 15:57:33 -10:00
Peter Cottle
a7e515dd8c final polish on visbranch update 2013-06-05 18:27:55 -10:00
Peter Cottle
e38d747780 before deletion 2013-06-04 15:28:27 -10:00
Peter Cottle
dbdb37099d promise animation 2013-06-02 16:21:47 -07:00
Peter Cottle
aba8265a00 [Origin] few updates 2013-05-27 11:04:47 -07:00
Peter Cottle
29415cb525 [Origin] git pull done wow that was easy 2013-05-27 10:56:35 -07:00
Peter Cottle
a24f62420d [Origin] Some origin work around remote branches 2013-05-27 10:31:50 -07:00
Peter Cottle
6080d324ce [Origin] Implement basic git fetch force need to fix up animations 2013-05-26 23:44:07 -07:00
Peter Cottle
3a23973a9a fake teamwork done 2013-05-26 21:58:57 -07:00
Peter Cottle
cbcd489a31 [Origin] wow have tree string and undo working flawlessly, somewhat hacky but very robust all things considered 2013-05-26 18:21:38 -07:00