mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-07-02 10:44:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
1835 commits 7 branches 0 tags 104 MiB
Commit graph

1835 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Peter Cottle
7d54a4d928 Rebuild for Issue #72 2013-03-09 09:31:21 -08:00
Peter Cottle
9a3c117532 Merge pull request #75 from dotnil/master 
Added zh_CN for confirmShowSolution dialog
 2013-03-09 08:55:29 -08:00
Peter Cottle
19fba12e67 moar trans 2013-03-08 18:50:58 -08:00
Peter Cottle
91555e9bf9 more progress promise chain 2013-03-08 18:28:51 -08:00
Peter Cottle
f6da982887 translate script work 2013-03-08 17:34:43 -08:00
Jake Chen
3359c3742e Added zh_CN translation of confirmShowSolution 
also a minor fix of level title
 2013-03-09 01:44:01 +08:00
Peter Cottle
e2ecfef4f4 Fixes Issue #68 flip logic and getCommitFromRef 2013-03-07 21:27:28 -08:00
Peter Cottle
44db45ce0d better flip logic fixes Issue #73 2013-03-07 20:49:44 -08:00
Peter Cottle
0332d92513 rebuild for Issue #74 2013-03-07 20:25:07 -08:00
Peter Cottle
6fdcbbcee1 Merge branch 'more-zh-translation' of git://github.com/dotnil/learnGitBranching into dotnil 
Issue #74
 2013-03-07 20:20:41 -08:00
Peter Cottle
b3c6b6de66 dialog 2013-03-07 20:11:52 -08:00
Peter Cottle
068339ad21 rebuild 2013-03-07 09:26:52 -08:00
Peter Cottle
e05c162d38 Issue #71 scrolling off page 2013-03-06 20:07:26 -08:00
Peter Cottle
53d613ebec Issue #70 refresue #70 refresh levles when reset map 2013-03-06 19:59:47 -08:00
Peter Cottle
92bd248c18 Issue #70 dont mark as solved when using solution show 2013-03-06 19:53:08 -08:00
Peter Cottle
94d354af22 Issue #72 alias of show goal command 2013-03-06 19:39:35 -08:00
Peter Cottle
ba839dd6fe rebuild for Issue #65 2013-03-03 19:20:04 -08:00
Peter Cottle
32c24fd929 WOOHOO More zh_CN strings thanks a ton @acecode Pull #65 Issue #65 2013-03-03 19:19:26 -08:00
Peter Cottle
b2ed5dfe14 Awesomegs Bernard wins awesome github contributor of the day. More french translation strings Issue #67 Pull #67 2013-03-03 18:55:54 -08:00
scientific-coder
7e9e5719d8 fr_FR fixes in intro/1 . 2013-03-03 18:53:56 -08:00
scientific-coder
2d67c65008 Q/A not happy on L10n fr_FR (a few en_US left) 2013-03-03 18:53:40 -08:00
Peter Cottle
7526f1fb4d progress on translation script 2013-03-03 18:31:41 -08:00
Peter Cottle
5290a9878f awesome getting translation script mostly there 2013-03-03 17:00:50 -08:00
Peter Cottle
da51a115ae sweet lintStrings working 2013-03-03 16:02:01 -08:00
Peter Cottle
3d01473ec4 sweet checkstrings 2013-03-03 15:58:57 -08:00
Peter Cottle
dbdb1e5682 French locale intl fixes Pull #66 Issue #66 2013-03-03 12:31:46 -08:00
Peter Cottle
3f5a82d2a4 Merge pull request #66 from scientific-coder/fr_FR 
L10n of intro levels for fr_FR.
 2013-03-03 12:25:46 -08:00
acecode
2f8fe36c91 add some zh_CN translate strings 
fix 2 command errror in level intro3
 2013-03-04 02:58:02 +08:00
scientific-coder
0bf2e34839 L10n of intro levels for fr_FR. 2013-03-03 19:57:08 +01:00