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

2290 commits

This branch
This branch
All branches
Author SHA1 Message Date
Peter Cottle
3c8836099f
Merge pull request #681 from pcottle/dependabot/npm_and_yarn/jquery-3.4.0 
Bump jquery from 1.12.4 to 3.4.0
 2020-04-21 10:36:26 -07:00
dependabot[bot]
258e3b5aad
Bump jquery from 1.12.4 to 3.4.0 
Bumps [jquery](https://github.com/jquery/jquery) from 1.12.4 to 3.4.0.
- [Release notes](https://github.com/jquery/jquery/releases)
- [Commits](https://github.com/jquery/jquery/compare/1.12.4...3.4.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-04-21 17:33:23 +00:00
Peter Cottle
e844de48a0
Merge pull request #680 from hong4rc/optimize 
Optimize load js and minify css+html
 2020-04-21 10:32:52 -07:00
hongarc
eaa2412084 minify css+html, move font to assets 2020-04-21 21:45:35 +07:00
hongarc
b02a4b1bf7 merge jquery-ui to bundle 2020-04-21 21:44:42 +07:00
hongarc
fbe3312398 defer parsing of JavaScript 2020-04-21 19:12:29 +07:00
Peter Cottle
ec6f612fca
Merge pull request #678 from MrMcKracken/master 
Fixed typo in german translation
 2020-04-16 21:05:10 -07:00
MrMcKracken
592759ef24
Fixed typo in german translation 
(_ohne_ ihne vorher ...)  --> (_ohne_ ihn vorher ...)
 2020-04-16 07:26:35 +02:00
Peter Cottle
eba36c3668
Merge pull request #677 from orsifacundo/master 
es_AR translation & es_ES corrections
 2020-04-15 11:53:28 -07:00
CuFa
9d31f02d6b es_AR translation & es_ES corrections 2020-04-14 02:22:25 +00:00
Peter Cottle
1f496930fc
Merge pull request #676 from Zepmanbc/fetchRebase_translate_french_correction 
fetchRebase.js French translation correction
 2020-04-12 11:16:28 -07:00
ZepmanBC
d17d9c80c8 fetchRebase.js French translation correction 2020-04-12 11:28:35 +02:00
Peter Cottle
6171afbaac
Merge pull request #674 from jeonhyun97/master 
korean translation typo revised & some improvement for polite speech
 2020-04-09 11:07:26 -07:00
Hyeon Jeon
4346f3f5b6 korean translation typo revised & some improvement for polite speech 2020-04-07 17:27:28 +09:00
Peter Cottle
e1f7c3677a
Merge pull request #673 from esinmy/master 
Russian translation is supplemented for level intro2.
 2020-04-06 09:48:48 -07:00
Maxim Esin
8fafa9e0f9 Russian translation is supplemented for level intro2. 2020-04-04 23:24:41 +03:00
Peter Cottle
70c1589d31
Merge pull request #672 from Hongarc/patch-2 
Using the production build of React
 2020-03-31 08:49:42 -07:00
Anh Hong
753c4dbc71
chore: using the production build of React 2020-03-31 12:31:15 +07:00
Peter Cottle
67664cc2c0
Merge pull request #670 from Hongarc/fix/unmount 
fix: `CommandView` don't need to unmount itself
 2020-03-30 08:12:30 -07:00
Peter Cottle
21a479578e
Merge pull request #669 from Hongarc/fix/storage 
fix: keep `localStorage`
 2020-03-30 08:11:03 -07:00
Peter Cottle
0891dc2c83
Merge pull request #668 from Hongarc/key-mirror 
refactor: use existing `keyMirror`
 2020-03-30 08:09:57 -07:00
hongarc
562843fa2e fix: CommandView don't need to unmount itself 2020-03-30 10:25:49 +07:00
hongarc
09dc54c76a fix: keep localStorage 2020-03-30 07:35:59 +07:00
hongarc
a34a522ba9 refactor: use existing keyMirror 2020-03-30 07:28:03 +07:00
Peter Cottle
699d5ffb71
Merge pull request #667 from pcottle/fixes660 
Issue #660 -- fix non-deterministic ordering of commits
 2020-03-29 17:10:17 -07:00
Peter Cottle
278004f957 Issue #660 -- fix non-deterministic ordering of commits 2020-03-29 17:05:57 -07:00
Peter Cottle
9f2c599d82
Merge pull request #662 from stefan-niedermayr/translateLevelLockedMaster2German 
Implemented german translation of lockedMaster level.
 2020-03-29 16:29:33 -07:00
Peter Cottle
be7807c3da
Merge pull request #666 from pcottle/addDeploy 
Try to add deploy command to gulp
 2020-03-29 16:29:21 -07:00
Peter Cottle
8c25dae8da Try to add deploy command to gulp 2020-03-29 16:25:20 -07:00
Peter Cottle
ef48f02661
Merge pull request #665 from pcottle/pr657followups 
Quick followups to PR #657
 2020-03-29 16:04:17 -07:00
Peter Cottle
21cc5e7382 Quick followups to PR #657 2020-03-29 15:57:55 -07:00
Peter Cottle
57caf3dc09
Merge pull request #657 from Hongarc/gulp 
chore: use `gulp` instead of `grunt`
 2020-03-29 15:55:32 -07:00
Peter Cottle
fc36652758
Merge pull request #664 from cbobinec/addFrenchLockedMaster 
add french translation to lockedMaster
 2020-03-27 20:38:52 -07:00
Peter Cottle
0544dc6694
Merge pull request #663 from cbobinec/fixMissingFrench 
Fix missing french translation
 2020-03-27 20:22:15 -07:00
cbobinec
549d9bb721 add french translation to lockedMaster 2020-03-27 16:56:23 +01:00
cbobinec
91397615ae Fix missing french translation 2020-03-27 08:57:55 +01:00
Stefan Niedermayr
90c86fce19 Implemented german translation of lockedMaster level. 2020-03-25 20:44:58 +01:00
Peter Cottle
c70dfe6c4d
Merge pull request #661 from Hongarc/patch-3 
chore(test): mock `localStorage`
 2020-03-24 13:05:28 -07:00
Anh Hong
b73c4ad23d
chore(test): mock localStorage 2020-03-25 01:55:13 +07:00
Peter Cottle
56738fbd09
Merge pull request #655 from Hongarc/patch-1 
[feat] update url if user change locale
 2020-03-15 16:00:01 -07:00
Peter Cottle
7b90679d1d
Merge pull request #658 from Hongarc/patch-2 
fix(typo): remove unnecessary `.`
 2020-03-15 15:59:14 -07:00
hongarc
fe0ebd635e chore(doc): update reference grunt to gulp 2020-03-15 22:36:18 +07:00
Hongarc
98050c4cbd
fix(typo): remove unnecessary . 2020-03-15 20:37:12 +07:00
hongarc
17e4f195e5 chore(jasmine): fix test in travis-ci 
auto detect language
 2020-03-15 11:06:03 +07:00
hongarc
25246b4024 chore(jasmine): add reporter 2020-03-15 10:55:42 +07:00
Hongarc
e00b5b640b feat: update url if user change locale 2020-03-15 10:33:33 +07:00
hongarc
edfd052c4c chore: use gulp instead of grunt 2020-03-15 03:54:56 +07:00
Peter Cottle
17bce6b835
Merge pull request #656 from pcottle/dependabot/npm_and_yarn/acorn-5.7.4 
Bump acorn from 5.7.3 to 5.7.4
 2020-03-13 16:33:28 -07:00
dependabot[bot]
a84c4b14ee
Bump acorn from 5.7.3 to 5.7.4 
Bumps [acorn](https://github.com/acornjs/acorn) from 5.7.3 to 5.7.4.
- [Release notes](https://github.com/acornjs/acorn/releases)
- [Commits](https://github.com/acornjs/acorn/compare/5.7.3...5.7.4)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-03-13 22:57:49 +00:00
Peter Cottle
079689c51a
Merge pull request #653 from Hongarc/no-grep 
No grep
 2020-03-05 12:38:50 -08:00