894 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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	e409c44ab3	have tree compare working for origin, money	2013-07-24 12:38:40 -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	380bcfaa4b	fake teamwork better	2013-07-16 09:13:11 -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	f1752d115b	fix objective thing Issue #118	2013-07-12 14:39:00 -07:00
Peter Cottle	c2c3d2b3c0	asd	2013-07-12 14:36:24 -07:00
Peter Cottle	7d3d19b543	rebuild for issue #118	2013-07-12 14:31:39 -07:00
Peter Cottle	cfc36d9ef8	fix objective thing Issue #118	2013-07-12 14:31:17 -07:00
Peter Cottle	bbb668b016	WIP for get tree quick	2013-07-10 20:55:06 -07:00
Peter Cottle	6c487cc053	WIP everything is horribly broken testa bunch before pushing but something in git is messed up if you do get tree quick who knows	2013-07-07 23:29:28 -07:00
Peter Cottle	d2e418641f	demonstration view fix WIP	2013-07-07 23:24:11 -07:00
Peter Cottle	e6942446df	headless wip	2013-07-07 22:10:12 -07:00
Peter Cottle	b7fb355b97	awesome faded branches for level comparing done	2013-07-07 21:01:21 -07:00
Peter Cottle	e7f5acaece	awesome faded branches for level comparing done	2013-07-07 21:01:06 -07:00
Peter Cottle	19f204ddcb	visuals down for non essential branches	2013-07-07 20:44:46 -07:00
Peter Cottle	264f245275	WIP on legend for goal	2013-07-07 15:26:03 -07:00
Peter Cottle	ea30b42616	Tests all greengs! woooo	2013-07-07 14:10:57 -07:00
Peter Cottle	afebc47c4a	Fixed a bunch of the async tests, porting over to git spec	2013-07-07 14:07:17 -07:00
Peter Cottle	67570f716d	fixed merge case with existing commits	2013-07-07 14:06:25 -07:00
Peter Cottle	87c787c8af	before test fix	2013-07-07 12:43:02 -07:00
Peter Cottle	f682f42aa0	starting on push bug for git merge C3;git merge master;go master;git merge side;git push;gc; git reset HEAD~1; git clone; gc; git merge C2; git push;	2013-07-05 09:58:57 -07:00
Peter Cottle	cb54364d6a	todo	2013-07-04 18:10:30 -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	a22f033807	Merge pull request #116 from nkouevda/master ... Remove case insensitive refs check	2013-07-04 17:44:45 -07:00
Nikita Kouevda	fc24f3c145	Remove case insensitive refs check.	2013-07-04 17:41:30 -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	59bafd2e28	Merge pull request #113 from Nioub/frenchTranslation ... translated all fr_FR except in levels	2013-06-29 09:53:01 -07:00
Joël Thieffry	27ccab4dec	translated all fr_FR except in levels	2013-06-29 18:16:25 +02: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	c98f979885	Add noscript Issue #107	2013-06-26 18:15:38 -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	8a4f8baafb	todo stuff for remote tracking	2013-06-17 21:01:51 -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	3b8649c891	todo	2013-06-11 21:00:53 -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	69e6cc0472	readme names for Issue #104	2013-06-11 10:30:51 -07:00
Peter Cottle	7b68e0da73	whoops broke all levels Issue #104	2013-06-11 10:03:11 -07:00