22 commits

Author	SHA1	Message	Date
Aaron Schrab	df4452290b	Target branch can't be second argument to merge ... Remove instances in tutorial where the target branch for a merge is supplied as a second argument to `git merge`. The target branch for merge is always the current branch.	2013-02-20 22:45:03 -05:00
CameronWills	b42400c0c8	Update src/levels/intro/4.js ... Fixed minor typo in instructions.	2013-02-18 22:34:25 +11:00
Peter Cottle	7a8d4abb59	Fixes Issue #30	2013-02-17 17:09:33 -08:00
Adam Brodzinski	734dd49634	Fixes typo in lesson 1.3 alert steps modal ... I noticed there's a typo in the 1.3 alert modal. If you follow the directions to the T, it won't pass because it commits to the wrong branch. It needs to say make a new branch called `bugFix`, then `git checkout bugFix`, then commit. Screenshot with commands in working order: http://cl.ly/image/3V0n192R1p21 Tests Pass: 13 tests, 13 assertions, 0 failures I couldn't get it to build to test the text displaying in browser, so that still needs to be tested.	2013-02-17 15:10:21 -05:00
Peter Cottle	b0f19e91e4	Merge pull request #21 from lkysow/bugfix/typo-in-intro-5 ... Fix incorrect commit number in intro 5	2013-02-17 03:27:05 -08:00
Tobias Pfeiffer	86a7b99324	Update src/levels/intro/1.js ... Fixed a little typo (the all the files)	2013-02-17 10:03:44 +01:00
Luke Kysow	e7b8293c69	Fix incorrect commit number in intro 5	2013-02-17 00:41:55 -08:00
Peter Cottle	0ca8f79880	Fixes Issue #15 thanks @caspark!	2013-02-16 20:41:20 -08:00
Peter Cottle	797f8b0c55	Rewrite of intro dialog, thanks @Cogito Issue #13	2013-02-16 19:16:23 -08:00
Peter Cottle	19792440f8	Fixes Issue #7	2013-02-16 15:35:08 -08:00
Peter Cottle	168852b293	resolves Issue 6	2013-02-16 15:28:59 -08:00
Peter Cottle	84d31e925d	level 5 on resetting and reverting	2013-01-12 22:10:32 -08:00
Peter Cottle	a83a12b211	levle 4 cute	2013-01-12 01:50:18 -08:00
Peter Cottle	bde5681573	fixed a little rebase bug	2013-01-12 01:31:40 -08:00
Peter Cottle	9249ef0604	level 2 and 3	2013-01-12 01:02:48 -08:00
Peter Cottle	1fae2f18bc	level 2	2013-01-12 00:37:43 -08:00
Peter Cottle	0b81e90137	level 1	2013-01-12 00:18:57 -08:00
Peter Cottle	b7f1637562	descriptions also for levels	2013-01-10 20:00:59 -08:00
Peter Cottle	d406317788	no more ids on levels, its generated automatically, and index utilization	2013-01-09 12:49:40 -08:00
Peter Cottle	cad801fafe	multiview workign	2013-01-07 00:38:43 -08:00
Peter Cottle	ca33b7ce1b	level scaffolding	2013-01-05 22:21:00 -08:00
Peter Cottle	903b537fda	levels starting	2013-01-05 22:07:50 -08:00