mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-08-02 17:15:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
2662 commits 7 branches 0 tags 104 MiB
Commit graph

2662 commits

This branch
This branch
All branches
Author SHA1 Message Date
Peter Cottle
65ce433d11 merge main 2021-05-06 16:11:54 -06:00
Peter Cottle
24dd0a0c95
Merge pull request #833 from pcottle/dependabot/npm_and_yarn/lodash-4.17.21 
Bump lodash from 4.17.19 to 4.17.21
 2021-05-06 16:11:12 -06:00
dependabot[bot]
b44c1397fc
Bump lodash from 4.17.19 to 4.17.21 
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.19 to 4.17.21.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.19...4.17.21)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-06 22:01:44 +00:00
Peter Cottle
f858f15c2e merge main 2021-05-06 16:00:45 -06:00
Peter Cottle
3a47c833b2
Merge pull request #832 from pcottle/dependabot/npm_and_yarn/underscore-1.12.1 
Bump underscore from 1.4.4 to 1.12.1
 2021-05-06 16:00:21 -06:00
dependabot[bot]
46cdf2e339
Bump underscore from 1.4.4 to 1.12.1 
Bumps [underscore](https://github.com/jashkenas/underscore) from 1.4.4 to 1.12.1.
- [Release notes](https://github.com/jashkenas/underscore/releases)
- [Commits](https://github.com/jashkenas/underscore/compare/1.4.4...1.12.1)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-06 20:59:49 +00:00
Peter Cottle
f2b2f676d2 rebuild for prod 2021-04-24 21:03:08 -06:00
Peter Cottle
14b36f897c merge main 2021-04-24 21:02:55 -06:00
Peter Cottle
c388682c54
Merge pull request #829 from MLipfert1/IntlFixes 
Updated german translation
 2021-04-24 21:02:44 -06:00
Moritz Lipfert
0f0599b860 Updated german translation 2021-04-24 12:43:05 +02:00
Peter Cottle
6f197f7619 rebuild for prod 2021-04-22 17:12:16 -06:00
Peter Cottle
4108415914 merge main 2021-04-22 17:12:03 -06:00
Peter Cottle
8d483a75a6
Merge pull request #828 from YourSenseiCreeper/main 
A little polish to Polish translation
 2021-04-22 17:11:49 -06:00
YourSenseiCreeper
e90a9107c0 Polish translation polishes to rebasing 2021-04-23 00:09:25 +02:00
YourSenseiCreeper
861bc30369 Splash screen updated translation 
Moreover:
+ Translation style unification
 2021-04-22 21:43:08 +02:00
YourSenseiCreeper
f7447c7904 Polish translation improvements 2021-04-22 19:36:37 +02:00
Peter Cottle
58c92f008c Fix tabs vs spaces 2021-04-19 16:15:44 -06:00
Peter Cottle
22bf2d106c merge main 2021-04-19 15:03:00 -06:00
Peter Cottle
a9b07dd95e Update script after renaming master branch to main in repo 2021-04-19 15:02:25 -06:00
Peter Cottle
54c4e8f1a3 rebuild for prod 2021-04-19 13:15:35 -06:00
Peter Cottle
e9492f4576 merge master 2021-04-19 13:15:20 -06:00
Peter Cottle
2df860e4dc consistent naming of the app 2021-04-19 13:15:12 -06:00
Peter Cottle
5e5c258b02 rebuild for prod 2021-04-19 13:13:27 -06:00
Peter Cottle
20c0231a83 merge master 2021-04-19 13:13:14 -06:00
Peter Cottle
72462b1b9a one typo 2021-04-19 13:11:44 -06:00
Peter Cottle
ab3a2349ed #824 update reference to rename 2021-04-19 13:10:56 -06:00
Peter Cottle
f6ccbdd19d rebuild for prod 2021-04-19 08:23:54 -06:00
Peter Cottle
26aae9c36b merge master 2021-04-19 08:23:40 -06:00
Peter Cottle
617c22232d PR #824 -- revert one master reference for the build script 2021-04-19 08:23:29 -06:00
Peter Cottle
54ea8c6d86
Merge pull request #824 from hong4rc/all-main 
refactor: replace all master to main
 2021-04-19 08:21:44 -06:00
Anh Hồng
b7ac2851c6 refactor: replace all master to main 2021-04-19 10:52:05 +07:00
Peter Cottle
5e739f3c1f rebuild for prod 2021-04-16 09:04:34 -06:00
Peter Cottle
7e12ba03b0 merge master 2021-04-16 09:04:19 -06:00
Peter Cottle
4148f0b846 Followup to #823 -- consolidate logic 2021-04-16 09:03:24 -06:00
Peter Cottle
feb4782623
Merge pull request #823 from cbrenberg/821-master-to-main-onclick 
change master to main in CLI output when checking out via click
 2021-04-16 09:02:20 -06:00
Peter Cottle
2262fc5d00 rebuild for prod 2021-04-16 08:55:20 -06:00
Peter Cottle
60c1cef3e9 merge master 2021-04-16 08:55:07 -06:00
Christopher Brenberg
9eaf366d65 change master to main in CLI output when checking out via click 2021-04-16 09:45:28 -05:00
Peter Cottle
c2b07e9fd7
Merge pull request #822 from hong4rc/dialog-dragging 
Revert "Fix image display in the goal popup"
 2021-04-16 08:38:06 -06:00
Anh Hồng
d57bdb83f2 Revert "Fix image display in the goal popup" 
This reverts commit e110bcedd0.
 2021-04-16 16:19:46 +07:00
Peter Cottle
d1b6881a96 rebuild for prod 2021-04-01 08:27:11 -06:00
Peter Cottle
2ab4568d6c merge master 2021-04-01 08:26:58 -06:00
Peter Cottle
9e286770fe Resolves #820 -- clarify instructions 2021-04-01 08:26:37 -06:00
Peter Cottle
6e8af422eb
Merge pull request #819 from pcottle/dependabot/npm_and_yarn/y18n-3.2.2 
Bump y18n from 3.2.1 to 3.2.2
 2021-03-30 18:45:20 -06:00
dependabot[bot]
2149e27007
Bump y18n from 3.2.1 to 3.2.2 
Bumps [y18n](https://github.com/yargs/y18n) from 3.2.1 to 3.2.2.
- [Release notes](https://github.com/yargs/y18n/releases)
- [Changelog](https://github.com/yargs/y18n/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yargs/y18n/commits)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-03-30 18:13:45 +00:00
Peter Cottle
25cd94124d rebuild for prod 2021-03-23 08:10:31 -06:00
Peter Cottle
20a9fdc1ca merge master 2021-03-23 08:10:19 -06:00
Peter Cottle
8249f01651 Resolves #818 2021-03-23 08:10:10 -06:00
Peter Cottle
c90ba21473 rebuild for prod 2021-03-17 09:32:28 -06:00
Peter Cottle
d9bb735422 merge master 2021-03-17 09:32:13 -06:00