mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-06-29 09:20:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
2873 commits 8 branches 0 tags 104 MiB
Commit graph

1016 commits

Author SHA1 Message Date
Peter Cottle
f49937c935 ok awesome third levle 2013-03-09 19:26:22 -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
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
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
32c24fd929 WOOHOO More zh_CN strings thanks a ton @acecode Pull #65 Issue #65 2013-03-03 19:19:26 -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
3d01473ec4 sweet checkstrings 2013-03-03 15:58:57 -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
Peter Cottle
77e7cf9cfc level builderINTL alware 2013-03-02 13:59:41 -08:00
Peter Cottle
e4cf2f6faa RAWRRRR next level done 2013-03-02 13:51:35 -08:00
Peter Cottle
108ab07f93 ALL GIT STUFF DONE YES 2013-03-02 13:27:27 -08:00
Peter Cottle
9b4de12074 moar 2013-03-02 13:09:12 -08:00
Peter Cottle
efabfa4378 partway through git strings 2013-03-02 12:57:34 -08:00
Peter Cottle
d17d131d24 Firefox prompt huge fix, Issue #59 2013-03-02 10:39:54 -08:00
Peter Cottle
943aa12d87 Dont count typo errors Issue #60 2013-02-25 22:16:11 -08:00
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
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
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
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
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
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
Peter Cottle
a2e89f592d Allow for multiple spaces in git commands Issue #44 2013-02-20 19:36:17 -08: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