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

2182 commits

This branch
This branch
All branches
Author SHA1 Message Date
Peter Cottle
2be8fcd2d9 Resolves #637 -- fix merge conflict 2020-02-05 10:58:17 -08:00
Peter Cottle
72216a2104
Merge pull request #637 from zengdabo/lockedmaster_zhcn 
Lockedmaster simple chinese zhcn translation.
 2020-02-05 10:57:20 -08:00
Peter Cottle
31754db7cb
Merge branch 'master' into lockedmaster_zhcn 2020-02-05 10:53:53 -08:00
Peter Cottle
d473ea0dba
Merge pull request #635 from andreysy4/newAwesomeFeature 
Add RUS translate for "Locked Master" level
 2020-02-05 10:49:15 -08:00
Peter Cottle
6b788efa18
Merge pull request #636 from datenreisender/patch-1 
Fix spelling
 2020-02-05 10:48:56 -08:00
zengdabo
39fb80f57b missing one ',' after '}" fixed!!! 2020-02-05 21:26:52 +08:00
Marko Schulz
8e51e1afc1
Fix spelling 2020-02-05 12:55:20 +01:00
andreySy4
039f8c9894 Add RUS translate 2020-02-05 14:39:11 +03:00
zengdabo
462656433b add simple chinese translation to lockedMaster 2020-02-05 16:11:43 +08:00
Peter Cottle
df4d84b389
Merge pull request #633 from pcottle/securityFix 
Fix some security issues in dependencies in yarn.lock
 2020-02-04 10:45:07 -08:00
Peter Cottle
9c0c5c6bdc attempt 2 2020-02-04 10:42:26 -08:00
Peter Cottle
d1ff9a0a5e Fix some security issues in dependencies in yarn.lock 2020-02-04 10:34:10 -08:00
Peter Cottle
cac0f99f02 Issue #631 -- improve solution a bit 2020-02-04 10:25:29 -08:00
Peter Cottle
68a5229c63 Resolves #631 -- add locked master level 2020-02-04 10:20:27 -08:00
Peter Cottle
760e10885f
Merge pull request #628 from duongtiendat1990/master 
Translated to Vietnamese
 2020-01-26 10:58:04 -07:00
duongtiendat1990
d5b317e806 Merge https://github.com/pcottle/learnGitBranching 
# Conflicts:
#	src/levels/mixed/describe.js
#	src/levels/rampup/detachedHead.js
 2020-01-26 23:21:48 +07:00
duongtiendat1990
2622c3eb7a complete translate to Vietnamese 2020-01-25 17:51:46 +07:00
Peter Cottle
3015a680b1
Merge pull request #627 from parksjin01/master 
[Fix] Fix typo in korean
 2020-01-17 03:57:20 -05:00
Damotorie
977150ad7f
Update pullArgs.js 
Fix Korean typo
 2020-01-17 15:01:23 +09:00
Peter Cottle
323edefa62
Merge pull request #626 from normal-coder/fixTypo 
fix(typo): fix a typo in Chinese
 2020-01-15 08:05:37 -05:00
诺墨
5e703a0489 fix(typo): fix a typo in Chinese 2020-01-14 15:32:59 +08:00
Peter Cottle
cefbae24b8
Merge pull request #625 from pcottle/addLocaleHeader 
Other version of PR #624 -- map header directly from browser
 2020-01-02 15:06:21 -08:00
Peter Cottle
f6d0ab7e75 Other version of PR #624 -- map header directly from browser 2020-01-02 15:01:53 -08:00
Peter Cottle
3a54cc8efc
Merge pull request #622 from flyingbot91/es_ES_translation 
Es es translation
 2019-12-21 10:51:33 -08:00
Peter Cottle
19e60e4dc8
Merge pull request #623 from flyingbot91/es_AR_translation_typos_v2 
Various 'es_AR' translation typos
 2019-12-21 10:48:33 -08:00
flyingbot91
645862e64e
Update src/levels/remote/clone.js 
Co-Authored-By: Matias Garcia Isaia <mgarciaisaia+github@gmail.com>
 2019-12-20 00:07:47 +01:00
flyingbot91
d5fd75239f Various 'es_AR' translation typos 2019-12-18 23:52:06 +01:00
flyingbot91
055b2b5d09
Merge branch 'master' into es_ES_translation 2019-12-18 23:28:59 +01:00
flyingbot91
b2fbf6b009 'es_ES' translation typos 2019-12-18 23:26:14 +01:00
flyingbot91
892830add4 Translated src/js/dialogs to Spanish 'es_ES' 2019-12-18 23:09:43 +01:00
flyingbot91
a14da63e36 es_ES translation typos 2019-12-18 23:03:08 +01:00
flyingbot91
8aab243701 Added es_ES translation to levelBuilder.js 2019-12-18 23:01:38 +01:00
flyingbot91
4631475b39 Translated 'remote' levels to Spanish 'es_ES' 2019-12-18 22:41:08 +01:00
Peter Cottle
c74cf915a2
Merge pull request #620 from pcottle/dependabot/npm_and_yarn/mixin-deep-1.3.2 
Bump mixin-deep from 1.3.1 to 1.3.2
 2019-12-16 08:02:41 -08:00
dependabot[bot]
5eb9de500a
Bump mixin-deep from 1.3.1 to 1.3.2 
Bumps [mixin-deep](https://github.com/jonschlinkert/mixin-deep) from 1.3.1 to 1.3.2.
- [Release notes](https://github.com/jonschlinkert/mixin-deep/releases)
- [Commits](https://github.com/jonschlinkert/mixin-deep/compare/1.3.1...1.3.2)

Signed-off-by: dependabot[bot] <support@github.com>
 2019-12-14 02:37:44 +00:00
Peter Cottle
8ba7c78c13
Merge pull request #619 from flyingbot91/es_AR_translation_typos 
Es ar translation typos
 2019-12-13 18:37:15 -08:00
flyingbot91
85caa4a0a1 es_AR Typos fixed 2019-12-12 23:02:32 +01:00
flyingbot91
159cf8dce2 Translated 'rebase' levels to Spanish 'es_ES' 2019-12-12 22:58:06 +01:00
flyingbot91
2dab4adf69 Translated 'rampup' levels to Spanish 'es_ES' 2019-12-12 22:50:38 +01:00
flyingbot91
257bb1c0c2 Translated index.js to Spanish 'es_ES' 2019-12-12 22:30:05 +01:00
flyingbot91
a4e13ba14e Translated 'mixed' levels to Spanish 'es_ES' 2019-12-12 22:21:19 +01:00
flyingbot91
0d02559fe4 Writing typos 2019-12-11 23:37:28 +01:00
flyingbot91
64bd768db4 Translated 'advanced' levels to Spanish 'es_ES' 2019-12-11 23:32:24 +01:00
flyingbot91
cbed632b74 Translated 'intro' levels to Spanish 'es_ES' 2019-12-11 23:31:52 +01:00
duongtiendat1990
886170f627 translate commits.js 2019-12-11 17:28:29 +07:00
edward
7ffb80e1ce Add translation of index page. 2019-12-05 08:27:22 +07:00
edward
3a74fb345d Add Vietnamese language switcher to helperbar. 2019-12-05 08:26:36 +07:00
Peter Cottle
1aa75a27bf Resolves #618 -- remove todo 2019-11-03 21:21:01 -08:00
Peter Cottle
e41b781121
Merge pull request #616 from dzampino/typoFix 
Change where HEAD points to match objective
 2019-10-23 06:58:23 -07:00
David Zampino
e512510e66 Change where HEAD points to match objective 2019-10-22 16:59:27 -05:00