mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-06-30 01:34:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
2182 commits 7 branches 0 tags 104 MiB
Commit graph

2182 commits

This branch
This branch
All branches
Author SHA1 Message Date
Peter Cottle
76282a722e Merge pull request #365 from laysdra7265/master 
Update strings.js
 2016-03-01 19:40:15 -08:00
laysdra7265
b2bd7b67f0 Update strings.js 
add some missing Chinese translation
 2016-03-02 09:36:58 +08:00
Peter Cottle
fa2a2d6b35 Merge pull request #364 from pcottle/allowDeletePush 
Resolves #362 allow deleting commits with push force
 2016-02-29 09:56:44 -08:00
Peter Cottle
a039693d63 test coverage 2016-02-29 09:31:10 -08:00
Peter Cottle
854b5d44b0 Resolves #362 allow deleting commits with push force 2016-02-29 09:27:23 -08:00
Peter Cottle
3d52232464 Merge pull request #361 from zyurs/patch-1 
Fix a typo in french translation
 2016-02-24 07:45:27 -08:00
zyurs
b374889eb4 Fix a typo in french translation 2016-02-24 13:38:45 +01:00
Peter Cottle
b89af0f8ec Merge pull request #360 from sameoldmadness/move-tests-to-the-root 
Move tests to the root
 2016-02-14 12:23:24 -08:00
Roman
e068203893 Move tests to the root 2016-02-15 01:10:25 +05:00
Peter Cottle
5d46a6ecd2 add back promt 2016-02-14 09:33:53 -08:00
Peter Cottle
503376251e no more RN 2016-02-14 09:31:17 -08:00
Peter Cottle
89ec0b86bf Merge pull request #358 from pcottle/killNative 
no more native
 2016-02-14 09:29:29 -08:00
Peter Cottle
a9dd27c25e no more native 2016-02-14 09:22:47 -08:00
Peter Cottle
9db951c5de Merge pull request #356 from wmurray8989/master 
Fixed a typo
 2016-02-14 09:18:58 -08:00
Peter Cottle
2031f9e038 Merge pull request #354 from JuhoKang/kortranslate 
Translated the rest into Korean
 2016-02-14 09:18:28 -08:00
Peter Cottle
696660bb41 Merge pull request #357 from pcottle/fixTravisCI 
Fix travis ci
 2016-02-14 09:16:26 -08:00
Peter Cottle
2b26427ffa new versions for browserify 2016-02-14 09:14:16 -08:00
Peter Cottle
47e2e55f4a change node version 2016-02-14 09:06:56 -08:00
Peter Cottle
6d59d90848 no more casper etc 2016-02-14 09:02:37 -08:00
Peter Cottle
7199cce804 no more RN 2016-02-14 09:00:38 -08:00
wmurray8989
52ca28a58f Fixed a typo 2016-02-14 00:00:10 -05:00
JuhoKang
be26048a26 Trying to pass travis build 2016-02-08 21:32:45 +09:00
JuhoKang
4bc9ba48b8 Added Korean discription for levelBuilder 2016-02-08 19:27:59 +09:00
JuhoKang
61a2372b7e Added Korean discription for newtLevel 2016-02-08 19:22:00 +09:00
JuhoKang
3214bb39b6 Translate pullArgs.js into Korean 2016-02-08 19:17:30 +09:00
JuhoKang
a8bc94ac41 Translated sourceNothing.js into Korean 2016-02-08 19:17:06 +09:00
JuhoKang
20c4a7e96e Translated fetchArgs into Korean 2016-02-08 19:16:28 +09:00
Peter Cottle
825b08b970 Merge pull request #353 from JuhoKang/kortranslate 
Translated pushArgs 1&2 into Korean
 2016-02-07 09:05:32 -08:00
JuhoKang
892e5c1fcd Translated pushArgs 1&2 into Korean 2016-02-07 01:04:08 +09:00
JuhoKang
2162f5eaad Merge remote-tracking branch 'upstream/master' into kortranslate 2016-02-07 00:15:23 +09:00
JuhoKang
60cb9e196a save small changes to catchup upstream 2016-02-07 00:15:13 +09:00
Peter Cottle
c53a7ef281 Merge pull request #352 from 616slayer616/patch-1 
Fixed typo in german translation
 2016-01-31 10:58:08 -08:00
616slayer616
1110c30ef7 Fixed typo in german translation 
doie -> die
 2016-01-31 13:39:33 +01:00
Peter Cottle
eaeab01994 Merge pull request #351 from demidovakatya/master 
Fixes in russian translation
 2016-01-13 16:46:25 -08:00
Katya Demidova
5d995d32f9 Fixes in russian translation 
Mostly grammar, typos, punctuation.
 2016-01-14 03:00:40 +03:00
Peter Cottle
676b90a115 Merge pull request #350 from morodeer/master 
Russian translation fixes
 2016-01-10 11:19:38 -08:00
morodeer
7dff114e9b Several fixes in russian translation 2016-01-10 01:23:41 +03:00
morodeer
83ac716347 Misspell in russian translation 2016-01-09 23:06:24 +03:00
Peter Cottle
85f912ddb9 Merge pull request #348 from danielzhme/patch-1 
Fixed typo
 2015-12-28 08:36:01 -08:00
Peter Cottle
336dc976d1 Merge pull request #347 from boguszaur/ruTranslation 
Add ru_RU translation to sourceNothing and pullArgs
 2015-12-26 09:55:26 -08:00
Zaur Bogus
a333bcbb12 Add ru_RU translation to sourceNothing and pullArgs 2015-12-26 19:43:50 +03:00
Daniel Zhang
d7211a80f3 Fixed typo 2015-12-23 20:11:23 +08:00
Peter Cottle
8f7b086c7e Merge pull request #346 from JuhoKang/kortranslate 
Translated mergeManyFeatures.js & tracking.js into Korean
 2015-12-10 17:16:36 -08:00
JuhoKang
bd816f9553 Translated tracking.js 2015-12-10 23:52:41 +09:00
JuhoKang
3b470fe390 Translated mergeManyFeatures.js into Korean 2015-12-10 23:52:08 +09:00
Peter Cottle
d2c95b3d0e Merge pull request #345 from JuhoKang/master 
Updated index.js Korean features and did some translating
 2015-12-05 15:59:29 -08:00
JuhoKang
f761d7c47c Merge remote-tracking branch 'upstream/master' 2015-12-06 00:15:04 +09:00
JuhoKang
1082a6d0f2 Translated pushManyFeatures.js into Korean 2015-12-06 00:04:56 +09:00
JuhoKang
2bff132180 Translated fetchRebase.js into Korean 2015-12-05 23:55:12 +09:00
JuhoKang
482bc1a3c6 Added a semicolon which was missing in index.js 
should have test before committing
 2015-12-05 23:51:49 +09:00