Commit graph

49 commits

Author SHA1 Message Date
Peter Cottle
d99498076e Merge pull request #55 from donkirkby/patch-1
Typo fixes
2013-02-23 23:36:04 -08:00
Peter Cottle
a0c8c34522 big intl update, only polishing left, Issue #42 2013-02-23 23:31:30 -08:00
Peter Cottle
7e165c6fdc zomg so many keys 2013-02-23 23:07:03 -08:00
Don Kirkby
c58e4f687f Grammar tweak: "method of your choosing." 2013-02-23 21:36:41 -08:00
Don Kirkby
93dfb67075 Typo "chose" -> "choose". 2013-02-23 21:34:44 -08:00
Peter Cottle
3adec8d88a more intl Issue #42 2013-02-23 21:19:52 -08:00
Peter Cottle
cded665873 imported Korean dialogs Issue #42 other dialogs, level names, etc will come later 2013-02-23 15:00:24 -08:00
Peter Cottle
cc5466b038 Imported all zh_CN dialogs and added locale changing support Issue #42 2013-02-23 14:31:40 -08:00
Peter Cottle
2617357460 Basic dialog intl support for level dialogs, Issue #42 2013-02-23 13:32:45 -08:00
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
Peter Cottle
c90444fe1e Better goal tree and hint and solution. Fixes Issue #37 2013-02-18 13:24:08 -08:00
Peter Cottle
bf6432b286 better tree comparsion from Issue #28 2013-02-18 09:36:52 -08: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
Shao-Chung Chen
d3ab5a1a7d fix an typo in mixed-2 2013-02-17 14:08:00 +08:00
Shao-Chung Chen
6bf593b787 fix a typo in rebase1 2013-02-17 12:51:57 +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
bd68e9ddf3 Fixes Issue #3 2013-02-16 16:20:36 -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
0cb6e43549 new levelll 2013-01-12 23:07:14 -08:00
Peter Cottle
98400dd88f rebase! woo 2013-01-12 22:58:23 -08:00
Peter Cottle
ac0497bc69 mixed 3 2013-01-12 22:48:45 -08:00
Peter Cottle
4b1ddfa86e mixed bag level 2 2013-01-12 22:40:21 -08:00
Peter Cottle
d8a61f1611 mixed 2 2013-01-12 22:37:02 -08:00
Peter Cottle
1c71bc05e7 edited 2013-01-12 22:24:44 -08:00
Peter Cottle
e78f59dba2 new sequence 2013-01-12 22:22:58 -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
8086d2b2b1 awesome work dialog editor legit 2013-01-10 21:21:53 -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
37654162cb another level 2013-01-07 12:32:00 -08:00
Peter Cottle
e55fba333d kleybarod naviation 2013-01-07 01:30:19 -08:00
Peter Cottle
cad801fafe multiview workign 2013-01-07 00:38:43 -08:00
Peter Cottle
378fcc0377 pretty legit level dropdown 2013-01-06 23:34:39 -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
Peter Cottle
efd656059e much more sane 2012-12-14 01:40:43 -08:00
Peter Cottle
b21185dd34 everything moved somewhere now 2012-12-14 01:33:10 -08:00