Peter Cottle
6748f66dfc
readme
2013-02-20 20:53:14 -08:00
Peter Cottle
b6785b240c
rebuild
2013-02-20 20:52:28 -08:00
Peter Cottle
c50b413f3a
Merge pull request #49 from aschrab/merge-args
...
Fix merge argument handling
2013-02-20 20:38:58 -08:00
Peter Cottle
15dd10f034
Merge pull request #47 from aschrab/buildfix
...
Adjustments to building
2013-02-20 20:33:09 -08:00
Peter Cottle
3aad020f7d
rebuild
2013-02-20 20:29:37 -08:00
Peter Cottle
39be0644ab
rebuid
2013-02-20 20:20:07 -08:00
Peter Cottle
0cd82c921a
firefox icon CSS
2013-02-20 20:19:38 -08:00
Peter Cottle
e2b805763d
Firefox CSS fixes, Issue #9 thanks Frode Austvik
2013-02-20 20:18:13 -08:00
Peter Cottle
cae36e1301
readme
2013-02-20 20:07:23 -08:00
Peter Cottle
851de6118e
Merge pull request #46 from aschrab/editorconfig
...
Add .editorconfig file
2013-02-20 20:05:47 -08:00
Peter Cottle
9b59e47572
Fixes Issue #43
2013-02-20 20:03:51 -08:00
Aaron Schrab
4d6d247d01
No multiple arguments for merge
...
`git merge` should only be given multiple arguments if doing an octopus
merge which isn't currently supported. Require that exactly one
argument be given, and always use HEAD as the currentLocation.
2013-02-20 22:46:45 -05: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
a2e89f592d
Allow for multiple spaces in git commands Issue #44
2013-02-20 19:36:17 -08:00
Aaron Schrab
ac4e5c65c6
Add levels symlink at top level
...
Without this link running `grunt build` gives me errors like:
Running "browserify:build/bundle.js" (browserify) task
Fatal error: Cannot find module: "../../levels/intro/1" from directory "/home/ats/vc/learnGitBranching/src/levels" while processing file /home/ats/vc/learnGitBranching/src/levels/index.js
2013-02-20 18:13:17 -05:00
Aaron Schrab
15f7d0f663
Fix path to levels from level arbiter
...
Need to go up to directories from the level arbiter to get to the
directory containing level definitions.
2013-02-20 18:13:17 -05:00
Aaron Schrab
20b16e5301
Fix capitalization of sandboxCommands file
...
On case-sensitive file systems, need to use correct case in require()
calls.
2013-02-20 18:13:17 -05:00
Aaron Schrab
939ea0c767
Rebuild for changes to handling of relative refs
2013-02-20 18:12:53 -05:00
Aaron Schrab
8da68375dd
Remove obsolete numBackFrom method
...
The numBackFrom method is no longer called from anywhere with the
changes from the previous commit to change how relative references are
handled.
2013-02-20 18:12:53 -05:00
Aaron Schrab
e5de32f977
Improve parsing of relative references
...
Support parsing of references like HEAD~^2~3^ . Previously, ~ required
a following number, ^ didn't allow a following number, and chaining
wasn't supported.
If at any point in the resolving of the chain the requested parent isn't
found report the error by specifying the id of the last commit that was
found along with the parent specification to help the user to figure out
where the problem arose.
2013-02-20 18:12:53 -05:00
Aaron Schrab
4928e71a4b
Add getParent method for Commit objects
...
Add method to retrieve a given parent (not ancestor) of a commit object.
If the commit doesn't have the requested parent return null.
2013-02-20 18:12:53 -05:00
Aaron Schrab
ddcba3820a
Add .editorconfig file
...
Create a file to provide code formatting hints to editors with support
for the [EditorConfig][] format.
[EditorConfig]: http://editorconfig.org/
2013-02-20 13:36:02 -05:00
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
