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

2879 commits

This branch
This branch
All branches
Author SHA1 Message Date
Peter Cottle
c5a3f866ab Undo button functionality Issue #40 2013-02-20 09:22:15 -08:00
Peter Cottle
e94710ca64 rebuild for pull #38 @josso 2013-02-19 19:36:13 -08:00
Peter Cottle
a794ee43a3 Merge pull request #38 from Josso/patch-1 
Added pluralization to NextLevelConfirm
 2013-02-19 19:35:31 -08:00
Johan
9809872c61 Added pluralization to NextLevelConfirm 2013-02-19 17:02:38 +01:00
Peter Cottle
9b85b676df better padding for vis and stuff 2013-02-18 14:29:43 -08:00
Peter Cottle
e8dd24fa5c better show and hide for goal and start visualizations related to Issue #36 nice 2013-02-18 14:19:30 -08:00
Peter Cottle
902944d53a readme 2013-02-18 13:50:38 -08:00
Peter Cottle
9cf91038c1 Fixes Issue #36 2013-02-18 13:48:51 -08: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
Peter Cottle
2a96052002 Recursive tree comparison algorithm that is hash agnostic to lay the groundwork for Issue #28 2013-02-18 09:10:08 -08:00
Peter Cottle
0d295197ac rebuilding for CameronWills 2013-02-18 07:45:35 -08:00
Peter Cottle
06ca6b372a Merge pull request #34 from CameronWills/patch-1 
Update src/levels/intro/4.js
 2013-02-18 07:44:41 -08:00
Peter Cottle
a954a659ce Rebuilding for Lukes pull 2013-02-18 07:41:30 -08:00
Peter Cottle
25b1cda900 Merge pull request #32 from lkysow/master 
Added common git aliases to shortcuts.
 2013-02-18 07:37:16 -08:00
Peter Cottle
aaca660c84 Rebuilding css and hashing for deployment, thanks Hamish Macpherson 2013-02-18 07:30:33 -08:00
Peter Cottle
5aab27bcce Merge pull request #33 from hamstu/master 
Tweaked the UI
 2013-02-18 07:28:52 -08:00
CameronWills
b42400c0c8 Update src/levels/intro/4.js 
Fixed minor typo in instructions.
 2013-02-18 22:34:25 +11:00
Hamish Macpherson
084071166d Tweaked window buttons and themes 2013-02-17 23:31:32 -08:00
Luke Kysow
3732e4e98d Added common git aliases. 
git ci => git commit,
git co => git checkout,
git st => git status,
git br => git branch
 2013-02-17 22:05:06 -08:00
Peter Cottle
f96b6b45c0 readme 2013-02-17 17:10:49 -08:00
Peter Cottle
7a8d4abb59 Fixes Issue #30 2013-02-17 17:09:33 -08:00
Peter Cottle
0cdb787ef4 readme 2013-02-17 16:53:14 -08:00
Peter Cottle
be2fa68a45 Fixes Issue #19 thanks a ton epheph 2013-02-17 16:52:21 -08:00
Peter Cottle
598e322524 Thanks Adam Brodzinski for the pull 2013-02-17 13:22:14 -08:00
Peter Cottle
6de164e6a9 Merge pull request #27 from AdamBrodzinski/1_3_typo 
Fixes typo in lesson 1.3 alert steps modal
 2013-02-17 13:21:00 -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
09da420df0 Fixes Issue #26 2013-02-17 10:19:13 -08:00
Peter Cottle
54463c7b96 Merge pull request #25 from delasteve/Readme-updates 
Readme updates
 2013-02-17 10:14:44 -08:00
Stephen Cavaliere
3a29d0fb98 Grammar change 2013-02-17 11:54:52 -05:00
Stephen Cavaliere
27877754c1 Readme changes 
I missed these two when I was going through the first time. "ot" to "to"
and "github" to "Github".
 2013-02-17 11:40:18 -05:00
Peter Cottle
84a9adea01 fixes Issue #22 2013-02-17 03:34:34 -08:00
Peter Cottle
77d6c67e94 build 2013-02-17 03:27:37 -08: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
Peter Cottle
6fbbae5356 rebuild 2013-02-17 03:25:50 -08:00
Peter Cottle
a4e1159628 Merge pull request #23 from PragTob/patch-1 
Fixed a little typo in the first lesson.
 2013-02-17 03:25:22 -08:00
Peter Cottle
dc2cdd4089 Fixes Issue #24 2013-02-17 03:23:58 -08:00
Peter Cottle
34f215b605 readme 2013-02-17 03:22:25 -08:00
Peter Cottle
d4580b3a4b Readme 2013-02-17 03:21:29 -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
9d167f986d rebuild 2013-02-16 23:12:19 -08:00
Peter Cottle
b9ed20099b Merge pull request #17 from dannvix/typo-in-mixed2 
fix a typo in mixed-2 Thanks Shao-Chung Chen, check out your name in the Readme!
 2013-02-16 23:11:51 -08:00
Peter Cottle
79443fcec6 readme 2013-02-16 23:11:22 -08:00
Shao-Chung Chen
d3ab5a1a7d fix an typo in mixed-2 2013-02-17 14:08:00 +08:00
Peter Cottle
9d709677cb rebuilding after pull 2013-02-16 21:01:34 -08:00
Peter Cottle
5eb58bc31c Merge pull request #16 from dannvix/patch-2 
fix a typo in rebase1
 2013-02-16 21:00:31 -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