Commit graph

664 commits

Author SHA1 Message Date
Peter Cottle
2000f95a95 logging for inspiration 2013-05-11 23:19:50 -07:00
Peter Cottle
9637c0cfa6 logging to regain inspiration 2013-05-11 23:19:33 -07:00
Peter Cottle
e1276066d0 Switching level for Issue #84 2013-04-23 16:34:23 -07:00
Peter Cottle
7d8cf62482 Rebuild for Pull #83 Issue #83 awesome zh_CN translation work thanks @yinchuan 2013-04-22 19:44:22 -07:00
Peter Cottle
5a3a242d99 Merge pull request #83 from yinchuan/master
add some level's Chinese translation
2013-04-22 19:41:58 -07:00
yinchuan
f83631e2ab add Chinese translation to all levels in 'Ramping up','Advanced Topics' and modify the other levels's translation except those in 'A Mixed Bag'. 2013-04-23 07:58:37 +08:00
Peter Cottle
2483a0588a origin support start 2013-04-07 11:14:42 -07:00
Peter Cottle
e64aebf880 transition from .com to .io thanks Egor for awesome security work :D haha 2013-04-07 10:18:30 -07:00
Peter Cottle
af78b172da hoping tof ix layout 2013-03-24 14:46:38 -07:00
Peter Cottle
cb1d50850b add it to the intl thing 2013-03-24 14:42:19 -07:00
Peter Cottle
66da06b8ea fix bug for untranslated levels 2013-03-24 14:39:17 -07:00
Peter Cottle
678e49c864 rebuild 2013-03-24 14:36:24 -07:00
Peter Cottle
4f96e7ebf9 rebuild 2013-03-24 14:35:58 -07:00
Peter Cottle
72c30ebdbc Rebuild for Issue #82 2013-03-24 14:34:42 -07:00
Peter Cottle
dce569165d Merge Japanese translation ings! That wasn't too bad Issue #82 2013-03-24 14:33:13 -07:00
Peter Cottle
2957cdf966 Non breaking space Issue #81 2013-03-23 21:46:36 -07:00
Peter Cottle
b1d0b896bc other icon for qs 2013-03-23 17:27:11 -07:00
Peter Cottle
f2fc61081b Helper Bar and intl switching Issue #45 and Issue #69 and Issue #39 2013-03-23 17:18:14 -07:00
Peter Cottle
b768f7a083 better level filenames and slightly less silly names for better usage 2013-03-23 15:41:10 -07:00
Don Kirkby
f5484ac7e7 Rebuild for Don Kirby's punctuation improvements 2013-03-23 15:27:39 -07:00
Peter Cottle
c30c113d51 Hover events on level icons to expose names Issue #81 2013-03-23 15:22:23 -07:00
Peter Cottle
1c35c8bf42 Merge remote-tracking branch 'origin/master' 2013-03-23 15:22:05 -07:00
Don Kirkby
2c44f37880 Improve punctuation in advanced level 1. 2013-03-23 14:19:08 -07:00
Peter Cottle
f37e475067 Merge branch 'master' into gh-pages 2013-03-23 13:25:35 -07:00
Peter Cottle
d719f17646 Revert "Better flip logic, visuals improvement, and also advanced level section"
This reverts commit 5aa831fc85.
2013-03-23 13:24:38 -07:00
Peter Cottle
57db1be39e Better flip logic, visuals improvement, and also advanced level section
featuring Aaron's modifier tutorial

Merge pull request #80 from aschrab/multiple_parents
2013-03-23 13:12:00 -07:00
Peter Cottle
5aa831fc85 Better flip logic, visuals improvement, and also advanced level section
featuring Aaron's modifier tutorial

Merge pull request #80 from aschrab/multiple_parents
2013-03-23 13:10:35 -07:00
Peter Cottle
46d71cd93a Merge pull request #77 from aschrab/work_tree
Remove incorrect information about HEAD
2013-03-23 12:00:14 -07:00
Aaron Schrab
36ad66e11e Replace incorrect information about HEAD
Avoid stating that changing HEAD alters the working tree.  Although that
is a common next step they are not actually the same action and can be
done independently (e.g. `git reset` without `--hard`).

Also state that committing while on a branch only alters the branch,
without actually changing HEAD; HEAD only gets the new commit because it
points to the branch rather than a specific commit.
2013-03-22 14:59:16 -04:00
Aaron Schrab
df2174682c Use relative URL for ?NODEMO
Change the NODEMO link to use a relative URL so that clicking the URL in
a development build will remain in that development build rather than
going to the main site.
2013-03-22 13:46:32 -04:00
Aaron Schrab
63edf8cb4c Swap parents of final commit in intro/3 level goal
Change the order of parents of the final commit in the goal of the level
intro/3 to match the history produced by the expected solution. Although
either order is accepted the new, consistent order of parents is the
more idiomatic one merging a bugFix into master rather than master into
bugFix. Actually producing the old goal would require more commands.

Even though ordering of parents is too advanced of a topic to be covered
this early, it would be nice to keep that consistent.
2013-03-22 13:25:44 -04:00
Peter Cottle
9f8f01521c Rebuild for Pull #79 and Pull #78 2013-03-21 19:58:02 -07:00
Peter Cottle
2fb8ce21ae Merge pull request #79 from donkirkby/ramp-up-typos
Typos, clarifications, and a missing hint for the ramp up levels.
2013-03-21 19:53:37 -07:00
Don Kirkby
958e367469 Typos, clarifications, and a missing hint for the ramp up levels. 2013-03-21 09:29:20 -07:00
Peter Cottle
8f9986fb5b Merge pull request #78 from aschrab/grandparent
Don't refer to grandparent commit as second parent
2013-03-20 15:25:05 -07:00
Aaron Schrab
aef97ecd09 Don't refer to grandparent commit as second parent
The term "second parent" has a specific meaning in git that is distinct
from a grandparent, so avoid referring to a grandparent (~2) as a second
parent (^2).
2013-03-20 16:58:35 -04:00
Peter Cottle
68223505ce temp 2013-03-15 22:03:43 -07:00
Peter Cottle
e081c47e31 Objective and Assignment commands Issue #76 works even in level builder 2013-03-10 17:50:42 -07:00
Peter Cottle
63a8d385bf box shadow 2013-03-10 13:00:33 -07:00
Peter Cottle
427b45f60f rebuild for CSS changes 2013-03-10 12:57:42 -07:00
Peter Cottle
3eab0aec44 Redid level comparison algo for Juggling Commits #1 Issue #28 2013-03-10 12:18:27 -07:00
Peter Cottle
08523b0de2 WOOHOOOOOOO assertion engine complete. Issue #28 this is crazy 2013-03-10 12:11:09 -07:00
Peter Cottle
f9cdc32fcb WOOHOOOOOOO assertion engine complete. Issue #28 this is crazy 2013-03-10 12:11:01 -07:00
Peter Cottle
e4b82fd653 bearable 2013-03-10 11:26:50 -07:00
Peter Cottle
5754238864 nicer preview working on assertions 2013-03-09 21:08:36 -08:00
Peter Cottle
092a92b0b4 show commands Issue #63 2013-03-09 20:26:29 -08:00
Peter Cottle
f49937c935 ok awesome third levle 2013-03-09 19:26:22 -08:00
Peter Cottle
2ca8d2a7bb Third level and branch forcing 2013-03-09 19:15:49 -08:00
Peter Cottle
06d10b795f second level of moving around 2013-03-09 18:44:44 -08:00
Peter Cottle
fed2da64c0 new level 2013-03-09 18:29:12 -08:00