mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-07-01 18:24:28 +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
2c29ecf990 cname for js-org :O 2015-05-30 08:41:29 -07:00
Peter Cottle
a5b6cc3e09 Merge pull request #281 from alexeiberkov/feature/russianTranslation 
Russian translation for "fakeTeamwork.js" and "push.js" lessons
 2015-05-29 13:52:33 -07:00
Alexey Berkov
b64689dd3a I added ru_RU (Russian) translation for the "fakeTeamwork.js" and "push.js" lessons. Fixed typos in "pull.js". 2015-05-29 15:54:10 +03:00
Peter Cottle
a492e5f4a5 Merge pull request #278 from alexeiberkov/feature/russianTranslation 
Added ru_RU (Russian) translation for the "pull.js".
 2015-05-27 21:47:48 -07:00
Peter Cottle
1502b50bcb Resolves #277 2015-05-27 21:38:12 -07:00
Peter Cottle
1ef2569394 Resolves #273 build level breakage 2015-05-27 21:30:52 -07:00
Alexey Berkov
232f7232fb I have added ru_RU (Russian) translation for the "pull.js" lesson. With approval of owner I added my account name into list of contributors. 2015-05-25 10:48:32 +03:00
Mizunashi Mana
03db0de6bb Merge branch 'master' into mzJPTranslate3 2015-05-25 00:58:33 +09:00
Mizunashi Mana
c031c604bd Merge remote-tracking branch 'upstream/master' 2015-05-25 00:53:48 +09:00
Peter Cottle
6c3a7ad327 add link to my twitter for feedback 2015-05-23 13:31:49 -07:00
Mizunashi Mana
77ae2c9065 add ja content on fetch 2015-05-23 02:00:49 +09:00
Peter Cottle
0712501daa Merge pull request #275 from alexeiberkov/feature/russianTranslation 
I have added ru_RU (Russian) translation for the "fetch.js" lesson.
 2015-05-21 11:22:06 -07:00
Alexey Berkov
0556b07830 I have added ru_RU (Russian) translation for the "fetch.js" lesson. 2015-05-21 20:25:41 +03:00
Peter Cottle
00756364af Merge pull request #274 from alexeiberkov/feature/russianTranslation 
ru_RU (Russian) translation for the "remoteBranches.js"
 2015-05-20 08:26:37 -07:00
Alexey Berkov
7d1f63adf0 I have added ru_RU (Russian) translation for the "remoteBranches.js" lesson. Added translation fix into "clone.js" lesson. 2015-05-20 12:10:15 +03:00
Peter Cottle
24b54908a5 come on travis wake up 2015-05-19 09:16:11 -07:00
Peter Cottle
ddac850f16 apparently we only support 0.10 2015-05-19 09:03:40 -07:00
Peter Cottle
d6dbb1cf1c small change to trigger travis 2015-05-19 08:50:34 -07:00
Peter Cottle
ae6b781cf4 initial travis CI 2015-05-19 08:48:51 -07:00
Peter Cottle
99dad65ce5 Merge pull request #272 from alexeiberkov/newRussianTranslation 
Added ru_RU (Russian) translation for the "clone.js" lesson.
 2015-05-19 08:42:36 -07:00
Alexey Berkov
14762102a2 I have added ru_RU (Russian) translation for the "clone.js" lesson. 2015-05-19 16:29:18 +03:00
Peter Cottle
63e0864e9d Merge pull request #271 from coyl/translation/russian 
Translation/russian
 2015-05-13 11:04:51 -07:00
Vasil Kulakov
593341d7b8 Fixed russian translation; Added myself to contributors in readme =) 2015-05-12 15:32:24 +03:00
Vasil Kulakov
7bd166b731 sync w prod 2015-05-12 15:22:43 +03:00
Peter Cottle
6028cb10fd Merge pull request #214 from isomorphisms/patch-2 
pointer
 2015-05-10 17:36:58 -07:00
Peter Cottle
7f042970fb Merge pull request #216 from isomorphisms/patch-4 
copy suggestions (English)
 2015-05-10 17:35:42 -07:00
Peter Cottle
cb1f302736 Merge pull request #270 from suvjunmd/translate 
Fixed typos in russian translation
 2015-05-10 17:35:08 -07:00
Dmitri Suvorov
adedcc5d6c Fixed typos in russian translation 2015-05-10 22:00:06 +03:00
Peter Cottle
8550519529 PR #269 do better job of showing untranslated hints or level names 2015-05-08 12:57:08 -07:00
Peter Cottle
ad55c6705c Merge pull request #269 from coyl/translation/russian 
Fixes in Russian traslation
 2015-05-08 12:35:22 -07:00
Vasil Kulakov
dad59bbaf2 little fixes in traslation 2015-05-08 13:25:56 +03:00
Vasil Kulakov
01537305e7 Added missing levels names 2015-05-08 12:31:17 +03:00
Vasil Kulakov
b43d6eb1e7 Sync with updated master 2015-05-08 12:26:07 +03:00
Peter Cottle
d58e633135 PR #267 russian language selector 2015-05-07 12:38:45 -07:00
Mizunashi Mana
b7eaf36afc fix some ja typos and betters 2015-05-07 19:27:14 +09:00
Mizunashi Mana
54ea4f38f2 add ja contents on multiParents 2015-05-07 19:26:42 +09:00
Mizunashi Mana
942e63d875 fix some ja contents better 2015-05-07 18:09:53 +09:00
Peter Cottle
4048f6a596 Merge pull request #267 from coyl/translation/russian 
Russian translation for the "tags" level
 2015-05-06 09:41:31 -07:00
Vasil Kulakov
26bb9b69b4 Added translations for tags.js 2015-05-06 17:34:30 +03:00
Vasil Kulakov
f9ef036692 Sync w new master 2015-05-06 17:33:20 +03:00
Peter Cottle
5ed2179677 revert changes to levels/mixed/tags.js PR #256 2015-05-05 18:45:36 -07:00
Peter Cottle
5afd68f056 Merge pull request #265 from coyl/master 
Russian translation
 2015-05-05 18:42:01 -07:00
Vasil Kulakov
a653ef7fb6 Russian translation 
Conflicts:
	src/js/dialogs/confirmShowSolution.js
	src/js/dialogs/levelBuilder.js
	src/js/intl/index.js
	src/js/intl/strings.js
	src/levels/mixed/describe.js
	src/levels/mixed/tags.js
 2015-05-05 18:03:19 +03:00
Vasil Kulakov
d773cf16b1 little addition 2015-05-05 17:40:58 +03:00
CoylOne
8a5f0fd5cb Strings translated 2015-05-04 15:46:26 +03:00
CoylOne
844074d598 Dialogs translated 2015-05-04 15:08:01 +03:00
CoylOne
afeede2e66 Rebase translation 2015-05-04 14:45:20 +03:00
Peter Cottle
ed6f15c74f Revert "temp" 
This reverts commit c086f0e28e319c048aa8497a2e6ab1878a048624.
 2015-05-02 10:47:42 -07:00
Peter Cottle
8458c9256d temp 2015-05-02 10:47:41 -07:00
Peter Cottle
3eca0e8016 Merge pull request #263 from mizunashi-mana/mzJPTranslate2 
fix japanese typos and add ja contents
 2015-05-02 10:46:11 -07:00