From 1bb1dd77f2157fe7e7e33bf23b4c39a771d5ba99 Mon Sep 17 00:00:00 2001 From: YourSenseiCreeper Date: Mon, 22 Feb 2021 17:55:20 +0100 Subject: [PATCH 1/6] New demo.gif, new contributor in list --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 38a4dd3b..50101306 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ LearnGitBranching is a git repository visualizer, sandbox, and a series of educa You can input a variety of commands into LearnGitBranching (LGB) -- as commands are processed, the nearby commit tree will dynamically update to reflect the effects of each command: -![demo-gif](https://user-images.githubusercontent.com/7308241/39848730-040bd09e-53df-11e8-964e-2d48f35a4355.gif) +![demo-gif](https://user-images.githubusercontent.com/6324814/108740487-02c3c400-7536-11eb-9dd1-53275cdf76fb.gif) This visualization combined with tutorials and "levels" can help both beginners and intermediate developers polish their version control skills. A quick demo is available here: https://pcottle.github.com/learnGitBranching/?demo @@ -133,6 +133,7 @@ Alternatively, you can also build and run the app in a pre-configured online wor + [//]: contributor-faces @@ -162,6 +163,7 @@ And the following heroes for assisting in translating: * Vasil Kulakov ("coyl") & Lyubov Agadjanyan ("shayenblue") * Aliaksei Berkau ("alexeiberkov") * Mizunashi Mana ("mizunashi-mana") +* YourSenseiCreeper * Olsza Also huge shoutout for everyone who has put up a pull request that was pulled! Check out the 30+ contributors we have in the [Contributors View](https://github.com/pcottle/learnGitBranching/graphs/contributors) From 0fadb54f722040be74063741ac79c75936024ada Mon Sep 17 00:00:00 2001 From: Peter Cottle Date: Tue, 23 Feb 2021 17:44:28 -0700 Subject: [PATCH 2/6] switch to .io due to upcoming deprecation --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 50101306..e6b58367 100644 --- a/README.md +++ b/README.md @@ -10,10 +10,10 @@ You can input a variety of commands into LearnGitBranching (LGB) -- as commands ![demo-gif](https://user-images.githubusercontent.com/6324814/108740487-02c3c400-7536-11eb-9dd1-53275cdf76fb.gif) This visualization combined with tutorials and "levels" can help both beginners and intermediate developers polish their version control skills. A quick demo is available here: -https://pcottle.github.com/learnGitBranching/?demo +https://pcottle.github.io/learnGitBranching/?demo Or, you can launch the application normally here: -https://pcottle.github.com/learnGitBranching/ +https://pcottle.github.io/learnGitBranching/ ### Sandbox Mode From 602bd33af48ae6c8f9d22b65d59689dd0cd3e31d Mon Sep 17 00:00:00 2001 From: Peter Cottle Date: Thu, 25 Feb 2021 11:21:55 -0700 Subject: [PATCH 3/6] Add settings app yaml file --- .github/settings.yaml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .github/settings.yaml diff --git a/.github/settings.yaml b/.github/settings.yaml new file mode 100644 index 00000000..529b9e6c --- /dev/null +++ b/.github/settings.yaml @@ -0,0 +1,3 @@ +repository: + description: An interactive git visualization and tutorial. Aspiring students of git can use this app to educate and challenge themselves towards mastery of git! + homepage: https://pcottle.github.io/learnGitBranching/ From 2ab998ace49d93317d97c4fa78edd621a46cc674 Mon Sep 17 00:00:00 2001 From: Peter Cottle Date: Thu, 25 Feb 2021 11:22:44 -0700 Subject: [PATCH 4/6] Add settings app yml file (whoops) --- .github/{settings.yaml => settings.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/{settings.yaml => settings.yml} (100%) diff --git a/.github/settings.yaml b/.github/settings.yml similarity index 100% rename from .github/settings.yaml rename to .github/settings.yml From cd0a070e43df7298059a469a763431e7d359c394 Mon Sep 17 00:00:00 2001 From: Peter Cottle Date: Thu, 25 Feb 2021 11:24:05 -0700 Subject: [PATCH 5/6] tabs vs spaces --- .github/settings.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/settings.yml b/.github/settings.yml index 529b9e6c..185cc34d 100644 --- a/.github/settings.yml +++ b/.github/settings.yml @@ -1,3 +1,3 @@ repository: - description: An interactive git visualization and tutorial. Aspiring students of git can use this app to educate and challenge themselves towards mastery of git! - homepage: https://pcottle.github.io/learnGitBranching/ + description: An interactive git visualization and tutorial. Aspiring students of git can use this app to educate and challenge themselves towards mastery of git! + homepage: https://pcottle.github.io/learnGitBranching/ From 8057d2a5da5c085e86d8521b82bb1369d4d7ef66 Mon Sep 17 00:00:00 2001 From: sam king Date: Thu, 4 Mar 2021 08:48:58 -0800 Subject: [PATCH 6/6] switching use of master to main in git branch cmd --- src/js/git/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/js/git/index.js b/src/js/git/index.js index 160dfc33..1b9354b0 100644 --- a/src/js/git/index.js +++ b/src/js/git/index.js @@ -793,8 +793,8 @@ GitEngine.prototype.printBranchesWithout = function(without) { GitEngine.prototype.printBranches = function(branches) { var result = ''; - branches.forEach(function (branch) { - result += (branch.selected ? '* ' : '') + branch.id + '\n'; + branches.forEach(branch => { + result += (branch.selected ? '* ' : '') + this.resolveName(branch.id).split('"')[1] + '\n'; }); throw new CommandResult({ msg: result