Peter Cottle
80a540e172
Now can cherry pick multiple commits in a row like git usage Issue #57
2013-02-24 22:44:49 -08:00
Peter Cottle
3523d28416
fixes silly error in next level dialog Issue #56
2013-02-24 22:03:41 -08:00
Peter Cottle
956d559697
Firefox CSS tweaks Issue #53
2013-02-24 01:22:33 -08:00
Peter Cottle
bd62fa735e
intl dom refresh when locale changes final push for Issue #42
2013-02-24 00:33:22 -08:00
Peter Cottle
1b0d836a42
rebuild and no more uppercase
2013-02-24 00:11:39 -08:00
Peter Cottle
5e7042c64b
rebuild for Issue #55
2013-02-23 23:37:05 -08:00
Peter Cottle
d99498076e
Merge pull request #55 from donkirkby/patch-1
...
Typo fixes
2013-02-23 23:36:04 -08:00
Peter Cottle
88db1d4034
readme
2013-02-23 23:34:52 -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
Peter Cottle
9048f09d9f
a bunch of keys from level directory
2013-02-23 22:15:37 -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
eedce6616a
before big intl merge on levels
2013-02-23 20:54:14 -08:00
Peter Cottle
9a497cfbad
typo
2013-02-23 15:01:07 -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
Peter Cottle
2837315c7d
no console log
2013-02-21 09:14:15 -08:00
Peter Cottle
f8a92580bd
Scroll bar FF fixes Issue #51
2013-02-21 09:12:32 -08:00
Peter Cottle
d1962d2a2e
css typo thanks @MaPePer Issue #51
2013-02-21 09:06:54 -08:00
Peter Cottle
8cfd9ebd19
readme
2013-02-20 20:56:22 -08:00
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
