From 592cea5f8d6d87a28dfce939b0065f864feb4903 Mon Sep 17 00:00:00 2001 From: Yasmine Date: Tue, 17 Oct 2017 20:31:01 +0400 Subject: [PATCH 001/195] general documentation (with examples) for squashing with git rebase added --- additional-material/squashing-commits.md | 87 ++++++++++++++++++++++++ 1 file changed, 87 insertions(+) create mode 100644 additional-material/squashing-commits.md diff --git a/additional-material/squashing-commits.md b/additional-material/squashing-commits.md new file mode 100644 index 00000000000..ef8cdaeabb2 --- /dev/null +++ b/additional-material/squashing-commits.md @@ -0,0 +1,87 @@ +# What is squashing? + +In git, squashing refers to rewriting the history of your commits, so you end up with one commit with a description of the changes done. +It's usually done in open source projects because a lot of the history of a branch in open source projects is only relevant to the developer who created it, and this provides a simpler way to describe the changes made and also revert them if needed. + +# How do you squash commits? + +First, perform a git log to review the commits you would like to merge in your current branch. + +``` +git log +``` + +You should see a series of your commits like so: + +``` +commit blablabla +Author: omguhh +Date: 10/10/20 + Commit message 1 + +commit blablabla2 +Author: omguhh +Date: 10/10/20 + Commit message 2 +``` + +So now that you see the commits you wish to merge to one, we can move along into doing that with git rebase. Assuming you're already familiar with git rebase, we can starting squashing commits in the interactive mode of git rebase that you can activate like so: + +``` +git rebase -i +``` + +Now, with interactive rebasing you can specify the starting and end point of how far back you want to go with commits like so: + +``` +git rebase -i HEAD~2 +``` + +Running this command will show you something like the following: + +``` +pick blablabla Changing test01.txt file +pick blablabla2 Adding dummy01.txt file + +# +# Commands: +# p, pick = use commit +# r, reword = use commit, but edit the commit message +# e, edit = use commit, but stop for amending +# s, squash = use commit, but meld into previous commit +# f, fixup = like "squash", but discard this commit's log message +# x, exec = run command (the rest of the line) using shell +# +# These lines can be re-ordered; they are executed from top to bottom. +# +# If you remove a line here THAT COMMIT WILL BE LOST. +# +# However, if you remove everything, the rebase will be aborted. +# +# Note that empty commits are commented out +``` + +So if you want to squash blablabla2 into blablablabla, you would change the following : + +``` +pick blablabla Changing test01.txt file +squash blablabla2 Adding dummy01.txt file + +``` + +If all goes well, you'd get a result that looks like this: + +``` +# This is a combination of 2 commits. +# The first commit's message is: +commit message 1 + +# This is the 2nd commit message: + +commit message 2 + +``` + +That you can freely change before you decide to exit the editor to save these changes. + +Running git log again should show you the commit message you entered before exiting the screen with the commits combined into one. \ No newline at end of file From c8ebefbbef978f30ea4d574590d62641d4e4ba91 Mon Sep 17 00:00:00 2001 From: Bob Kim Date: Tue, 17 Oct 2017 19:02:37 +0000 Subject: [PATCH 002/195] Add additional materials for KO --- additional-material/ko/additional-material.md | 11 +++++ ...g-your-fork-synced-with-this-repository.md | 40 +++++++++++++++++++ .../removing-branch-from-your-repository.md | 30 ++++++++++++++ 3 files changed, 81 insertions(+) create mode 100644 additional-material/ko/additional-material.md create mode 100644 additional-material/ko/keeping-your-fork-synced-with-this-repository.md create mode 100644 additional-material/ko/removing-branch-from-your-repository.md diff --git a/additional-material/ko/additional-material.md b/additional-material/ko/additional-material.md new file mode 100644 index 00000000000..6c7aa933de4 --- /dev/null +++ b/additional-material/ko/additional-material.md @@ -0,0 +1,11 @@ +# 추가 정보 + +여러분이 여기에 오기 전에 기본실습 과정을 이미 완료했다고 가정합니다. 이곳에서는 고급 Git 기술에 대한 정보를 제공합니다. + +### [ 여러분의 저장소에서 브랜치 삭제하기 ](removing-branch-from-your-repository.md) +이 문서는 저장소에서 브랜치를 삭제하는 방법에 대한 정보를 제공합니다. +> PR(pull request) 요청이 병합 된 후에 본 단계를 수행하십시오. + +### [ 여러분이 포크한 저장소와 싱크상태 유지하기 ](keeping-your-fork-synced-with-this-repository.md) +이 문서는 포크 된 저장소를 기본 저장소로 최신 상태로 유지하는 방법에 대한 정보를 제공합니다. 여러분과 다른 많은 사람들이 프로젝트에 기여하기를 바랍니다. +> 포크 된 상위 저장소가 변경되지 않은 경우 다음 단계를 수행하십시오. \ No newline at end of file diff --git a/additional-material/ko/keeping-your-fork-synced-with-this-repository.md b/additional-material/ko/keeping-your-fork-synced-with-this-repository.md new file mode 100644 index 00000000000..54dfa7bf95b --- /dev/null +++ b/additional-material/ko/keeping-your-fork-synced-with-this-repository.md @@ -0,0 +1,40 @@ +# 여러분이 포크한 저장소와 싱크상태 유지하기 + +먼저, 전체 싱크과정을 이해해야합니다. 본 스키마에는 3개의 리포들이 있습니다. 저의 GitHub에 있는 제 공개리포인 `github.com/Roshanjossey/first-contributions/`와 여러분의 포크된 리포인 `github.com/Your-Name/first-contributions/`, 그리고 로컬 머신에 위치해서 현재 작업중인 리포가 있습니다. 오픈 소스 프로젝트에 특화된 이러한 조합을 `트라이앵클 워크플로우`라고 부릅니다. +triangle workflow + +여러분의 두 개의 리포들을 제 공개 리포의 최신 상태와 싱크상태를 유지하기 위해서는 제일 먼저여러분의 로컬머신에 위치한 리포를 제 공개 리포와 fetch와 merge를 해야합니다. +두번째는 여러분의 로컬 리포를 포크된 GitHub의 리포에 push하는 것 입니다. 이전 과정에서 봤듯이 "pull request"를 요청할 수 있는 곳은 오직 포크된 리포에서만 가능합니다. 따라서 마지막으로 업데이트 되어야하는 리포는 포크된 GitHub입니다. +자, 어떻게하는지 보겠습니다: +먼저 여러분은 master 브랜치에 위치해 있어야합니다. 현재 어떤 브래치에 있는지 확인합니다.: +``` +git status +``` +현재 master 브랜치가 아니라면 변경합니다.: +``` +git checkout master +``` + +제 공개 리포를 아직 여러분의 git에 추가하지 않았다면 다음 명령으로 추가합니다. `add upstream remote-url`: +``` +git remote add upstream https://github.com/Roshanjossey/first-contributions +``` +지정한 URL을 이용해 현재 프로젝트의 또 다른 최신 버전이 있는지 git에게 확인을 요청하는 방법입니다. 그리고 우리는 이를 `upstream` 이라고 부르기로합니다. 일단 git이 이러한 이름을 가지고 있다면 다음과 같이 공개 리포의 최진 버전을 가지고 옵니다. : +``` +git fetch upstream +``` + +여러분은 이제 제 포크(upstream remote)에서 최신 버전을 내려 받았습니다. 이제 공개 리포의 변경된 내용을 여러분의 master 브랜치에 병합해야합니다. +``` +git rebase upstream/master +``` + +여러분의 master 브랜치와 공개 리포를 병합하고 나면 이제 여러분의 로컬머신의 master 브랜치는 최신 상태입니다. 마지막으로 여러분의 master 브랜치를 여러분의 포크에 push하게 되면 포크한 GitHub 또한 변경사항들이 반영됩니다.: +``` +git push origin master +``` +origin으로 명명된 리모트에 push하는 것에 주의하세요. +이제 여러분의 모든 리포가 최신 상태를 유지하게 되었습니다. +잘 하셨습니다! GitHub 리포에 커밋이 추가적으로 발생할 때마다 이러한 작업을 해야합니다. + + diff --git a/additional-material/ko/removing-branch-from-your-repository.md b/additional-material/ko/removing-branch-from-your-repository.md new file mode 100644 index 00000000000..fe69271611d --- /dev/null +++ b/additional-material/ko/removing-branch-from-your-repository.md @@ -0,0 +1,30 @@ +## 여러분의 저장소에서 브랜치 삭제하기 + +지금까지의 튜토리얼을 수행했다면, 우리의 `` 브랜치가 목적을 완료했습니다. 이제는 로컬 저장소에서 삭제할 차례입니다. 필수사항은 아니지만 이 브랜치의 이름은 다소 특별한 목적을 나타내므로 이미 병합되었다면 그 수명을 다했다고 할 수 있습니다. +First, let's merge your `` to your master, so to go your master branch: +먼저, ``을 마스터에 합쳐야합니다. 마스터 브랜치로 이동합니다.: +``` +git checkout master +``` + +``를 마스터에 병합합니다.: +``` +git merge master +``` + +``를 로컬 저장소에서 삭제합니다.: +``` +git branch -d +``` + +이제 로컬 머신의 ``브랜치를 삭제했고 모든 것이 깔끔하게 보입니다. +이 시점에서 GitHub 포크에 여전히 `` 브랜치가 있어야합니다. 그러나 이것을 삭제하기 전에 이 원격지의 브랜치에서 상위 저장소로 "PR(Pull request)"을 보냈음을 기억하십시오. 따라서 아직 병합되지 않았다면이 브랜치를 삭제하지 마십시오. +그러나 해당 브래치를 이미 병합했고 원격 브랜치를 삭제하려면 다음을 사용하십시오.: +``` +git push origin --delete +``` + +자, 여러분은 이제 자신의 브래치를 정리하는 법을 배웠습니다. +시간이 지나면 많은 커밋이 리포에 추가됩니다. 그리고 로컬 머신과 GitHub 포크의 마스터 브랜치는 최신 버전이 아닙니다. 따라서 저장소를 내 것과 동기화 된 상태로 유지하려면 아래 단계를 따르십시오. + +#### [ 여러분이 포크한 저장소와 싱크상태 유지하기 ](keeping-your-fork-synced-with-this-repository.kr.md) From 04857a779ffe66bfec0ce59a236b935cf0779549 Mon Sep 17 00:00:00 2001 From: Bob Kim Date: Tue, 17 Oct 2017 19:05:39 +0000 Subject: [PATCH 003/195] Fix link address --- additional-material/ko/removing-branch-from-your-repository.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/additional-material/ko/removing-branch-from-your-repository.md b/additional-material/ko/removing-branch-from-your-repository.md index fe69271611d..b274e4e3713 100644 --- a/additional-material/ko/removing-branch-from-your-repository.md +++ b/additional-material/ko/removing-branch-from-your-repository.md @@ -27,4 +27,4 @@ git push origin --delete 자, 여러분은 이제 자신의 브래치를 정리하는 법을 배웠습니다. 시간이 지나면 많은 커밋이 리포에 추가됩니다. 그리고 로컬 머신과 GitHub 포크의 마스터 브랜치는 최신 버전이 아닙니다. 따라서 저장소를 내 것과 동기화 된 상태로 유지하려면 아래 단계를 따르십시오. -#### [ 여러분이 포크한 저장소와 싱크상태 유지하기 ](keeping-your-fork-synced-with-this-repository.kr.md) +#### [ 여러분이 포크한 저장소와 싱크상태 유지하기 ](keeping-your-fork-synced-with-this-repository.md) From e83704bd9b45a14dde81e75a810d20372bcdcf66 Mon Sep 17 00:00:00 2001 From: Bob Kim Date: Tue, 17 Oct 2017 19:21:25 +0000 Subject: [PATCH 004/195] Change directory and fix a linked file --- .../additional-material.ko.md} | 4 ++-- .../keeping-your-fork-synced-with-this-repository.ko.md} | 0 .../removing-branch-from-your-repository.ko.md} | 2 +- translations/README.ko.md | 2 +- translations/README.pt_br.md | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) rename additional-material/{ko/additional-material.md => translations/additional-material.ko.md} (89%) rename additional-material/{ko/keeping-your-fork-synced-with-this-repository.md => translations/keeping-your-fork-synced-with-this-repository.ko.md} (100%) rename additional-material/{ko/removing-branch-from-your-repository.md => translations/removing-branch-from-your-repository.ko.md} (96%) diff --git a/additional-material/ko/additional-material.md b/additional-material/translations/additional-material.ko.md similarity index 89% rename from additional-material/ko/additional-material.md rename to additional-material/translations/additional-material.ko.md index 6c7aa933de4..872497064c3 100644 --- a/additional-material/ko/additional-material.md +++ b/additional-material/translations/additional-material.ko.md @@ -2,10 +2,10 @@ 여러분이 여기에 오기 전에 기본실습 과정을 이미 완료했다고 가정합니다. 이곳에서는 고급 Git 기술에 대한 정보를 제공합니다. -### [ 여러분의 저장소에서 브랜치 삭제하기 ](removing-branch-from-your-repository.md) +### [ 여러분의 저장소에서 브랜치 삭제하기 ](removing-branch-from-your-repository.ko.md) 이 문서는 저장소에서 브랜치를 삭제하는 방법에 대한 정보를 제공합니다. > PR(pull request) 요청이 병합 된 후에 본 단계를 수행하십시오. -### [ 여러분이 포크한 저장소와 싱크상태 유지하기 ](keeping-your-fork-synced-with-this-repository.md) +### [ 여러분이 포크한 저장소와 싱크상태 유지하기 ](keeping-your-fork-synced-with-this-repository.ko.md) 이 문서는 포크 된 저장소를 기본 저장소로 최신 상태로 유지하는 방법에 대한 정보를 제공합니다. 여러분과 다른 많은 사람들이 프로젝트에 기여하기를 바랍니다. > 포크 된 상위 저장소가 변경되지 않은 경우 다음 단계를 수행하십시오. \ No newline at end of file diff --git a/additional-material/ko/keeping-your-fork-synced-with-this-repository.md b/additional-material/translations/keeping-your-fork-synced-with-this-repository.ko.md similarity index 100% rename from additional-material/ko/keeping-your-fork-synced-with-this-repository.md rename to additional-material/translations/keeping-your-fork-synced-with-this-repository.ko.md diff --git a/additional-material/ko/removing-branch-from-your-repository.md b/additional-material/translations/removing-branch-from-your-repository.ko.md similarity index 96% rename from additional-material/ko/removing-branch-from-your-repository.md rename to additional-material/translations/removing-branch-from-your-repository.ko.md index b274e4e3713..c254c113bca 100644 --- a/additional-material/ko/removing-branch-from-your-repository.md +++ b/additional-material/translations/removing-branch-from-your-repository.ko.md @@ -27,4 +27,4 @@ git push origin --delete 자, 여러분은 이제 자신의 브래치를 정리하는 법을 배웠습니다. 시간이 지나면 많은 커밋이 리포에 추가됩니다. 그리고 로컬 머신과 GitHub 포크의 마스터 브랜치는 최신 버전이 아닙니다. 따라서 저장소를 내 것과 동기화 된 상태로 유지하려면 아래 단계를 따르십시오. -#### [ 여러분이 포크한 저장소와 싱크상태 유지하기 ](keeping-your-fork-synced-with-this-repository.md) +#### [ 여러분이 포크한 저장소와 싱크상태 유지하기 ](keeping-your-fork-synced-with-this-repository.ko.md) diff --git a/translations/README.ko.md b/translations/README.ko.md index c0852d98ee6..ad2ed43da26 100644 --- a/translations/README.ko.md +++ b/translations/README.ko.md @@ -140,7 +140,7 @@ git push origin master origin 이라 명명된 원격으로 푸시하고 있는 것에 주목하세요. -### [ 추가 정보 ](additional-material/additional-material.ko.md) +### [ 추가 정보 ](../additional-material/additional-material.ko.md) ## 자습서 다른 도구 사용 diff --git a/translations/README.pt_br.md b/translations/README.pt_br.md index 733b47d4ef9..09bb9031246 100644 --- a/translations/README.pt_br.md +++ b/translations/README.pt_br.md @@ -85,7 +85,7 @@ Agora envie um Pull Request. Logo estarei mesclando as suas mudanças no Branch principal (master) deste projeto. Você receberá um e-mail de notificação quando as alterações forem mescladas. -### [ Material adicional ](additional-material/translations/additional-material.pt_br.md) +### [ Material adicional ](../additional-material/translations/additional-material.pt_br.md) ## Tutoriais com outras ferramentas From 615fac40f6416b97a58344f581260b3da14352a6 Mon Sep 17 00:00:00 2001 From: Bob Kim Date: Tue, 17 Oct 2017 19:23:33 +0000 Subject: [PATCH 005/195] Fix a linked file --- translations/README.ko.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/README.ko.md b/translations/README.ko.md index ad2ed43da26..403a67015c8 100644 --- a/translations/README.ko.md +++ b/translations/README.ko.md @@ -140,7 +140,7 @@ git push origin master origin 이라 명명된 원격으로 푸시하고 있는 것에 주목하세요. -### [ 추가 정보 ](../additional-material/additional-material.ko.md) +### [ 추가 정보 ](../additional-material/translations/additional-material.ko.md) ## 자습서 다른 도구 사용 From 5cd3a76a69ef7613a486ce36e1fb5eeb4f7f9115 Mon Sep 17 00:00:00 2001 From: Bao Tran Date: Tue, 17 Oct 2017 14:41:42 -0500 Subject: [PATCH 006/195] Add Bao Tran to Contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 4881c7ac794..6e6fb4dd4d2 100644 --- a/Contributors.md +++ b/Contributors.md @@ -1,3 +1,4 @@ +- [Bao Tran](https://github.com/cyborg103) - [Jithu R Jacob 🤓](https://github.com/jithurjacob) - [gipsi](https://github.com/gipsi) - [girlzap](https://github.com/girlzap) From 0db83f09232c9f43d69f3c05e1c0a22b2beef333 Mon Sep 17 00:00:00 2001 From: Paul Chabot Date: Tue, 17 Oct 2017 22:53:56 +0200 Subject: [PATCH 007/195] Add Paul Chabot to Contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 4881c7ac794..8db39324195 100644 --- a/Contributors.md +++ b/Contributors.md @@ -792,3 +792,4 @@ - [James Lave](https://github.com/jameslave) - [Rovaron](https://github.com/Rovaron) - [Augusto Queiroz](https://github.com/AugustoQueiroz) +- [Paul Chabot](https://github.com/paulch4bot) \ No newline at end of file From 55ebe3d562e30420f7be0efe9a457dd52445b6a0 Mon Sep 17 00:00:00 2001 From: iRuisu Date: Tue, 17 Oct 2017 22:16:32 +0100 Subject: [PATCH 008/195] iRuisu added to Contributors.md --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 4881c7ac794..ec973422e9d 100644 --- a/Contributors.md +++ b/Contributors.md @@ -1,3 +1,4 @@ +- [Lewis Shaw](https://github.com/iRuisu) - [Jithu R Jacob 🤓](https://github.com/jithurjacob) - [gipsi](https://github.com/gipsi) - [girlzap](https://github.com/girlzap) From a9cb8a5449a3a1d68a98cc90795c9ea41210bf02 Mon Sep 17 00:00:00 2001 From: jaw0608 <32886201+jaw0608@users.noreply.github.com> Date: Tue, 17 Oct 2017 20:52:24 -0400 Subject: [PATCH 009/195] Add Joe Wilson to Contributers List --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 4881c7ac794..eeaf11eab7e 100644 --- a/Contributors.md +++ b/Contributors.md @@ -792,3 +792,4 @@ - [James Lave](https://github.com/jameslave) - [Rovaron](https://github.com/Rovaron) - [Augusto Queiroz](https://github.com/AugustoQueiroz) +- [Joe Wilson] (https://github.com/jaw0608) \ No newline at end of file From a50cbae37c87f4baf57ff57371379e92420faedc Mon Sep 17 00:00:00 2001 From: Bflorio14 Date: Tue, 17 Oct 2017 20:57:48 -0400 Subject: [PATCH 010/195] Add Brianna Florio to Contributors list --- Contributors.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Contributors.md b/Contributors.md index 4881c7ac794..47633e21780 100644 --- a/Contributors.md +++ b/Contributors.md @@ -1,4 +1,4 @@ -- [Jithu R Jacob 🤓](https://github.com/jithurjacob) +- [Jithu R Jacob 🤓](https://github.com/jithurjacob) - [gipsi](https://github.com/gipsi) - [girlzap](https://github.com/girlzap) - [DevMaterial](https://github.com/DevMaterial) @@ -792,3 +792,4 @@ - [James Lave](https://github.com/jameslave) - [Rovaron](https://github.com/Rovaron) - [Augusto Queiroz](https://github.com/AugustoQueiroz) +- [Brianna Florio] (https://github.com/Bflorio14) From e8677d304a76039ddb3de018f10f448e053b9017 Mon Sep 17 00:00:00 2001 From: Bflorio14 Date: Tue, 17 Oct 2017 21:09:04 -0400 Subject: [PATCH 011/195] Add Brianna Florio to Contributors list --- Contributors.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Contributors.md b/Contributors.md index 47633e21780..c74ad8bde4b 100644 --- a/Contributors.md +++ b/Contributors.md @@ -792,4 +792,4 @@ - [James Lave](https://github.com/jameslave) - [Rovaron](https://github.com/Rovaron) - [Augusto Queiroz](https://github.com/AugustoQueiroz) -- [Brianna Florio] (https://github.com/Bflorio14) +- [Brianna Florio](https://github.com/Bflorio14) From 704190c06058fa2870afa3091d09f8e2d3e8808c Mon Sep 17 00:00:00 2001 From: Bflorio14 Date: Tue, 17 Oct 2017 21:14:50 -0400 Subject: [PATCH 012/195] fixed something so no merge conflict --- Contributors.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Contributors.md b/Contributors.md index c74ad8bde4b..46204bc9287 100644 --- a/Contributors.md +++ b/Contributors.md @@ -1,4 +1,4 @@ -- [Jithu R Jacob 🤓](https://github.com/jithurjacob) +- [Jithu R Jacob 🤓](https://github.com/jithurjacob) - [gipsi](https://github.com/gipsi) - [girlzap](https://github.com/girlzap) - [DevMaterial](https://github.com/DevMaterial) From d81cdb9b351653fd105d98f0e145d3b4835e49ae Mon Sep 17 00:00:00 2001 From: Tim Guenthner Date: Tue, 17 Oct 2017 20:56:08 -0500 Subject: [PATCH 013/195] Add aerotog to Contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 3dae7294bc6..d6f1812c8c6 100644 --- a/Contributors.md +++ b/Contributors.md @@ -797,3 +797,4 @@ - [Brianna Florio](https://github.com/Bflorio14) - [Joe Wilson] (https://github.com/jaw0608) - [Paul Chabot](https://github.com/paulch4bot) +- [Tim Guenthner](https://github.com/aerotog) From 060c2013cd67cbb70b365a711a30ff053b1e4c39 Mon Sep 17 00:00:00 2001 From: Oliver-H-Miller Date: Tue, 17 Oct 2017 21:13:37 -0500 Subject: [PATCH 014/195] Update Contributors.md --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index d6f1812c8c6..1edbf3d1ba0 100644 --- a/Contributors.md +++ b/Contributors.md @@ -1,3 +1,4 @@ +- [Oliver Miller](https://github.com/Oliver-H-Miller) - [Lewis Shaw](https://github.com/iRuisu) - [Bao Tran](https://github.com/cyborg103) - [Jithu R Jacob 🤓](https://github.com/jithurjacob) From 3b99acfc29c5b4fd78f50dd53228b029506b037f Mon Sep 17 00:00:00 2001 From: Napat Wongcharoen Date: Wed, 18 Oct 2017 10:22:59 +0700 Subject: [PATCH 015/195] Add nwchr to contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 1edbf3d1ba0..63cf079c92e 100644 --- a/Contributors.md +++ b/Contributors.md @@ -51,6 +51,7 @@ - [Eduard Barata](https://github.com/bar-alex) - [Richard Placide](https://github.com/richardplacide) - [Jake Frn](https://github.com/jakefrn) +- [Napat](https://github.com/napatwongchr) - [Eric Audran](https://github.com/Nevosis) - [Silvino Vieiew](https://github.com/silvinovieira) - [Michael Isprihanto](https://github.com/michaelisprihanto) From d6dcb8d731ddfd115763ed9ade6141310756ad5b Mon Sep 17 00:00:00 2001 From: kik Date: Wed, 18 Oct 2017 10:24:41 +0700 Subject: [PATCH 016/195] Add tachanokkik to Contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 1edbf3d1ba0..42723db9df7 100644 --- a/Contributors.md +++ b/Contributors.md @@ -799,3 +799,4 @@ - [Joe Wilson] (https://github.com/jaw0608) - [Paul Chabot](https://github.com/paulch4bot) - [Tim Guenthner](https://github.com/aerotog) +- [Kik Tachanok](https://github.com/tachanokkik) From d09b4713391de13ad3c79d34b1c01111bfbe44fb Mon Sep 17 00:00:00 2001 From: jhonatancasale Date: Wed, 18 Oct 2017 01:35:30 -0200 Subject: [PATCH 017/195] Add Jhonatan Casale to Contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 1edbf3d1ba0..96076ba6a26 100644 --- a/Contributors.md +++ b/Contributors.md @@ -799,3 +799,4 @@ - [Joe Wilson] (https://github.com/jaw0608) - [Paul Chabot](https://github.com/paulch4bot) - [Tim Guenthner](https://github.com/aerotog) +- [Jhonatan Casale](https://github.com/jhonatancasale) From a9495e734580d5aaaeddf3206e42096f6a61a8c8 Mon Sep 17 00:00:00 2001 From: Yasmine Date: Tue, 17 Oct 2017 20:31:01 +0400 Subject: [PATCH 018/195] Documentation for squashing commits (with interactive git rebase) guide added --- additional-material/squashing-commits.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/additional-material/squashing-commits.md b/additional-material/squashing-commits.md index ef8cdaeabb2..5fc50d56240 100644 --- a/additional-material/squashing-commits.md +++ b/additional-material/squashing-commits.md @@ -25,7 +25,7 @@ Date: 10/10/20 Commit message 2 ``` -So now that you see the commits you wish to merge to one, we can move along into doing that with git rebase. Assuming you're already familiar with git rebase, we can starting squashing commits in the interactive mode of git rebase that you can activate like so: +So now that you see the commits you wish to merge to one, we can move along into doing that with ```git rebase```. Assuming you're already familiar with ```git rebase```, we can starting squashing commits in the interactive mode of git rebase that you can activate like so: ``` git rebase -i @@ -61,7 +61,7 @@ pick blablabla2 Adding dummy01.txt file # Note that empty commits are commented out ``` -So if you want to squash blablabla2 into blablablabla, you would change the following : +So if you want to squash ```blablabla2``` into ```blablablabla```, you would change the following : ``` pick blablabla Changing test01.txt file @@ -79,7 +79,6 @@ commit message 1 # This is the 2nd commit message: commit message 2 - ``` That you can freely change before you decide to exit the editor to save these changes. From 6260104532b67a6b07298a09f47f81b8e89556ca Mon Sep 17 00:00:00 2001 From: Yasmine Date: Tue, 17 Oct 2017 20:31:01 +0400 Subject: [PATCH 019/195] Documentation for squashing commits complete, also added link to the guide in the additional material page :) --- additional-material/additional-material.md | 3 +++ additional-material/squashing-commits.md | 5 ++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/additional-material/additional-material.md b/additional-material/additional-material.md index d0ec2e8c9f8..56b89249f2f 100644 --- a/additional-material/additional-material.md +++ b/additional-material/additional-material.md @@ -29,3 +29,6 @@ This document provides information about how to resolve merge conflicts. ### [Useful Links](Useful-links-for-further-learning.md) This document is dedicated to all the blog posts, helpful sites, tips and tricks websites that makes our lives easier. That we refer to for all our needs, be it a beginner or an expert. This page should act as an index of all those useful links that would help everybody who is new in the open-source domain or someone who wants to learn more. +### [ Squashing Commits ](squashing-commits.md) +This document provides information about how to squash commits with an interactive rebase. +> Use this if you want to open a PR in an open source project and the reviewer asks you to squash every commit into one, with an informative commit message. \ No newline at end of file diff --git a/additional-material/squashing-commits.md b/additional-material/squashing-commits.md index ef8cdaeabb2..5fc50d56240 100644 --- a/additional-material/squashing-commits.md +++ b/additional-material/squashing-commits.md @@ -25,7 +25,7 @@ Date: 10/10/20 Commit message 2 ``` -So now that you see the commits you wish to merge to one, we can move along into doing that with git rebase. Assuming you're already familiar with git rebase, we can starting squashing commits in the interactive mode of git rebase that you can activate like so: +So now that you see the commits you wish to merge to one, we can move along into doing that with ```git rebase```. Assuming you're already familiar with ```git rebase```, we can starting squashing commits in the interactive mode of git rebase that you can activate like so: ``` git rebase -i @@ -61,7 +61,7 @@ pick blablabla2 Adding dummy01.txt file # Note that empty commits are commented out ``` -So if you want to squash blablabla2 into blablablabla, you would change the following : +So if you want to squash ```blablabla2``` into ```blablablabla```, you would change the following : ``` pick blablabla Changing test01.txt file @@ -79,7 +79,6 @@ commit message 1 # This is the 2nd commit message: commit message 2 - ``` That you can freely change before you decide to exit the editor to save these changes. From 070ce83c4b7e4998ec09691e0561f4c10464e7df Mon Sep 17 00:00:00 2001 From: Ignacio Z Date: Tue, 17 Oct 2017 23:15:26 -0500 Subject: [PATCH 020/195] Create moving-a-commit-to-a-different-branch.md --- .../moving-a-commit-to-a-different-branch.md | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 additional-material/moving-a-commit-to-a-different-branch.md diff --git a/additional-material/moving-a-commit-to-a-different-branch.md b/additional-material/moving-a-commit-to-a-different-branch.md new file mode 100644 index 00000000000..bbacf8eb19c --- /dev/null +++ b/additional-material/moving-a-commit-to-a-different-branch.md @@ -0,0 +1,21 @@ +## Moving a Commit to a different Branch + +What if you commit a change, and then realize that you commited to a different branch? +How can you change that? This is what this tutorial covers. + +### Changing the lastests commits to a new Branch +To do this, type: +```git branch newbranch``` - Creates a new Branch. Saving all the Commits. +```git reset --hard HEAD~#``` - Move master back by # commits. Remember, this commits will be gone from master +```git checkout newbranch``` - Goes to the branch you created. It will have all the commits. + +Remember: Any changes not commited will be LOST. + +### Changing the lastests commits to an existing Branch +To do this, type: +```git checkout existingbranch``` +```git merge master``` +```git checkout master``` +```git reset --hard HEAD~#``` - Move master back by # commits. Remember, this commits will be gone from master +```git checkout existingbranch``` + From 150050d94f657a56c80e1963448ce09fda0998ef Mon Sep 17 00:00:00 2001 From: Roshan Jossey Date: Wed, 18 Oct 2017 12:12:29 +0530 Subject: [PATCH 021/195] Remove project suggestions from Readme - Now that we have project list in web app, let's take users there - Add self promotion section for some shameless self promotion - Re-arrange sections for better user flow --- README.md | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 990beb4a98e..332c69a6ee8 100644 --- a/README.md +++ b/README.md @@ -92,27 +92,27 @@ Now submit the pull request. Soon I'll be merging all your changes into the master branch of this project. You will get a notification email once the changes have been merged. +## Where to go from here? + +Celebrate your contribution and share it with your friends and followers by going to [web app](https://roshanjossey.github.io/first-contributions/#social-share). + +You could join our slack team in case you need any help or have any questions. [Join slack team](https://firstcontributions.herokuapp.com). + +Now let's get you started with contributing to other projects. We've compiled a list of projects with easy issues you can get started on. Check out [the list of projects in web app](https://roshanjossey.github.io/first-contributions/#project-list). + ### [ Additional material ](additional-material/additional-material.md) -## Tutorials Using Other Tools +## Tutorials Using Other Tools |GitHub Desktop|Visual Studio 2017|GitKraken| |---|---|---| |[GitHub Desktop](github-desktop-tutorial.md)|[Visual Studio 2017](github-windows-vs2017-tutorial.md)|[GitKraken](gitkraken-tutorial.md)| -## Where to go from here? - -You could also join our slack team in case you need any help or have any questions. [Join slack team](https://firstcontributions.herokuapp.com) +## Self-Promotion -Here's some beginner level issues in popular repos that you can solve. Go ahead and go to those repos to learn more +If you liked this project, star it on [GitHub](https://github.com/Roshanjossey/first-contributions). +If you're feeling especially charitable, follow [Roshan](https://roshanjossey.github.io/) on +[Twitter](https://twitter.com/sudo__bangbang) and +[GitHub](https://github.com/roshanjossey). -|[![exercism](https://avatars2.githubusercontent.com/u/5624255?v=3&s=100)](https://github.com/exercism/exercism.io/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+patch%22)|[![fun-retro](https://avatars3.githubusercontent.com/u/15913975?v=3&s=100)](https://github.com/funretro/distributed/issues?q=is%3Aopen+is%3Aissue+label%3A%22beginner+friendly%22)|[](https://github.com/facebook/react/issues?q=is%3Aissue+is%3Aopen+label%3A%22Difficulty%3A+beginner%22)|[![habitat](https://avatars1.githubusercontent.com/u/18171698?v=3&s=100)](https://github.com/habitat-sh/habitat/issues?q=is%3Aopen+is%3Aissue+label%3AE-Easy)|[![scikit-learn](https://avatars0.githubusercontent.com/u/365630?v=3&s=100)](https://github.com/scikit-learn/scikit-learn/issues?q=is%3Aopen+is%3Aissue+label%3AEasy)|[](https://github.com/technomancy/leiningen/issues?q=is%3Aopen+is%3Aissue+label%3ANewbie)|[](https://github.com/numpy/numpy/issues?q=is%3Aopen+is%3Aissue+label%3A%22difficulty%3A+Easy%22)|[![elasticsearch](https://avatars2.githubusercontent.com/u/6764390?v=3&s=100)](https://github.com/elastic/elasticsearch/issues?q=is%3Aopen+is%3Aissue+label%3A%22low+hanging+fruit%22)| -|---|---|---|---|---|---|---|---| -|[exercism](https://github.com/exercism/exercism.io/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+patch%22)|[Fun Retros](https://github.com/funretro/distributed/issues?q=is%3Aopen+is%3Aissue+label%3A%22beginner+friendly%22)|[react](https://github.com/facebook/react/issues?q=is%3Aissue+is%3Aopen+label%3A%22Difficulty%3A+beginner%22)|[habitat](https://github.com/habitat-sh/habitat/issues?q=is%3Aopen+is%3Aissue+label%3AE-Easy)|[scikit-learn](https://github.com/scikit-learn/scikit-learn/issues?q=is%3Aopen+is%3Aissue+label%3AEasy)|[Leiningen](https://github.com/technomancy/leiningen/issues?q=is%3Aopen+is%3Aissue+label%3ANewbie)|[numpy](https://github.com/numpy/numpy/issues?q=is%3Aopen+is%3Aissue+label%3A%22difficulty%3A+Easy%22)|[elasticsearch](https://github.com/elastic/elasticsearch/issues?q=is%3Aopen+is%3Aissue+label%3A%22low+hanging+fruit%22)| -|[![homebrew](https://avatars2.githubusercontent.com/u/1503512?v=3&s=100)](https://github.com/Homebrew/brew/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22)|[![rust](https://avatars1.githubusercontent.com/u/5430905?v=3&s=100)](https://github.com/rust-lang/rust/issues?q=is%3Aopen+is%3Aissue+label%3AE-easy)|[![vuejs](https://avatars1.githubusercontent.com/u/6128107?v=3&s=100)](https://github.com/vuejs/vue/issues?q=is%3Aopen+is%3Aissue+label%3A%22contribution+welcome%22)|[![Suave](https://avatars2.githubusercontent.com/u/5822862?v=3&s=100)](https://github.com/SuaveIO/suave/issues?q=is%3Aopen+is%3Aissue+label%3Ahardness-easy)|[![OpenRA](https://avatars3.githubusercontent.com/u/409046?v=3&s=100)](https://github.com/OpenRA/OpenRA/issues?q=is%3Aopen+is%3Aissue+label%3AEasy)|[![PowerShell](https://avatars0.githubusercontent.com/u/11524380?v=3&s=100)](https://github.com/powershell/powershell/issues?q=is%3Aopen+is%3Aissue+label%3AUp-for-Grabs)|[![coala](https://avatars2.githubusercontent.com/u/10620750?v=3&s=100)](https://github.com/coala/coala/issues?q=is%3Aopen+is%3Aissue+label%3Adifficulty%2Flow+label%3Adifficulty%2Fnewcomer)|[![moment](https://avatars2.githubusercontent.com/u/4129662?v=3&s=100)](https://github.com/moment/moment/issues?q=is%3Aopen+is%3Aissue+label%3AUp-For-Grabs)| -|[homebrew](https://github.com/Homebrew/brew/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22)|[Rust](https://github.com/rust-lang/rust/issues?q=is%3Aopen+is%3Aissue+label%3AE-easy)|[vuejs](https://github.com/vuejs/vue/issues?q=is%3Aopen+is%3Aissue+label%3A%22contribution+welcome%22)|[Suave](https://github.com/SuaveIO/suave/issues?q=is%3Aopen+is%3Aissue+label%3Ahardness-easy)|[OpenRA](https://github.com/OpenRA/OpenRA/issues?q=is%3Aopen+is%3Aissue+label%3AEasy)|[PowerShell](https://github.com/powershell/powershell/issues?q=is%3Aopen+is%3Aissue+label%3AUp-for-Grabs)|[coala](https://github.com/coala/coala/issues?q=is%3Aopen+is%3Aissue+label%3Adifficulty%2Flow+label%3Adifficulty%2Fnewcomer)|[moment](https://github.com/moment/moment/issues?q=is%3Aopen+is%3Aissue+label%3AUp-For-Grabs)| -|[![ava](https://avatars0.githubusercontent.com/u/8527916?v=3&s=100)](https://github.com/avajs/ava/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+for+beginner%22)|[![freeCodeCamp](https://avatars0.githubusercontent.com/u/9892522?v=3&s=100)](https://github.com/freeCodeCamp/freeCodeCamp/issues?q=is%3Aopen+is%3Aissue+label%3Afirst-timers-only)|[![webpack](https://avatars3.githubusercontent.com/u/2105791?v=3&s=100)](https://github.com/webpack/webpack/issues?q=is%3Aopen+is%3Aissue+label%3A%22D1%3A+Easy+%28Contrib.+Difficulty%29%22)|[![hoodie](https://avatars1.githubusercontent.com/u/1888826?v=3&s=100)](https://github.com/hoodiehq/hoodie/issues?q=is%3Aopen+is%3Aissue+label%3Afirst-timers-only)|[![pouchdb](https://avatars3.githubusercontent.com/u/3406112?v=3&s=100)](https://github.com/pouchdb/pouchdb/issues?q=is%3Aopen+is%3Aissue+label%3A%22first+timers+only%22)|[![neovim](https://avatars0.githubusercontent.com/u/6471485?v=3&s=100)](https://github.com/neovim/neovim/issues?q=is%3Aopen+is%3Aissue+label%3Acomplexity%3Alow)|[![babel](https://avatars2.githubusercontent.com/u/9637642?v=3&s=100)](https://github.com/babel/babel/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22) |[](https://github.com/adobe/brackets/issues?q=is%3Aopen+is%3Aissue+label%3A%22Starter+bug%22)| -|[ava](https://github.com/avajs/ava/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+for+beginner%22)|[freeCodeCamp](https://github.com/freeCodeCamp/freeCodeCamp/issues?q=is%3Aopen+is%3Aissue+label%3Afirst-timers-only)|[webpack](https://github.com/webpack/webpack/issues?q=is%3Aopen+is%3Aissue+label%3A%22D1%3A+Easy+%28Contrib.+Difficulty%29%22)|[hoodie](https://github.com/hoodiehq/hoodie/issues?q=is%3Aopen+is%3Aissue+label%3Afirst-timers-only)|[pouchdb](https://github.com/pouchdb/pouchdb/issues?q=is%3Aopen+is%3Aissue+label%3A%22first+timers+only%22)|[neovim](https://github.com/neovim/neovim/issues?q=is%3Aopen+is%3Aissue+label%3Acomplexity%3Alow)|[babel](https://github.com/babel/babel/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22) |[brackets](https://github.com/adobe/brackets/issues?q=is%3Aopen+is%3Aissue+label%3A%22Starter+bug%22)| -| [![Node.js](https://avatars1.githubusercontent.com/u/9950313?v=3&s=100)](https://github.com/nodejs/node/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22)|[](https://github.com/Semantic-Org/Semantic-UI-React/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22)| -| [Node.js](https://github.com/nodejs/node/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22) |[Semantic-UI-React](https://github.com/Semantic-Org/Semantic-UI-React/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22) | From 47d89c491359e77f951511cd98c8e5e2237914b7 Mon Sep 17 00:00:00 2001 From: "Anastasios (Tasos) Beis" Date: Wed, 18 Oct 2017 11:47:34 +0300 Subject: [PATCH 022/195] Add abeis to Contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 15d34b5c7ee..a5d6dd39e7a 100644 --- a/Contributors.md +++ b/Contributors.md @@ -802,3 +802,4 @@ - [Tim Guenthner](https://github.com/aerotog) - [Jhonatan Casale](https://github.com/jhonatancasale) - [Kik Tachanok](https://github.com/tachanokkik) +- [Anastasios (Tasos) Beis](https://github.com/abeis) \ No newline at end of file From f6cfc28b8048ad3f1eef6d222f16395cca020e4e Mon Sep 17 00:00:00 2001 From: Syknapse Date: Wed, 18 Oct 2017 10:57:18 +0200 Subject: [PATCH 023/195] Add Syk Houdeib to Contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 15d34b5c7ee..22af124f3b8 100644 --- a/Contributors.md +++ b/Contributors.md @@ -802,3 +802,4 @@ - [Tim Guenthner](https://github.com/aerotog) - [Jhonatan Casale](https://github.com/jhonatancasale) - [Kik Tachanok](https://github.com/tachanokkik) +- [Syk Houdeib](https://github.com/Syknapse) From ca88fc4cb875ad149a644d659078e1539ea37f92 Mon Sep 17 00:00:00 2001 From: Rohitt Vashishtha Date: Wed, 18 Oct 2017 13:53:23 +0530 Subject: [PATCH 024/195] additional-material: Add configuring-git.md --- additional-material/additional-material.md | 4 ++ additional-material/configuring-git.md | 76 ++++++++++++++++++++++ 2 files changed, 80 insertions(+) create mode 100644 additional-material/configuring-git.md diff --git a/additional-material/additional-material.md b/additional-material/additional-material.md index d0ec2e8c9f8..44a11e93d62 100644 --- a/additional-material/additional-material.md +++ b/additional-material/additional-material.md @@ -26,6 +26,10 @@ This document provides information about how to undo a commit on your local repo This document provides information about how to resolve merge conflicts. > Take these steps to resolve the annoying merge conflicts. +### [ Configuring git ](configuring-git.md) +This document provides information about how to configure user details and other options in git. +> Use this to better control your git configurations. + ### [Useful Links](Useful-links-for-further-learning.md) This document is dedicated to all the blog posts, helpful sites, tips and tricks websites that makes our lives easier. That we refer to for all our needs, be it a beginner or an expert. This page should act as an index of all those useful links that would help everybody who is new in the open-source domain or someone who wants to learn more. diff --git a/additional-material/configuring-git.md b/additional-material/configuring-git.md new file mode 100644 index 00000000000..b12bd3e1797 --- /dev/null +++ b/additional-material/configuring-git.md @@ -0,0 +1,76 @@ +## Configuring git + +The first time you tried to commit using git, you might have gotten a prompt like the one below: + +```bash +$ git commit +*** Please tell me who you are. + +Run + +git config --global user.email "you@example.com" +git config --global user.name "Your Name" + +to set your account's default identity. +Omit --global to set the identity only in this repository. +``` + +Git needs to know who you are when you create a commit. When you are working collaboratively, you should be able to see who modified what parts of the project and when, and thus, git has been designed to create commits tied to a name and an email. + +There are multiple ways to provide the `git commit` command with your email and name, and we'll go through some of them below. + +### Global Config + +When you store something in the global config, it is accessible system wide in all the repositories you work on. This is the preferred way and works for most use cases. + +To store something in the global config, you use the `config` command as follows: + +`$ git config --global ` + +In the case of user details, we run it as follows: + +``` +$ git config --global user.email "you@example.com" +$ git config --global user.name "Your Name" +``` + +### Repository Config + +As the name says, these configurations are scoped to your current repository. If you want to commit to a particular repository, say, a work related project, with your company's email, then you could use this method. + +To store something in the repository config, you use the `config` command by emitting the `--global` flag as follows: + +`$ git config ` + +In the case of user details, we run it as follows: + +``` +$ git config user.email "you@alternate.com" +$ git config user.name "Your Name" +``` + +### Command-line Config + +These type of configurations are scoped to the current command only. All git commands take `-c` arguments before the action verb to set temporary configuration data. + +To store something in the command line config, run your command as follows: + +`$ git -c = -c = ` + +In our example, we would run the commit command as follows: + +`git -c user.name='Your Name' -c user.email='you@example.com' commit -m "Your commit message"` + +### Note on Precedence + +Among the three methods described here, the precedence order is `command-line > repository > global`. This means that, if a variable is configured in the command-line as well as globally, the command-line value would be used for the opetaion. + +## Beyond User Details + +We have dealt with only the user details till now while working with the config. However, there are several other configuration options available. Some of them are: + +1. `core.editor` - to specify the name of the editor used for writing commit messages, etc. +2. `commit.template` - to specify a file on the system as the initial commit template. +3. `color.ui` - to specify a boolean value for using colors in git's output. + +We have abstracted some details for ease of understanding. For further reading, head over to [git-scm.com](https://git-scm.com/book/en/v2/Customizing-Git-Git-Configuration). \ No newline at end of file From 402ad1a7c0efd62d9179b1a66e90200656e51835 Mon Sep 17 00:00:00 2001 From: Avkaran singh Date: Wed, 18 Oct 2017 17:54:18 +0530 Subject: [PATCH 025/195] Update Contributors.md --- Contributors.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Contributors.md b/Contributors.md index 17accefc333..53afaf6443e 100644 --- a/Contributors.md +++ b/Contributors.md @@ -804,3 +804,5 @@ - [Kik Tachanok](https://github.com/tachanokkik) - [Anastasios (Tasos) Beis](https://github.com/abeis) - [Syk Houdeib](https://github.com/Syknapse) +- [avsingh999](https://github.com/avsingh999) + From ae9268b4b17216f991f20505124697c6c1795a17 Mon Sep 17 00:00:00 2001 From: ashubly25 Date: Wed, 18 Oct 2017 18:21:26 +0530 Subject: [PATCH 026/195] Add Ashutosh Singh to Contributors list --- Contributors.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Contributors.md b/Contributors.md index 10aa99365d4..41da2283eaa 100644 --- a/Contributors.md +++ b/Contributors.md @@ -1,4 +1,5 @@ - [Jithu R Jacob 🤓](https://github.com/jithurjacob) +- [Ashutosh Singh](https://github.com/ashubly25) - [gipsi](https://github.com/gipsi) - [girlzap](https://github.com/girlzap) - [DevMaterial](https://github.com/DevMaterial) @@ -787,4 +788,3 @@ - [daannxz](https://github.com/daannxz) - [Fahim](https://github.com/faahim) - [luisslanca](https://github.com/luisslanca) - From 4fd9685686394cedafa5052ae96b08dcfe965524 Mon Sep 17 00:00:00 2001 From: Dominik Hahn Date: Wed, 18 Oct 2017 17:27:23 +0200 Subject: [PATCH 027/195] [TASK] add contribution --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index a66eaf21285..843fc52981f 100644 --- a/Contributors.md +++ b/Contributors.md @@ -806,3 +806,4 @@ - [Anastasios (Tasos) Beis](https://github.com/abeis) - [Syk Houdeib](https://github.com/Syknapse) - [avsingh999](https://github.com/avsingh999) +- [dmnkhhn](https://github.com/dmnkhhn) From 8e63e29d875d0b1a3d45cc2d4b0074f1b47c4d71 Mon Sep 17 00:00:00 2001 From: Ashik Paul Date: Wed, 18 Oct 2017 21:09:01 +0530 Subject: [PATCH 028/195] Update Contributors.md --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index a66eaf21285..b8c1f721cb0 100644 --- a/Contributors.md +++ b/Contributors.md @@ -806,3 +806,4 @@ - [Anastasios (Tasos) Beis](https://github.com/abeis) - [Syk Houdeib](https://github.com/Syknapse) - [avsingh999](https://github.com/avsingh999) +- [Ashik Paul](https://github.com/Ashikpaul) From fb168c7273a751dd911ba414f1ab0b91e5a71bbe Mon Sep 17 00:00:00 2001 From: CJ Haviland Date: Wed, 18 Oct 2017 11:46:51 -0400 Subject: [PATCH 029/195] Add CJ Haviland to Contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index a66eaf21285..862d61b995e 100644 --- a/Contributors.md +++ b/Contributors.md @@ -806,3 +806,4 @@ - [Anastasios (Tasos) Beis](https://github.com/abeis) - [Syk Houdeib](https://github.com/Syknapse) - [avsingh999](https://github.com/avsingh999) +- [CJ Haviland](https://github.com/cjhaviland) \ No newline at end of file From 7864486f014e80195bf0faf02ba9d4bb46f0d2e2 Mon Sep 17 00:00:00 2001 From: Shuyue Wang Date: Wed, 18 Oct 2017 17:24:51 +0100 Subject: [PATCH 030/195] add me --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index a66eaf21285..c0633c84a9f 100644 --- a/Contributors.md +++ b/Contributors.md @@ -806,3 +806,4 @@ - [Anastasios (Tasos) Beis](https://github.com/abeis) - [Syk Houdeib](https://github.com/Syknapse) - [avsingh999](https://github.com/avsingh999) +- [Shuyue Wang](http://github.com/k1631111) From 2345a7e2ba36e6da6d0be752e2f78f700e40a1a0 Mon Sep 17 00:00:00 2001 From: Jan Zimolka Date: Wed, 18 Oct 2017 20:21:46 +0200 Subject: [PATCH 031/195] Add Jan Zimolka to Contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index a66eaf21285..96fe64910bc 100644 --- a/Contributors.md +++ b/Contributors.md @@ -806,3 +806,4 @@ - [Anastasios (Tasos) Beis](https://github.com/abeis) - [Syk Houdeib](https://github.com/Syknapse) - [avsingh999](https://github.com/avsingh999) +- [Zimi14](https://github.com/Zimi14) From 381ac78bdcc7fdb6c2a63e18e918511060d9f21e Mon Sep 17 00:00:00 2001 From: samanthalgibson <32910290+samanthalgibson@users.noreply.github.com> Date: Wed, 18 Oct 2017 19:42:05 +0100 Subject: [PATCH 032/195] Add samanthalgibson to Contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index a66eaf21285..659f1d52bb7 100644 --- a/Contributors.md +++ b/Contributors.md @@ -806,3 +806,4 @@ - [Anastasios (Tasos) Beis](https://github.com/abeis) - [Syk Houdeib](https://github.com/Syknapse) - [avsingh999](https://github.com/avsingh999) +- [samanthalgibson](https://github.com/samanthalgibson) From 5d6d652b5d158c61ce2d62e3b5dd0f9590158afe Mon Sep 17 00:00:00 2001 From: Atlas Date: Wed, 18 Oct 2017 21:19:21 +0200 Subject: [PATCH 033/195] Added Atlas34 to contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index a66eaf21285..844222bd624 100644 --- a/Contributors.md +++ b/Contributors.md @@ -806,3 +806,4 @@ - [Anastasios (Tasos) Beis](https://github.com/abeis) - [Syk Houdeib](https://github.com/Syknapse) - [avsingh999](https://github.com/avsingh999) +- [Atlas34](https://github.com/Atlas34) \ No newline at end of file From 97697ae5c6875d87ecb3ddce2a022e457a7a798c Mon Sep 17 00:00:00 2001 From: Ivan Shen Date: Wed, 18 Oct 2017 16:02:50 -0400 Subject: [PATCH 034/195] add name --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index a66eaf21285..46dc2733eed 100644 --- a/Contributors.md +++ b/Contributors.md @@ -806,3 +806,4 @@ - [Anastasios (Tasos) Beis](https://github.com/abeis) - [Syk Houdeib](https://github.com/Syknapse) - [avsingh999](https://github.com/avsingh999) +- [Ivan Shen](https://github.com/ivanshen) From f2f6a383123fdee4f366b5fcb406d940dd5f59a6 Mon Sep 17 00:00:00 2001 From: Jonathan Arredondo Date: Wed, 18 Oct 2017 16:04:32 -0500 Subject: [PATCH 035/195] Add Jonathan Arredondo to Contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index a66eaf21285..44a6c5252fd 100644 --- a/Contributors.md +++ b/Contributors.md @@ -806,3 +806,4 @@ - [Anastasios (Tasos) Beis](https://github.com/abeis) - [Syk Houdeib](https://github.com/Syknapse) - [avsingh999](https://github.com/avsingh999) +- [Jonathan Arredondo](https://github.com/angelyonas) From 734ea4db8ea52acbfb6104e3ec20ea6ae04ee197 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Escobar?= Date: Wed, 18 Oct 2017 16:23:18 -0500 Subject: [PATCH 036/195] =?UTF-8?q?Add=20Andr=C3=A9s=20Escobar=20to=20Cont?= =?UTF-8?q?ributors=20list?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index a66eaf21285..02be0d67a1b 100644 --- a/Contributors.md +++ b/Contributors.md @@ -806,3 +806,4 @@ - [Anastasios (Tasos) Beis](https://github.com/abeis) - [Syk Houdeib](https://github.com/Syknapse) - [avsingh999](https://github.com/avsingh999) +- [handrezescobar94](https://github.com/handrezescobar94) From 460cddd3d65210cb96cdfa442579fe7ea574291e Mon Sep 17 00:00:00 2001 From: Ariel Blasi Date: Wed, 18 Oct 2017 18:29:49 -0300 Subject: [PATCH 037/195] Add my name --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index a66eaf21285..c234362f6dd 100644 --- a/Contributors.md +++ b/Contributors.md @@ -806,3 +806,4 @@ - [Anastasios (Tasos) Beis](https://github.com/abeis) - [Syk Houdeib](https://github.com/Syknapse) - [avsingh999](https://github.com/avsingh999) +- [Ariel Blasi](https://github.com/LiteSoul) From 6cf90e2e7866082fa0f6c7a1fbb8954be4c87cd0 Mon Sep 17 00:00:00 2001 From: Faisal Hassan Date: Wed, 18 Oct 2017 21:43:42 +0000 Subject: [PATCH 038/195] Add Faisal Hassan to Contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index a66eaf21285..465342dfd0b 100644 --- a/Contributors.md +++ b/Contributors.md @@ -806,3 +806,4 @@ - [Anastasios (Tasos) Beis](https://github.com/abeis) - [Syk Houdeib](https://github.com/Syknapse) - [avsingh999](https://github.com/avsingh999) +- [Faisal Hassan](https://faisalhassanx.bitbucket.io) From cbebfaa1667f18702f6885b0fc07191292008b97 Mon Sep 17 00:00:00 2001 From: Daniel Enriquez Date: Wed, 18 Oct 2017 16:49:29 -0500 Subject: [PATCH 039/195] Add Daniel Enriquez to Contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index a66eaf21285..5521130f9b4 100644 --- a/Contributors.md +++ b/Contributors.md @@ -806,3 +806,4 @@ - [Anastasios (Tasos) Beis](https://github.com/abeis) - [Syk Houdeib](https://github.com/Syknapse) - [avsingh999](https://github.com/avsingh999) +- [daniel-enriquez](https://github.com/daniel-enriquez) \ No newline at end of file From 527e2fa35c25ee1dc06e78c244f19f8c5964ed6f Mon Sep 17 00:00:00 2001 From: Ignacio Z Date: Wed, 18 Oct 2017 17:02:43 -0500 Subject: [PATCH 040/195] Changed some words, and moved sections --- .../moving-a-commit-to-a-different-branch.md | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/additional-material/moving-a-commit-to-a-different-branch.md b/additional-material/moving-a-commit-to-a-different-branch.md index bbacf8eb19c..b8b2b899c72 100644 --- a/additional-material/moving-a-commit-to-a-different-branch.md +++ b/additional-material/moving-a-commit-to-a-different-branch.md @@ -3,19 +3,18 @@ What if you commit a change, and then realize that you commited to a different branch? How can you change that? This is what this tutorial covers. -### Changing the lastests commits to a new Branch -To do this, type: -```git branch newbranch``` - Creates a new Branch. Saving all the Commits. -```git reset --hard HEAD~#``` - Move master back by # commits. Remember, this commits will be gone from master -```git checkout newbranch``` - Goes to the branch you created. It will have all the commits. - -Remember: Any changes not commited will be LOST. - -### Changing the lastests commits to an existing Branch -To do this, type: -```git checkout existingbranch``` -```git merge master``` -```git checkout master``` +### Moving the lastest commits to an existing Branch +To do this, type: +```git checkout existingbranch``` +```git merge master``` +```git checkout master``` ```git reset --hard HEAD~#``` - Move master back by # commits. Remember, this commits will be gone from master ```git checkout existingbranch``` +### Moving the lastest commits to a new Branch +To do this, type: +```git branch newbranch``` - Creates a new Branch. Saving all the Commits. +```git reset --hard HEAD~#``` - Move master back by # commits. Remember, this commits will be gone from master +```git checkout newbranch``` - Goes to the branch you created. It will have all the commits. + +Remember: Any changes not commited will be LOST. From 01c3d03dd8a892bfcff7d4d850c45710d3fdf3eb Mon Sep 17 00:00:00 2001 From: Ignacio Z Date: Wed, 18 Oct 2017 17:06:59 -0500 Subject: [PATCH 041/195] Updating moving commits to existing branch --- .../moving-a-commit-to-a-different-branch.md | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/additional-material/moving-a-commit-to-a-different-branch.md b/additional-material/moving-a-commit-to-a-different-branch.md index b8b2b899c72..cd8c7c14d0a 100644 --- a/additional-material/moving-a-commit-to-a-different-branch.md +++ b/additional-material/moving-a-commit-to-a-different-branch.md @@ -4,12 +4,18 @@ What if you commit a change, and then realize that you commited to a different b How can you change that? This is what this tutorial covers. ### Moving the lastest commits to an existing Branch -To do this, type: -```git checkout existingbranch``` -```git merge master``` -```git checkout master``` -```git reset --hard HEAD~#``` - Move master back by # commits. Remember, this commits will be gone from master -```git checkout existingbranch``` +To do this, type: + +```git reset HEAD~ --soft``` - Undoes the last commit, but leave the changes available. +```git stash``` + +```git checkout name-of-the-correct-branch``` - Moves previous changes to the correct branch +```git stash pop``` +```git add .``` - Or try adding individual files +```git commit -m "your message here"``` + +Now your changes are on the correct branch + ### Moving the lastest commits to a new Branch To do this, type: From 353b40abbdd9cf9000a305a5a6187230af176dfa Mon Sep 17 00:00:00 2001 From: Luke Date: Thu, 19 Oct 2017 00:00:25 +0100 Subject: [PATCH 042/195] Add Luke to contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index a66eaf21285..131fb9166a8 100644 --- a/Contributors.md +++ b/Contributors.md @@ -806,3 +806,4 @@ - [Anastasios (Tasos) Beis](https://github.com/abeis) - [Syk Houdeib](https://github.com/Syknapse) - [avsingh999](https://github.com/avsingh999) +- [Luke Taylor](https://github.com/Luke-Taylor) \ No newline at end of file From a1b0ab0c49b7219bc257e5c8b2ff3f76ffb92d40 Mon Sep 17 00:00:00 2001 From: Ignacio Z Date: Wed, 18 Oct 2017 21:01:06 -0500 Subject: [PATCH 043/195] added explanation to Git Stash --- .../moving-a-commit-to-a-different-branch.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/additional-material/moving-a-commit-to-a-different-branch.md b/additional-material/moving-a-commit-to-a-different-branch.md index cd8c7c14d0a..84155f5a254 100644 --- a/additional-material/moving-a-commit-to-a-different-branch.md +++ b/additional-material/moving-a-commit-to-a-different-branch.md @@ -7,12 +7,12 @@ How can you change that? This is what this tutorial covers. To do this, type: ```git reset HEAD~ --soft``` - Undoes the last commit, but leave the changes available. -```git stash``` +```git stash``` - Records the state of the directory. -```git checkout name-of-the-correct-branch``` - Moves previous changes to the correct branch -```git stash pop``` -```git add .``` - Or try adding individual files -```git commit -m "your message here"``` +```git checkout name-of-the-correct-branch``` - Swiches to another branch. +```git stash pop``` - Removes lastest stashed state. +```git add .``` - Or try adding individual files. +```git commit -m "your message here"``` - Saves and Commits the changes. Now your changes are on the correct branch From 328a5bd13e630df37c27a7559dca9c313caf85a9 Mon Sep 17 00:00:00 2001 From: Ignacio Z Date: Wed, 18 Oct 2017 21:05:32 -0500 Subject: [PATCH 044/195] Added "Moving a Commit to a different Branch" --- additional-material/additional-material.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/additional-material/additional-material.md b/additional-material/additional-material.md index d0ec2e8c9f8..1a8fd8ac047 100644 --- a/additional-material/additional-material.md +++ b/additional-material/additional-material.md @@ -26,6 +26,10 @@ This document provides information about how to undo a commit on your local repo This document provides information about how to resolve merge conflicts. > Take these steps to resolve the annoying merge conflicts. +### [ Moving a Commit to a different Branch ](moving-a-commit-to-a-different-branch.md) +This document provides information about how to move a Commit to another Branch. +> Take these steps to move a commit to another branch. + ### [Useful Links](Useful-links-for-further-learning.md) This document is dedicated to all the blog posts, helpful sites, tips and tricks websites that makes our lives easier. That we refer to for all our needs, be it a beginner or an expert. This page should act as an index of all those useful links that would help everybody who is new in the open-source domain or someone who wants to learn more. From 1251a50b3d94b02b0f08cdcda3d189d356245027 Mon Sep 17 00:00:00 2001 From: giant995 Date: Thu, 19 Oct 2017 00:24:07 -0400 Subject: [PATCH 045/195] Add Jim Plourde to Contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 508e187863a..4e687147cc5 100644 --- a/Contributors.md +++ b/Contributors.md @@ -820,3 +820,4 @@ - [Faisal Hassan](https://faisalhassanx.bitbucket.io) - [daniel-enriquez](https://github.com/daniel-enriquez) - [Luke Taylor](https://github.com/Luke-Taylor) +- [Jim Plourde](https://github.com/giant995/first-contributions) \ No newline at end of file From 57f1b1e478255717a35e19fe6edc9a40a1cce0f4 Mon Sep 17 00:00:00 2001 From: James Francis Date: Thu, 19 Oct 2017 07:58:04 +0100 Subject: [PATCH 046/195] Added James Francis to Contributors.md --- Contributors.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Contributors.md b/Contributors.md index 4e687147cc5..99fb08e74e9 100644 --- a/Contributors.md +++ b/Contributors.md @@ -820,4 +820,5 @@ - [Faisal Hassan](https://faisalhassanx.bitbucket.io) - [daniel-enriquez](https://github.com/daniel-enriquez) - [Luke Taylor](https://github.com/Luke-Taylor) -- [Jim Plourde](https://github.com/giant995/first-contributions) \ No newline at end of file +- [Jim Plourde](https://github.com/giant995/first-contributions) +- [James Francis](https://github.com/greengory) \ No newline at end of file From 2b6d1408874e4f073dd69dc23bd30a22771e9b11 Mon Sep 17 00:00:00 2001 From: Fatmylin Date: Thu, 19 Oct 2017 15:06:53 +0800 Subject: [PATCH 047/195] 20171019 Add Fatmylin to Contributors list --- Contributors.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Contributors.md b/Contributors.md index 4e687147cc5..5d934b9f69f 100644 --- a/Contributors.md +++ b/Contributors.md @@ -1,4 +1,4 @@ -- [Oliver Miller](https://github.com/Oliver-H-Miller) +- [Oliver Miller](https://github.com/Oliver-H-Miller) - [Lewis Shaw](https://github.com/iRuisu) - [Bao Tran](https://github.com/cyborg103) - [Jithu R Jacob 🤓](https://github.com/jithurjacob) @@ -820,4 +820,5 @@ - [Faisal Hassan](https://faisalhassanx.bitbucket.io) - [daniel-enriquez](https://github.com/daniel-enriquez) - [Luke Taylor](https://github.com/Luke-Taylor) -- [Jim Plourde](https://github.com/giant995/first-contributions) \ No newline at end of file +- [Jim Plourde](https://github.com/giant995/first-contributions) +- [Jimmy Xiao](https://github.com/Fatmylin) \ No newline at end of file From bad0a1e053ff2bc4f2e0b4e18416ed7eac767cc4 Mon Sep 17 00:00:00 2001 From: "Quentin.Tu" Date: Thu, 19 Oct 2017 16:17:24 +0800 Subject: [PATCH 048/195] Add Tu-Szu-Chi to Contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 23a1c255c07..ff65ce57864 100644 --- a/Contributors.md +++ b/Contributors.md @@ -823,3 +823,4 @@ - [Jim Plourde](https://github.com/giant995/first-contributions) - [James Francis](https://github.com/greengory) - [Jimmy Xiao](https://github.com/Fatmylin) +- [Tu Szu Chi](https://github.com/Tu-Szu-Chi) From 1898d956d1c162f6cab048a1fd7f3eacec7fe964 Mon Sep 17 00:00:00 2001 From: Danny Lai Date: Thu, 19 Oct 2017 16:29:30 +0800 Subject: [PATCH 049/195] Patrice changed one file --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 23a1c255c07..3dd6fb50c40 100644 --- a/Contributors.md +++ b/Contributors.md @@ -823,3 +823,4 @@ - [Jim Plourde](https://github.com/giant995/first-contributions) - [James Francis](https://github.com/greengory) - [Jimmy Xiao](https://github.com/Fatmylin) +- [Danny Lai](https://github.com/tocalai) From 83c4c612c0ee224a56ba68feaadd66862748d36c Mon Sep 17 00:00:00 2001 From: Mark John Moreno Date: Thu, 19 Oct 2017 16:45:16 +0800 Subject: [PATCH 050/195] Add pahkk to Contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index ff65ce57864..06bf127892d 100644 --- a/Contributors.md +++ b/Contributors.md @@ -824,3 +824,4 @@ - [James Francis](https://github.com/greengory) - [Jimmy Xiao](https://github.com/Fatmylin) - [Tu Szu Chi](https://github.com/Tu-Szu-Chi) +- [Mark John C. Moreno](https://github.com/phakk) From 5c9d703f76353c68c01fac135923f3fff7d83a0c Mon Sep 17 00:00:00 2001 From: Prajwal Patil <32927982+prajwalkpatil@users.noreply.github.com> Date: Thu, 19 Oct 2017 16:01:14 +0530 Subject: [PATCH 051/195] Update Contributors.md --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 2dd1a250f30..7cae3786a5d 100644 --- a/Contributors.md +++ b/Contributors.md @@ -826,3 +826,4 @@ - [Danny Lai](https://github.com/tocalai) - [Tu Szu Chi](https://github.com/Tu-Szu-Chi) - [Mark John C. Moreno](https://github.com/phakk) +- [Prajwal Patil](https://github.com/prajwalkpatil) From 6d79f43660527a519a0f8a0137820f460bd3a924 Mon Sep 17 00:00:00 2001 From: Jianhao Tan Date: Thu, 19 Oct 2017 18:40:10 +0800 Subject: [PATCH 052/195] Add Jianhao Tan to Contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 2dd1a250f30..697fb2d1ddf 100644 --- a/Contributors.md +++ b/Contributors.md @@ -826,3 +826,4 @@ - [Danny Lai](https://github.com/tocalai) - [Tu Szu Chi](https://github.com/Tu-Szu-Chi) - [Mark John C. Moreno](https://github.com/phakk) +- [Jianhao Tan](https://github.com/jaanhio) From bbc7bc3e504de915a6075eb91addcad28c78aae1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?U=C4=9Fur=20Atmaca?= Date: Thu, 19 Oct 2017 15:39:59 +0300 Subject: [PATCH 053/195] update Contributors.md --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index b92de5fc42e..5e9137f7cef 100644 --- a/Contributors.md +++ b/Contributors.md @@ -828,3 +828,4 @@ - [Mark John C. Moreno](https://github.com/phakk) - [Jianhao Tan](https://github.com/jaanhio) - [Prajwal Patil](https://github.com/prajwalkpatil) +- [Uğur Atmaca](https://github.com/uguratmaca) From 0af941d110d789375542fdffcdcf33609f9ffd69 Mon Sep 17 00:00:00 2001 From: "Gowtham.R" Date: Thu, 19 Oct 2017 18:14:57 +0530 Subject: [PATCH 054/195] Add Gowtham to Contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index b92de5fc42e..009c4eea7d9 100644 --- a/Contributors.md +++ b/Contributors.md @@ -828,3 +828,4 @@ - [Mark John C. Moreno](https://github.com/phakk) - [Jianhao Tan](https://github.com/jaanhio) - [Prajwal Patil](https://github.com/prajwalkpatil) +- [Gowtham R](https://github.com/gowtham1997) From 6b8eee10cc0453e85791894c08319c744c9783bf Mon Sep 17 00:00:00 2001 From: avcoder Date: Thu, 19 Oct 2017 09:28:54 -0400 Subject: [PATCH 055/195] Add avcoder to Contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index b92de5fc42e..7a0a0fbdf62 100644 --- a/Contributors.md +++ b/Contributors.md @@ -828,3 +828,4 @@ - [Mark John C. Moreno](https://github.com/phakk) - [Jianhao Tan](https://github.com/jaanhio) - [Prajwal Patil](https://github.com/prajwalkpatil) +- [avcoder](https://github.com/avcoder) \ No newline at end of file From fff2254381eba25bdb8e3eb3c37c9b3a7220e32c Mon Sep 17 00:00:00 2001 From: Alex Hsu Date: Thu, 19 Oct 2017 21:49:19 +0800 Subject: [PATCH 056/195] Add Alex Hsu to Contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index b92de5fc42e..0ea6c6cda49 100644 --- a/Contributors.md +++ b/Contributors.md @@ -828,3 +828,4 @@ - [Mark John C. Moreno](https://github.com/phakk) - [Jianhao Tan](https://github.com/jaanhio) - [Prajwal Patil](https://github.com/prajwalkpatil) +- [Alex Hsu](https://github.com/Juchuhsu) From 2222f86c524febc9379455ec63b94a5052432c44 Mon Sep 17 00:00:00 2001 From: "David A. Gray" Date: Thu, 19 Oct 2017 09:26:24 -0500 Subject: [PATCH 057/195] Add Dave Gray to Contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 4fb0c87acae..ab30d18fe91 100644 --- a/Contributors.md +++ b/Contributors.md @@ -832,3 +832,4 @@ - [avcoder](https://github.com/avcoder) - [Gowtham R](https://github.com/gowtham1997) - [Uğur Atmaca](https://github.com/uguratmaca) +- [Dave Gray](https://github.com/gitdagray) From 28d13e77588f80df7b43351842e3ecf8f99984e0 Mon Sep 17 00:00:00 2001 From: WilsonWong Date: Thu, 19 Oct 2017 22:29:27 +0800 Subject: [PATCH 058/195] Add Josix to Contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 4fb0c87acae..1dacb78b990 100644 --- a/Contributors.md +++ b/Contributors.md @@ -832,3 +832,4 @@ - [avcoder](https://github.com/avcoder) - [Gowtham R](https://github.com/gowtham1997) - [Uğur Atmaca](https://github.com/uguratmaca) +- [Josix](https://github.com/wilson8507) From 647f891a52aef7717158a6efe803fbd6c69a9648 Mon Sep 17 00:00:00 2001 From: Guy Livni Date: Thu, 19 Oct 2017 18:08:04 +0300 Subject: [PATCH 059/195] Add Guy Livni to Contributors list Thank you for creating this tutorial ! --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 1c85075cc3a..93f32945b2c 100644 --- a/Contributors.md +++ b/Contributors.md @@ -834,3 +834,4 @@ - [Uğur Atmaca](https://github.com/uguratmaca) - [Josix](https://github.com/wilson8507) - [Dave Gray](https://github.com/gitdagray) +- [Guy Livni](https://github.com/GuyLivni) From f43869a2d74c1c3fce5ff7afb20916c5e53d263f Mon Sep 17 00:00:00 2001 From: Berkay Ersengun Date: Thu, 19 Oct 2017 16:18:41 +0100 Subject: [PATCH 060/195] Add Berkay Ersengun Contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 1c85075cc3a..f8bb873a41a 100644 --- a/Contributors.md +++ b/Contributors.md @@ -834,3 +834,4 @@ - [Uğur Atmaca](https://github.com/uguratmaca) - [Josix](https://github.com/wilson8507) - [Dave Gray](https://github.com/gitdagray) +- [Berkay Ersengun](https://github.com/berkayersengun) \ No newline at end of file From 022820d68066750664895c26c04f791f89639232 Mon Sep 17 00:00:00 2001 From: Cesar Omar Date: Thu, 19 Oct 2017 10:24:00 -0500 Subject: [PATCH 061/195] Add Cesar Omar to Contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 93f32945b2c..f9ad71f2e23 100644 --- a/Contributors.md +++ b/Contributors.md @@ -835,3 +835,4 @@ - [Josix](https://github.com/wilson8507) - [Dave Gray](https://github.com/gitdagray) - [Guy Livni](https://github.com/GuyLivni) +- [Cesar Omar](https://github.com/wasa4587) From f5d8057c85075d24d41ef6d40a601833d54e676d Mon Sep 17 00:00:00 2001 From: dbenton2 Date: Thu, 19 Oct 2017 11:31:58 -0400 Subject: [PATCH 062/195] add name Added my name --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 93f32945b2c..bc6e03e485e 100644 --- a/Contributors.md +++ b/Contributors.md @@ -835,3 +835,4 @@ - [Josix](https://github.com/wilson8507) - [Dave Gray](https://github.com/gitdagray) - [Guy Livni](https://github.com/GuyLivni) +- [Daniel Benton] (https://github.com/dbenton2) \ No newline at end of file From ebae333a421ca6539351e6d3bc226e991a2cdfa3 Mon Sep 17 00:00:00 2001 From: dtk0528 Date: Thu, 19 Oct 2017 23:33:58 +0800 Subject: [PATCH 063/195] Add dtk to Contributors list --- Contributors.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Contributors.md b/Contributors.md index 00af49af20b..69e4a7264e2 100644 --- a/Contributors.md +++ b/Contributors.md @@ -1,4 +1,4 @@ -- [Oliver Miller](https://github.com/Oliver-H-Miller) +- [Oliver Miller](https://github.com/Oliver-H-Miller) - [Lewis Shaw](https://github.com/iRuisu) - [Bao Tran](https://github.com/cyborg103) - [Jithu R Jacob 🤓](https://github.com/jithurjacob) @@ -837,3 +837,4 @@ - [Berkay Ersengun](https://github.com/berkayersengun) - [Guy Livni](https://github.com/GuyLivni) - [Cesar Omar](https://github.com/wasa4587) +- dtk https://github.com/dtk0528 From 4f28e62bb69ad1c96d4dcb71e6a252d4b09acc00 Mon Sep 17 00:00:00 2001 From: h4rdw0rk Date: Thu, 19 Oct 2017 22:35:29 +0700 Subject: [PATCH 064/195] Add h4rdw0rk to Contributors list --- Contributors.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Contributors.md b/Contributors.md index 4e687147cc5..6fa469c5c87 100644 --- a/Contributors.md +++ b/Contributors.md @@ -820,4 +820,5 @@ - [Faisal Hassan](https://faisalhassanx.bitbucket.io) - [daniel-enriquez](https://github.com/daniel-enriquez) - [Luke Taylor](https://github.com/Luke-Taylor) -- [Jim Plourde](https://github.com/giant995/first-contributions) \ No newline at end of file +- [Jim Plourde](https://github.com/giant995/first-contributions) +- [h4rdw0rk](https://github.com/h4rdw0rk/first-contributions) \ No newline at end of file From 07437dc7ca1c67bd2cab6d514b4fc76fe21c25f5 Mon Sep 17 00:00:00 2001 From: 17robots Date: Thu, 19 Oct 2017 15:41:11 +0000 Subject: [PATCH 065/195] Added 17robots to Contributers.md --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 1c85075cc3a..4819121cbec 100644 --- a/Contributors.md +++ b/Contributors.md @@ -834,3 +834,4 @@ - [Uğur Atmaca](https://github.com/uguratmaca) - [Josix](https://github.com/wilson8507) - [Dave Gray](https://github.com/gitdagray) +- [Matthew Dray](https://github.com/17robots) From 85aa31372c601923e3abd9387065f4315be9effc Mon Sep 17 00:00:00 2001 From: Jonathan Rinciari Date: Thu, 19 Oct 2017 11:41:58 -0400 Subject: [PATCH 066/195] Add Jonathan Rinciari to Contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 93f32945b2c..958afcdaf7b 100644 --- a/Contributors.md +++ b/Contributors.md @@ -7,6 +7,7 @@ - [girlzap](https://github.com/girlzap) - [DevMaterial](https://github.com/DevMaterial) - [drac00l](https://github.com/drac00l) +- [Jonathan Rinciari] (https://github.com/jonathanRinciari) - [Neha Upadhyay] - [jaro36](https://github.com/jaro36/) - [Björn Hjorth](https://github.com/Kaffesumpen) From bda7ef82654e43fc3cf079dfddbefdf439167f4e Mon Sep 17 00:00:00 2001 From: Joe Yang Date: Fri, 20 Oct 2017 00:10:15 +0800 Subject: [PATCH 067/195] Add WanWan to Contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 69e4a7264e2..f2f80894214 100644 --- a/Contributors.md +++ b/Contributors.md @@ -838,3 +838,4 @@ - [Guy Livni](https://github.com/GuyLivni) - [Cesar Omar](https://github.com/wasa4587) - dtk https://github.com/dtk0528 +- [WanWan](https://github.com/lf2com) \ No newline at end of file From 35de9d22fbae1f7ea5c4f3fd9b0adee1b51e7166 Mon Sep 17 00:00:00 2001 From: Gilad Bar Date: Thu, 19 Oct 2017 19:18:32 +0300 Subject: [PATCH 068/195] Add my name as a contributor Thank you! --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 69e4a7264e2..e0b21d6c10f 100644 --- a/Contributors.md +++ b/Contributors.md @@ -836,5 +836,6 @@ - [Dave Gray](https://github.com/gitdagray) - [Berkay Ersengun](https://github.com/berkayersengun) - [Guy Livni](https://github.com/GuyLivni) +- [Gilad Bar](https://github.com/GomuGilad6) - [Cesar Omar](https://github.com/wasa4587) - dtk https://github.com/dtk0528 From 0387662edc29b27abba951fe0389ee555d02b063 Mon Sep 17 00:00:00 2001 From: TheMushrr00m Date: Thu, 19 Oct 2017 11:18:56 -0500 Subject: [PATCH 069/195] Add Gabriel Cueto to Contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 69e4a7264e2..4cb61bae360 100644 --- a/Contributors.md +++ b/Contributors.md @@ -1,4 +1,5 @@ - [Oliver Miller](https://github.com/Oliver-H-Miller) +- [Gabriel Cueto](https://github.com/TheMushrr00m) - [Lewis Shaw](https://github.com/iRuisu) - [Bao Tran](https://github.com/cyborg103) - [Jithu R Jacob 🤓](https://github.com/jithurjacob) From dfaf85107836e09dbe3d26b73a7f2faa8a2a5152 Mon Sep 17 00:00:00 2001 From: Francis Borbe Date: Fri, 20 Oct 2017 00:59:13 +0800 Subject: [PATCH 070/195] Add francis to Contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 69e4a7264e2..c6ba028cb6c 100644 --- a/Contributors.md +++ b/Contributors.md @@ -838,3 +838,4 @@ - [Guy Livni](https://github.com/GuyLivni) - [Cesar Omar](https://github.com/wasa4587) - dtk https://github.com/dtk0528 +- [Francis](https://github.com/borbefg) From e42f2271a3835880f2ee483dcabb897a5974121e Mon Sep 17 00:00:00 2001 From: ocean0212 Date: Thu, 19 Oct 2017 12:45:22 -0500 Subject: [PATCH 071/195] Add Ocean to Contributors List and add dtk's format --- Contributors.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Contributors.md b/Contributors.md index 69e4a7264e2..eb236fd1892 100644 --- a/Contributors.md +++ b/Contributors.md @@ -837,4 +837,5 @@ - [Berkay Ersengun](https://github.com/berkayersengun) - [Guy Livni](https://github.com/GuyLivni) - [Cesar Omar](https://github.com/wasa4587) -- dtk https://github.com/dtk0528 +- [dtk](https://github.com/dtk0528) +- [Ocean](https://github.com/ocean0212) \ No newline at end of file From 84f7d28134e6ce48798de09f8f30f4a91bae9cf5 Mon Sep 17 00:00:00 2001 From: huntleyreep Date: Thu, 19 Oct 2017 13:58:25 -0400 Subject: [PATCH 072/195] Contributors Addition --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 69e4a7264e2..6f5cfa14c9d 100644 --- a/Contributors.md +++ b/Contributors.md @@ -838,3 +838,4 @@ - [Guy Livni](https://github.com/GuyLivni) - [Cesar Omar](https://github.com/wasa4587) - dtk https://github.com/dtk0528 +- [Huntley Reep](https://github.com/huntleyreep) From 9a884faa24480e0d1dd876a915450828de977550 Mon Sep 17 00:00:00 2001 From: WeiChien Hsu Date: Thu, 19 Oct 2017 13:21:49 -0500 Subject: [PATCH 073/195] add my name --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index b9fbd1b0926..16d61e03cef 100644 --- a/Contributors.md +++ b/Contributors.md @@ -207,6 +207,7 @@ - [Vakas Zia](https://github.com/MVakas) - [xribene](https://github.com/xribene) - [ArcticSniper] +- [Wei-Chien Hsu](https://github.com/WeiChienHsu) - [Angga Indriya Pamungkas](https://github.com/anggaip) - [Joaqu�n Pignol](https://github.com/joespi) - [Srijan Manandhar](https://github.com/srijanss) From a6e9075266847216880a9bf6c64e16ae9d49857b Mon Sep 17 00:00:00 2001 From: WeiChien Hsu Date: Thu, 19 Oct 2017 13:31:41 -0500 Subject: [PATCH 074/195] modify some traditional chinese contents --- translations/README.cht.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/translations/README.cht.md b/translations/README.cht.md index c9ff6ccf502..4ca54f3c2a1 100644 --- a/translations/README.cht.md +++ b/translations/README.cht.md @@ -16,7 +16,7 @@ ## Fork（複製）本代碼倉庫 點擊圖示中的按鈕去 Fork 這個代碼倉庫。 -這個操作會將代碼倉庫複製到你的賬戶名下。 +這個操作會將代碼倉庫複製到你的Github帳號下。 ## Clone（克隆）代碼倉庫 @@ -61,7 +61,7 @@ git checkout -b add-myname ## 對代碼進行修改，而後 Commit (提交) 修改 -打開 `Contributors.md` 這個文件，更新文件內容，將你的名字加上去，保存修改。`git status` 這命令會列出被改動的文件。接著 `git add` 這命令則可以添加你的改動，就像如下這條命令。 +打開 `Contributors.md` 這個文件，更新文件內容，將你的名字加上去，保存修改。`git status` 這命令會列出被改動的文件。接著 `git add` 這命令則可以添加你的改動，就像以下這條命令。 ``` git add Contributors.md ``` @@ -90,7 +90,8 @@ git push origin <分支的名稱> submit pull request -不久之後，我便會把你所有的變化合併到這個項目的主分支。更改合併後，你會收到通知電郵。 +不久之後，如果你更改的文件與原本沒有衝突，我們會把你所有的變化合併到這個項目的主分支。 +更改合併後，你會收到通知電郵。 ### [ 更多資料 ](additional-material/additional-material.md) @@ -105,7 +106,7 @@ git push origin <分支的名稱> 如果有任何疑問或想獲得更多協助，歡迎加入我們的 [Slack](https://firstcontributions.herokuapp.com)！ -通過下面這些鏈接，你能看到當前流行的眾多代碼倉庫中，適合初學者解決的問題列表，還等什麼，去吧 :) +通過下面這些連結，你能看到當前流行的眾多代碼倉庫中，適合初學者解決的問題列表，還等什麼，去吧 :) |[![exercism](https://avatars2.githubusercontent.com/u/5624255?v=3&s=100)](https://github.com/exercism/exercism.io/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+patch%22)|[![fun-retro](https://avatars3.githubusercontent.com/u/15913975?v=3&s=100)](https://github.com/funretro/distributed/issues?q=is%3Aopen+is%3Aissue+label%3Abeginner-friendly)|[](https://github.com/facebook/react/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+bug%22)|[![habitat](https://avatars1.githubusercontent.com/u/18171698?v=3&s=100)](https://github.com/habitat-sh/habitat/issues?q=is%3Aopen+is%3Aissue+label%3AEasy)|[![scikit-learn](https://avatars0.githubusercontent.com/u/365630?v=3&s=100)](https://github.com/scikit-learn/scikit-learn/issues?q=is%3Aopen+is%3Aissue+label%3AEasy)|[](https://github.com/technomancy/leiningen/issues?q=is%3Aopen+is%3Aissue+label%3ANewbie)|[](https://github.com/numpy/numpy/issues?q=is%3Aopen+is%3Aissue+label%3A%22Easy+Fix%22)|[![elasticsearch](https://avatars2.githubusercontent.com/u/6764390?v=3&s=100)](https://github.com/elastic/elasticsearch/issues?q=is%3Aopen+is%3Aissue+label%3A%22low+hanging+fruit%22)| |---|---|---|---|---|---|---|---| From 0244ba88283ba48a90d65b16655f118b7e5f24c1 Mon Sep 17 00:00:00 2001 From: Date: Fri, 20 Oct 2017 00:31:58 +0530 Subject: [PATCH 075/195] Add Saideep Dicholkar to Contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index b9fbd1b0926..2a331389466 100644 --- a/Contributors.md +++ b/Contributors.md @@ -1,3 +1,4 @@ +- [Saideep Dicholkar](https://github.com/saideepd) - [Oliver Miller](https://github.com/Oliver-H-Miller) - [Gabriel Cueto](https://github.com/TheMushrr00m) - [Lewis Shaw](https://github.com/iRuisu) From e548b4b78db2a6e9d84d895dc27f21f57119d263 Mon Sep 17 00:00:00 2001 From: Ruben Ortiz Date: Thu, 19 Oct 2017 16:15:24 -0300 Subject: [PATCH 076/195] Add Ruben Ortiz to Contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index b9fbd1b0926..b628916b415 100644 --- a/Contributors.md +++ b/Contributors.md @@ -1,3 +1,4 @@ +- [Rubén Ortiz](https://github.com/rubenortiz) - [Oliver Miller](https://github.com/Oliver-H-Miller) - [Gabriel Cueto](https://github.com/TheMushrr00m) - [Lewis Shaw](https://github.com/iRuisu) From 185c91f397d3f7dc93297611c411866f72864834 Mon Sep 17 00:00:00 2001 From: mamai Date: Thu, 19 Oct 2017 15:16:07 -0400 Subject: [PATCH 077/195] Added mariannems to Contributors List --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index b9fbd1b0926..a6863d960eb 100644 --- a/Contributors.md +++ b/Contributors.md @@ -848,3 +848,4 @@ - [Ocean](https://github.com/ocean0212) - [Francis](https://github.com/borbefg) - [WanWan](https://github.com/lf2com) +- [mariannems](https://github.com/mariannems) From 72331143472bba284d96898c530fb5437c392b84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Carlos=20Pe=C3=B1uelas=20Armenta?= Date: Thu, 19 Oct 2017 14:19:21 -0500 Subject: [PATCH 078/195] =?UTF-8?q?Add=20Jos=C3=A9=20Carlos=20Pe=C3=B1uela?= =?UTF-8?q?s=20Armenta=20to=20Contributors=20list?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Contributors.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Contributors.md b/Contributors.md index 75a542642bf..592601f5086 100644 --- a/Contributors.md +++ b/Contributors.md @@ -754,4 +754,5 @@ - [Teo Liang wei](https://github.com/liangwei93) - [Karthik Murugesan](https://github.com/karthikmuru) - [TheHungryBu](https://github.com/TheHungryBu) -- [Valeriia Kolesnyk](https://github.com/xvaleriex) \ No newline at end of file +- [Valeriia Kolesnyk](https://github.com/xvaleriex) +- [José Carlos Peñuelas Armenta](https://github.com/Jocapear) \ No newline at end of file From 4cde1c39662464cca4bb9620e3db501ac5f68789 Mon Sep 17 00:00:00 2001 From: Emina Zolota Date: Thu, 19 Oct 2017 21:32:23 +0200 Subject: [PATCH 079/195] Add Emina to Contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 3a60e921e70..1280f27bc5c 100644 --- a/Contributors.md +++ b/Contributors.md @@ -853,3 +853,4 @@ - [Francis](https://github.com/borbefg) - [WanWan](https://github.com/lf2com) - [mariannems](https://github.com/mariannems) +- [Emina Zolota](https://github.com/eminazolota) \ No newline at end of file From 98f12605aa6518370a2b78fc989ab2781a007cf5 Mon Sep 17 00:00:00 2001 From: Joseph Davidson Date: Thu, 19 Oct 2017 22:33:26 +0300 Subject: [PATCH 080/195] Facebook share button and link --- app/public/index.html | 66 +++++++++---------- app/src/App.jsx | 26 ++++---- app/src/components/Navbar/Navbar.jsx | 18 ++--- app/src/components/SocialShare/Facebook.jsx | 16 +++++ .../components/SocialShare/SocialShare.css | 6 +- .../components/SocialShare/SocialShare.jsx | 13 ++-- app/src/components/SocialShare/Twitter.jsx | 14 ++-- app/src/components/SocialShare/icons.js | 57 ++++++++-------- 8 files changed, 121 insertions(+), 95 deletions(-) create mode 100644 app/src/components/SocialShare/Facebook.jsx diff --git a/app/public/index.html b/app/public/index.html index 90e26772fba..868bbbedbee 100644 --- a/app/public/index.html +++ b/app/public/index.html @@ -1,40 +1,40 @@ - - - - - - - First Contributions - - -
- + First Contributions + + +
+ - - - + }); + } + + + diff --git a/app/src/App.jsx b/app/src/App.jsx index ccc4c6561ea..6bf295e539f 100644 --- a/app/src/App.jsx +++ b/app/src/App.jsx @@ -6,19 +6,19 @@ import CardsContainer from './components/ProjectList/CardsContainer'; import SocialShare from './components/SocialShare/SocialShare'; class App extends Component { - render() { - return ( -
- -
-

Make your first open source contribution in 5 minutes

-
- - - -
- ); - } + render() { + return ( +
+ +
+

Make your first open source contribution in 5 minutes

+
+ + + +
+ ); + } } export default App; diff --git a/app/src/components/Navbar/Navbar.jsx b/app/src/components/Navbar/Navbar.jsx index b7da934b06e..f6c5cb91d58 100644 --- a/app/src/components/Navbar/Navbar.jsx +++ b/app/src/components/Navbar/Navbar.jsx @@ -2,15 +2,15 @@ import React, { Component } from 'react'; import './Navbar.css'; class Navbar extends Component { - render() { - return ( -
- GitHub - Twitter - Slack -
- ); - } + render() { + return ( +
+ GitHub + Twitter + Slack +
+ ); + } } export default Navbar; diff --git a/app/src/components/SocialShare/Facebook.jsx b/app/src/components/SocialShare/Facebook.jsx new file mode 100644 index 00000000000..88d1f645a2f --- /dev/null +++ b/app/src/components/SocialShare/Facebook.jsx @@ -0,0 +1,16 @@ +import React from 'react'; +import { Icon, IconPaths } from './icons.js'; + +const facebookLink = "https://www.facebook.com/sharer/sharer.php?u=https://roshanjossey.github.io/first-contributions"e=Yay%21%20I%20just%20made%20my%20first%20open%20source%20contribution%20with%20First%20Contributions.%20You%20can%20too,%20by%20following%20a%20simple%20tutorial%20at%20https%3A//goo.gl/66Axwe" + +const FacebookCard = () => ( + + + +); + +export default FacebookCard; diff --git a/app/src/components/SocialShare/SocialShare.css b/app/src/components/SocialShare/SocialShare.css index 33ec83377a5..3ee51e735ca 100644 --- a/app/src/components/SocialShare/SocialShare.css +++ b/app/src/components/SocialShare/SocialShare.css @@ -11,6 +11,10 @@ margin-right: .25em; } +#social-shares-container { + display: flex; +} + .icon-card { display: flex; align-items: center; @@ -26,7 +30,7 @@ } .icon-card:hover{ - box-shadow: rgba(0, 0, 0, 0.16) 0px 3px 10px, rgba(0, 0, 0, 0.23) 0px 3px 10px; + box-shadow: rgba(0, 0, 0, 0.16) 0px 3px 10px, rgba(0, 0, 0, 0.23) 0px 3px 10px; } .twitter { diff --git a/app/src/components/SocialShare/SocialShare.jsx b/app/src/components/SocialShare/SocialShare.jsx index 84637d17f31..18a1ae5145f 100644 --- a/app/src/components/SocialShare/SocialShare.jsx +++ b/app/src/components/SocialShare/SocialShare.jsx @@ -1,12 +1,17 @@ import React from 'react'; import TwitterCard from './Twitter'; +import FacebookCard from './Facebook'; import './SocialShare.css'; const SocialShare = () => ( -
-

Share the news of your first contribution

- -
+
+

Share the news of your first contribution

+
+ + + +
+
); export default SocialShare diff --git a/app/src/components/SocialShare/Twitter.jsx b/app/src/components/SocialShare/Twitter.jsx index 17b846ab1c2..cb2a58532e6 100644 --- a/app/src/components/SocialShare/Twitter.jsx +++ b/app/src/components/SocialShare/Twitter.jsx @@ -4,13 +4,13 @@ import { Icon, IconPaths } from './icons.js'; const twitterLink = "https://twitter.com/intent/tweet?text=Yay%21%20I%20just%20made%20my%20first%20open%20source%20contribution%20with%20@1stcontribution.%20You%20can%20too%20at%20https%3A//goo.gl/66Axwe%0A&hashtags=Hacktoberfest,OpenSource" const TwitterCard = () => ( - - - + + + ); export default TwitterCard; diff --git a/app/src/components/SocialShare/icons.js b/app/src/components/SocialShare/icons.js index 939127642a3..b8773a4370c 100644 --- a/app/src/components/SocialShare/icons.js +++ b/app/src/components/SocialShare/icons.js @@ -2,42 +2,43 @@ import React from 'react'; import PropTypes from 'prop-types'; export const IconPaths = { - twitter: 'M22 4.864c-0.808 0.361-1.68 0.602-2.591 0.709 0.932-0.559 1.646-1.444 1.985-2.496-0.872 0.516-1.839 0.894-2.866 1.096-0.825-0.877-1.998-1.422-3.296-1.422-2.492 0-4.512 2.020-4.512 4.512 0 0.352 0.039 0.696 0.116 1.027-3.751-0.189-7.077-1.985-9.303-4.718-0.387 0.666-0.61 1.444-0.61 2.269 0 1.564 0.795 2.948 2.007 3.755-0.739-0.021-1.435-0.228-2.045-0.563 0 0.017 0 0.039 0 0.056 0 2.187 1.555 4.013 3.622 4.426-0.378 0.103-0.778 0.159-1.19 0.159-0.292 0-0.571-0.030-0.851-0.082 0.576 1.792 2.243 3.098 4.215 3.137-1.547 1.212-3.489 1.934-5.607 1.934-0.365 0-0.722-0.021-1.079-0.064 2.002 1.285 4.374 2.028 6.922 2.028 8.302 0 12.843-6.879 12.843-12.843 0-0.198-0.004-0.391-0.013-0.584 0.881-0.632 1.646-1.427 2.252-2.333z', - github: 'M11 0.272c-6.074 0-11 4.925-11 11 0 4.86 3.152 8.983 7.522 10.438 0.55 0.102 0.752-0.239 0.752-0.529 0-0.262-0.010-1.129-0.015-2.048-3.060 0.666-3.706-1.298-3.706-1.298-0.5-1.271-1.221-1.61-1.221-1.61-0.998-0.683 0.075-0.669 0.075-0.669 1.104 0.078 1.686 1.134 1.686 1.134 0.981 1.682 2.573 1.195 3.201 0.914 0.099-0.711 0.384-1.196 0.698-1.471-2.443-0.278-5.012-1.221-5.012-5.436 0-1.201 0.43-2.182 1.134-2.953-0.114-0.277-0.491-1.396 0.106-2.911 0 0 0.924-0.295 3.026 1.128 0.877-0.244 1.818-0.366 2.753-0.37 0.935 0.004 1.876 0.126 2.755 0.37 2.1-1.423 3.022-1.128 3.022-1.128 0.599 1.515 0.222 2.634 0.108 2.911 0.705 0.77 1.132 1.752 1.132 2.953 0 4.225-2.573 5.155-5.023 5.427 0.395 0.341 0.746 1.011 0.746 2.037 0 1.472-0.013 2.656-0.013 3.019 0 0.293 0.198 0.636 0.756 0.528 4.368-1.456 7.516-5.578 7.516-10.436 0-6.075-4.925-11-11-11z', + twitter: 'M22 4.864c-0.808 0.361-1.68 0.602-2.591 0.709 0.932-0.559 1.646-1.444 1.985-2.496-0.872 0.516-1.839 0.894-2.866 1.096-0.825-0.877-1.998-1.422-3.296-1.422-2.492 0-4.512 2.020-4.512 4.512 0 0.352 0.039 0.696 0.116 1.027-3.751-0.189-7.077-1.985-9.303-4.718-0.387 0.666-0.61 1.444-0.61 2.269 0 1.564 0.795 2.948 2.007 3.755-0.739-0.021-1.435-0.228-2.045-0.563 0 0.017 0 0.039 0 0.056 0 2.187 1.555 4.013 3.622 4.426-0.378 0.103-0.778 0.159-1.19 0.159-0.292 0-0.571-0.030-0.851-0.082 0.576 1.792 2.243 3.098 4.215 3.137-1.547 1.212-3.489 1.934-5.607 1.934-0.365 0-0.722-0.021-1.079-0.064 2.002 1.285 4.374 2.028 6.922 2.028 8.302 0 12.843-6.879 12.843-12.843 0-0.198-0.004-0.391-0.013-0.584 0.881-0.632 1.646-1.427 2.252-2.333z', + github: 'M11 0.272c-6.074 0-11 4.925-11 11 0 4.86 3.152 8.983 7.522 10.438 0.55 0.102 0.752-0.239 0.752-0.529 0-0.262-0.010-1.129-0.015-2.048-3.060 0.666-3.706-1.298-3.706-1.298-0.5-1.271-1.221-1.61-1.221-1.61-0.998-0.683 0.075-0.669 0.075-0.669 1.104 0.078 1.686 1.134 1.686 1.134 0.981 1.682 2.573 1.195 3.201 0.914 0.099-0.711 0.384-1.196 0.698-1.471-2.443-0.278-5.012-1.221-5.012-5.436 0-1.201 0.43-2.182 1.134-2.953-0.114-0.277-0.491-1.396 0.106-2.911 0 0 0.924-0.295 3.026 1.128 0.877-0.244 1.818-0.366 2.753-0.37 0.935 0.004 1.876 0.126 2.755 0.37 2.1-1.423 3.022-1.128 3.022-1.128 0.599 1.515 0.222 2.634 0.108 2.911 0.705 0.77 1.132 1.752 1.132 2.953 0 4.225-2.573 5.155-5.023 5.427 0.395 0.341 0.746 1.011 0.746 2.037 0 1.472-0.013 2.656-0.013 3.019 0 0.293 0.198 0.636 0.756 0.528 4.368-1.456 7.516-5.578 7.516-10.436 0-6.075-4.925-11-11-11z', + facebook: 'M16.5,0l-2.9,0c-3.2,0-5.3,2.1-5.3,5.4v2.5H5.5c-0.2,0-0.4,0.2-0.4,0.4V12c0,0.2,0.2,0.4,0.4,0.4h2.9v9.1 c0,0.2,0.2,0.4,0.4,0.4h3.7c0.2,0,0.4-0.2,0.4-0.4v-9.1h3.4c0.2,0,0.4-0.2,0.4-0.4l0-3.6c0-0.1,0-0.2-0.1-0.3s-0.2-0.1-0.3-0.1H13 V5.8c0-1,0.2-1.5,1.6-1.5l1.9,0c0.2,0,0.4-0.2,0.4-0.4V0.5C16.9,0.2,16.7,0,16.5,0z', }; export const Icon = props => { - const styles = { - svg: { - display: 'block', - margin: '0 auto', - }, - path: { - fill: props.color, - }, - }; + const styles = { + svg: { + display: 'block', + margin: '0 auto', + }, + path: { + fill: props.color, + }, + }; - return ( - - - - ); + return ( + + + +); }; Icon.propTypes = { - icon: PropTypes.string.isRequired, - size: PropTypes.number, - color: PropTypes.string, + icon: PropTypes.string.isRequired, + size: PropTypes.number, + color: PropTypes.string, }; Icon.defaultProps = { - size: 22, + size: 22, }; From 34e0e89c4ede6ab0349503b1e367eddbad1a0949 Mon Sep 17 00:00:00 2001 From: ana Date: Thu, 19 Oct 2017 13:42:52 -0700 Subject: [PATCH 081/195] Add Ana Perez to Contributors list --- Contributors.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Contributors.md b/Contributors.md index 1280f27bc5c..f6fa8496194 100644 --- a/Contributors.md +++ b/Contributors.md @@ -853,4 +853,5 @@ - [Francis](https://github.com/borbefg) - [WanWan](https://github.com/lf2com) - [mariannems](https://github.com/mariannems) -- [Emina Zolota](https://github.com/eminazolota) \ No newline at end of file +- [Emina Zolota](https://github.com/eminazolota) +- [Ana Perez](https://github.com/anacperez) \ No newline at end of file From 84f5c5b32839abfee920f48736fbc39bc482c6f7 Mon Sep 17 00:00:00 2001 From: arjunrajpal Date: Fri, 20 Oct 2017 02:24:48 +0530 Subject: [PATCH 082/195] Add Arjun Rajpal to Contributors list --- Contributors.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Contributors.md b/Contributors.md index f6fa8496194..9298f464f19 100644 --- a/Contributors.md +++ b/Contributors.md @@ -854,4 +854,5 @@ - [WanWan](https://github.com/lf2com) - [mariannems](https://github.com/mariannems) - [Emina Zolota](https://github.com/eminazolota) -- [Ana Perez](https://github.com/anacperez) \ No newline at end of file +- [Ana Perez](https://github.com/anacperez) +- [Arjun Rajpal](https://github.com/arjunrajpal) \ No newline at end of file From 141455a01bd77d59a5067a728589cf9e88723331 Mon Sep 17 00:00:00 2001 From: Aman Jain Date: Fri, 20 Oct 2017 02:43:12 +0530 Subject: [PATCH 083/195] Add Aman Jain to Contributors List --- Contributors.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Contributors.md b/Contributors.md index 9298f464f19..50281a47701 100644 --- a/Contributors.md +++ b/Contributors.md @@ -855,4 +855,5 @@ - [mariannems](https://github.com/mariannems) - [Emina Zolota](https://github.com/eminazolota) - [Ana Perez](https://github.com/anacperez) -- [Arjun Rajpal](https://github.com/arjunrajpal) \ No newline at end of file +- [Arjun Rajpal](https://github.com/arjunrajpal) +- [Aman Jain](https://github.com/amanjain97) \ No newline at end of file From ce9071241a5a8b4c81c5fa6dfcd7ac2c3cb365a7 Mon Sep 17 00:00:00 2001 From: Bob Kim Date: Thu, 19 Oct 2017 22:01:42 +0000 Subject: [PATCH 084/195] Change a name of repo --- .../keeping-your-fork-synced-with-this-repository.ko.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/additional-material/translations/keeping-your-fork-synced-with-this-repository.ko.md b/additional-material/translations/keeping-your-fork-synced-with-this-repository.ko.md index 54dfa7bf95b..5cb2d453a74 100644 --- a/additional-material/translations/keeping-your-fork-synced-with-this-repository.ko.md +++ b/additional-material/translations/keeping-your-fork-synced-with-this-repository.ko.md @@ -1,6 +1,7 @@ # 여러분이 포크한 저장소와 싱크상태 유지하기 -먼저, 전체 싱크과정을 이해해야합니다. 본 스키마에는 3개의 리포들이 있습니다. 저의 GitHub에 있는 제 공개리포인 `github.com/Roshanjossey/first-contributions/`와 여러분의 포크된 리포인 `github.com/Your-Name/first-contributions/`, 그리고 로컬 머신에 위치해서 현재 작업중인 리포가 있습니다. 오픈 소스 프로젝트에 특화된 이러한 조합을 `트라이앵클 워크플로우`라고 부릅니다. +먼저, 전체 싱크과정을 이해해야합니다. 본 스키마에는 3개의 리포들이 있습니다. 저의 GitHub에 있는 제 공개리포인 `github.com/Roshanjossey/first-contributions/`와 여러분의 포크된 리포인 `github.com/Your-Name/first-contributions/`, 그리고 로컬 머신에 위치해서 현재 작업중인 리포가 있습니다. 오픈 소스 프로젝트에 특화된 이러한 조합을 `트라이앵글 워크플로우`라고 부릅니다. + triangle workflow 여러분의 두 개의 리포들을 제 공개 리포의 최신 상태와 싱크상태를 유지하기 위해서는 제일 먼저여러분의 로컬머신에 위치한 리포를 제 공개 리포와 fetch와 merge를 해야합니다. From f8ae4ddbf66f467148cb4f2f944b785095a08b32 Mon Sep 17 00:00:00 2001 From: Bill Reid Date: Thu, 19 Oct 2017 23:07:33 +0100 Subject: [PATCH 085/195] Add bl-rd to Contributors list --- Contributors.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Contributors.md b/Contributors.md index 50281a47701..5af2da57747 100644 --- a/Contributors.md +++ b/Contributors.md @@ -856,4 +856,5 @@ - [Emina Zolota](https://github.com/eminazolota) - [Ana Perez](https://github.com/anacperez) - [Arjun Rajpal](https://github.com/arjunrajpal) -- [Aman Jain](https://github.com/amanjain97) \ No newline at end of file +- [Aman Jain](https://github.com/amanjain97) +- [bl-rd](https://github.com/bl-rd) \ No newline at end of file From b41bfce0bcf6d4e0b87f11fd7be8b6fc4b1cb6ac Mon Sep 17 00:00:00 2001 From: Bob Kim Date: Thu, 19 Oct 2017 22:11:26 +0000 Subject: [PATCH 086/195] Rename a repo --- ...your-fork-synced-with-this-repository.ko.md | 18 +++++++++--------- .../removing-branch-from-your-repository.ko.md | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/additional-material/translations/keeping-your-fork-synced-with-this-repository.ko.md b/additional-material/translations/keeping-your-fork-synced-with-this-repository.ko.md index 5cb2d453a74..4e8a424b537 100644 --- a/additional-material/translations/keeping-your-fork-synced-with-this-repository.ko.md +++ b/additional-material/translations/keeping-your-fork-synced-with-this-repository.ko.md @@ -1,11 +1,11 @@ # 여러분이 포크한 저장소와 싱크상태 유지하기 -먼저, 전체 싱크과정을 이해해야합니다. 본 스키마에는 3개의 리포들이 있습니다. 저의 GitHub에 있는 제 공개리포인 `github.com/Roshanjossey/first-contributions/`와 여러분의 포크된 리포인 `github.com/Your-Name/first-contributions/`, 그리고 로컬 머신에 위치해서 현재 작업중인 리포가 있습니다. 오픈 소스 프로젝트에 특화된 이러한 조합을 `트라이앵글 워크플로우`라고 부릅니다. +먼저, 전체 싱크과정을 이해해야합니다. 본 스키마에는 3개의 저장소들이 있습니다. 저의 GitHub에 있는 제 공개저장소인 `github.com/Roshanjossey/first-contributions/`와 여러분의 포크된 저장소인 `github.com/Your-Name/first-contributions/`, 그리고 로컬 머신에 위치해서 현재 작업중인 저장소가 있습니다. 오픈 소스 프로젝트에 특화된 이러한 조합을 `트라이앵글 워크플로우`라고 부릅니다. triangle workflow -여러분의 두 개의 리포들을 제 공개 리포의 최신 상태와 싱크상태를 유지하기 위해서는 제일 먼저여러분의 로컬머신에 위치한 리포를 제 공개 리포와 fetch와 merge를 해야합니다. -두번째는 여러분의 로컬 리포를 포크된 GitHub의 리포에 push하는 것 입니다. 이전 과정에서 봤듯이 "pull request"를 요청할 수 있는 곳은 오직 포크된 리포에서만 가능합니다. 따라서 마지막으로 업데이트 되어야하는 리포는 포크된 GitHub입니다. +여러분의 두 개의 저장소들을 제 공개 저장소의 최신 상태와 싱크상태를 유지하기 위해서는 제일 먼저여러분의 로컬머신에 위치한 저장소를 제 공개 저장소와 fetch와 merge를 해야합니다. +두번째는 여러분의 로컬 저장소를 포크된 GitHub의 저장소에 push하는 것 입니다. 이전 과정에서 봤듯이 "pull request"를 요청할 수 있는 곳은 오직 포크된 저장소에서만 가능합니다. 따라서 마지막으로 업데이트 되어야하는 저장소는 포크된 GitHub입니다. 자, 어떻게하는지 보겠습니다: 먼저 여러분은 master 브랜치에 위치해 있어야합니다. 현재 어떤 브래치에 있는지 확인합니다.: ``` @@ -16,26 +16,26 @@ git status git checkout master ``` -제 공개 리포를 아직 여러분의 git에 추가하지 않았다면 다음 명령으로 추가합니다. `add upstream remote-url`: +제 공개 저장소를 아직 여러분의 git에 추가하지 않았다면 다음 명령으로 추가합니다. `add upstream remote-url`: ``` git remote add upstream https://github.com/Roshanjossey/first-contributions ``` -지정한 URL을 이용해 현재 프로젝트의 또 다른 최신 버전이 있는지 git에게 확인을 요청하는 방법입니다. 그리고 우리는 이를 `upstream` 이라고 부르기로합니다. 일단 git이 이러한 이름을 가지고 있다면 다음과 같이 공개 리포의 최진 버전을 가지고 옵니다. : +지정한 URL을 이용해 현재 프로젝트의 또 다른 최신 버전이 있는지 git에게 확인을 요청하는 방법입니다. 그리고 우리는 이를 `upstream` 이라고 부르기로합니다. 일단 git이 이러한 이름을 가지고 있다면 다음과 같이 공개 저장소의 최진 버전을 가지고 옵니다. : ``` git fetch upstream ``` -여러분은 이제 제 포크(upstream remote)에서 최신 버전을 내려 받았습니다. 이제 공개 리포의 변경된 내용을 여러분의 master 브랜치에 병합해야합니다. +여러분은 이제 제 포크(upstream remote)에서 최신 버전을 내려 받았습니다. 이제 공개 저장소의 변경된 내용을 여러분의 master 브랜치에 병합해야합니다. ``` git rebase upstream/master ``` -여러분의 master 브랜치와 공개 리포를 병합하고 나면 이제 여러분의 로컬머신의 master 브랜치는 최신 상태입니다. 마지막으로 여러분의 master 브랜치를 여러분의 포크에 push하게 되면 포크한 GitHub 또한 변경사항들이 반영됩니다.: +여러분의 master 브랜치와 공개 저장소를 병합하고 나면 이제 여러분의 로컬머신의 master 브랜치는 최신 상태입니다. 마지막으로 여러분의 master 브랜치를 여러분의 포크에 push하게 되면 포크한 GitHub 또한 변경사항들이 반영됩니다.: ``` git push origin master ``` origin으로 명명된 리모트에 push하는 것에 주의하세요. -이제 여러분의 모든 리포가 최신 상태를 유지하게 되었습니다. -잘 하셨습니다! GitHub 리포에 커밋이 추가적으로 발생할 때마다 이러한 작업을 해야합니다. +이제 여러분의 모든 저장소가 최신 상태를 유지하게 되었습니다. +잘 하셨습니다! GitHub 저장소에 커밋이 추가적으로 발생할 때마다 이러한 작업을 해야합니다. diff --git a/additional-material/translations/removing-branch-from-your-repository.ko.md b/additional-material/translations/removing-branch-from-your-repository.ko.md index c254c113bca..21370817e04 100644 --- a/additional-material/translations/removing-branch-from-your-repository.ko.md +++ b/additional-material/translations/removing-branch-from-your-repository.ko.md @@ -25,6 +25,6 @@ git push origin --delete ``` 자, 여러분은 이제 자신의 브래치를 정리하는 법을 배웠습니다. -시간이 지나면 많은 커밋이 리포에 추가됩니다. 그리고 로컬 머신과 GitHub 포크의 마스터 브랜치는 최신 버전이 아닙니다. 따라서 저장소를 내 것과 동기화 된 상태로 유지하려면 아래 단계를 따르십시오. +시간이 지나면 많은 커밋이 저장소에 추가됩니다. 그리고 로컬 머신과 GitHub 포크의 마스터 브랜치는 최신 버전이 아닙니다. 따라서 저장소를 내 것과 동기화 된 상태로 유지하려면 아래 단계를 따르십시오. #### [ 여러분이 포크한 저장소와 싱크상태 유지하기 ](keeping-your-fork-synced-with-this-repository.ko.md) From d9c132febdc6efe48bb8d790123fb12ff1032185 Mon Sep 17 00:00:00 2001 From: Bob Kim Date: Thu, 19 Oct 2017 22:40:31 +0000 Subject: [PATCH 087/195] Apply changes of README.md --- translations/README.ko.md | 49 ++++++--------------------------------- 1 file changed, 7 insertions(+), 42 deletions(-) diff --git a/translations/README.ko.md b/translations/README.ko.md index 403a67015c8..ed6f3896289 100644 --- a/translations/README.ko.md +++ b/translations/README.ko.md @@ -105,39 +105,14 @@ git push origin 이제 여러분의 변경사항을 제가 확인 후에 마스터 브랜치에 머지하게되면 알림메일을 받으실 수 있습니다. -## 포크한 저장소와 이 저장소 동기화하기 - -이제 나는 이 프로젝트의 마스터 브랜치에 모든 변경사항을 병합할 것 입니다. 당신의 -포크는 그러한 변경사항을 가지고 있지 않습니다. 당신의 포크를 나의 것과 동기화 -하기 위해서, 내 저장소의 주소를 `upstream remote url` 로 추가하세요. - -``` -git remote add upstream https://github.com/multunus/first-contributions -``` - -이것은 명시된 주소에 이 프로젝트의 또 다른 버전이 존재한다는 점을 Git 에 -알려줍니다. 우리는 이것을 업스트림이라고 부릅니다. 변경사항이 병합되면 내 -저장소의 새 버전을 가지고 오세요. - -``` -git fetch upstream -``` +## 이제 어디로 가나요? -이거로 내 저장소(업스트림 원격)의 모든 변경사항을 가지고 옵니다. 이제, 내 -저장소의 새 개정판을 당신의 마스터 브랜치에 병합해야 합니다. +여러분의 첫 기여를 축하합니다. 이제 [웹 앱](https://roshanjossey.github.io/first-contributions/#social-share)으로 이동하여 친구 및 팔로워와 공유하십시오. -``` -git rebase upstream/master -``` +도움이 필요하거나 질문이있을 경우, 우리의 slack 팀에 합류 할 수 있습니다. [slack 팀 가입하기](https://firstcontributions.herokuapp.com). -여기서 당신이 가져온 모든 변경사항을 마스터 브랜치에 적용됩니다. 마스터 브랜치를 -푸시하면, 당신의 포크도 역시 변경사항을 가질 것 입니다. +이제 다른 프로젝트에 기여해보십시오. 시작하기 쉬운 문제가있는 프로젝트 목록을 작성했습니다. [웹 앱에 있는 프로젝트 목록](https://roshanjossey.github.io/first-contributions/#project-list)을 확인하세요. -``` -git push origin master -``` - -origin 이라 명명된 원격으로 푸시하고 있는 것에 주목하세요. ### [ 추가 정보 ](../additional-material/translations/additional-material.ko.md) @@ -148,18 +123,8 @@ origin 이라 명명된 원격으로 푸시하고 있는 것에 주목하세요. |---|---|---| |[GitHub Desktop](../github-desktop-tutorial.md)|[Visual Studio 2017](../github-windows-vs2017-tutorial.md)|[GitKraken](../gitkraken-tutorial.md)| +## Self-Promotion -## 이제 어디로 가나요? +본 프로젝트가 마음에 드신다면, [GitHub](https://github.com/Roshanjossey/first-contributions)를 star버튼을 눌러주세요. -이곳의 인기있는 저장소에 당신이 해결할 수 있는 초보자 수준의 문제들이 있습니다. -더 자세히 알아보기 위해 해당 저장소를 방문해보세요. - -|[![exercism](https://avatars2.githubusercontent.com/u/5624255?v=3&s=100)](https://github.com/exercism/exercism.io/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+patch%22)|[![fun-retro](https://avatars3.githubusercontent.com/u/15913975?v=3&s=100)](https://github.com/funretro/distributed/issues?q=is%3Aopen+is%3Aissue+label%3Abeginner-friendly)|[](https://github.com/facebook/react/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+bug%22)|[![habitat](https://avatars1.githubusercontent.com/u/18171698?v=3&s=100)](https://github.com/habitat-sh/habitat/issues?q=is%3Aopen+is%3Aissue+label%3AEasy)|[![scikit-learn](https://avatars0.githubusercontent.com/u/365630?v=3&s=100)](https://github.com/scikit-learn/scikit-learn/issues?q=is%3Aopen+is%3Aissue+label%3AEasy)|[](https://github.com/technomancy/leiningen/issues?q=is%3Aopen+is%3Aissue+label%3ANewbie)|[](https://github.com/numpy/numpy/issues?q=is%3Aopen+is%3Aissue+label%3A%22Easy+Fix%22)|[![elasticsearch](https://avatars2.githubusercontent.com/u/6764390?v=3&s=100)](https://github.com/elastic/elasticsearch/issues?q=is%3Aopen+is%3Aissue+label%3A%22low+hanging+fruit%22)| -|---|---|---|---|---|---|---|---| -|[exercism](https://github.com/exercism/exercism.io/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+patch%22)|[Fun Retros](https://github.com/funretro/distributed/issues?q=is%3Aopen+is%3Aissue+label%3Abeginner-friendly)|[react](https://github.com/facebook/react/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+bug%22)|[habitat](https://github.com/habitat-sh/habitat/issues?q=is%3Aopen+is%3Aissue+label%3AEasy)|[scikit-learn](https://github.com/scikit-learn/scikit-learn/issues?q=is%3Aopen+is%3Aissue+label%3AEasy)|[Leiningen](https://github.com/technomancy/leiningen/issues?q=is%3Aopen+is%3Aissue+label%3ANewbie)|[numpy](https://github.com/numpy/numpy/issues?q=is%3Aopen+is%3Aissue+label%3A%22Easy+Fix%22)|[elasticsearch](https://github.com/elastic/elasticsearch/issues?q=is%3Aopen+is%3Aissue+label%3A%22low+hanging+fruit%22)| -|[![homebrew](https://avatars2.githubusercontent.com/u/1503512?v=3&s=100)](https://github.com/Homebrew/brew/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22)|[![rust](https://avatars1.githubusercontent.com/u/5430905?v=3&s=100)](https://github.com/rust-lang/rust/issues?q=is%3Aopen+is%3Aissue+label%3AE-easy)|[![vuejs](https://avatars1.githubusercontent.com/u/6128107?v=3&s=100)](https://github.com/vuejs/vue/issues?q=is%3Aopen+is%3Aissue+label%3A%22contribution+welcome%22)|[![Suave](https://avatars2.githubusercontent.com/u/5822862?v=3&s=100)](https://github.com/SuaveIO/suave/issues?q=is%3Aopen+is%3Aissue+label%3Ahardness-easy)|[![OpenRA](https://avatars3.githubusercontent.com/u/409046?v=3&s=100)](https://github.com/OpenRA/OpenRA/issues?q=is%3Aopen+is%3Aissue+label%3AEasy)|[![PowerShell](https://avatars0.githubusercontent.com/u/11524380?v=3&s=100)](https://github.com/powershell/powershell/issues?q=is%3Aopen+is%3Aissue+label%3AUp-for-Grabs)|[![coala](https://avatars2.githubusercontent.com/u/10620750?v=3&s=100)](https://github.com/coala/coala/issues?q=is%3Aopen+is%3Aissue+label%3Adifficulty%2Flow+label%3Adifficulty%2Fnewcomer)|[![moment](https://avatars2.githubusercontent.com/u/4129662?v=3&s=100)](https://github.com/moment/moment/issues?q=is%3Aopen+is%3Aissue+label%3AUp-For-Grabs)| -|[homebrew](https://github.com/Homebrew/brew/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22)|[Rust](https://github.com/rust-lang/rust/issues?q=is%3Aopen+is%3Aissue+label%3AE-easy)|[vuejs](https://github.com/vuejs/vue/issues?q=is%3Aopen+is%3Aissue+label%3A%22contribution+welcome%22)|[Suave](https://github.com/SuaveIO/suave/issues?q=is%3Aopen+is%3Aissue+label%3Ahardness-easy)|[OpenRA](https://github.com/OpenRA/OpenRA/issues?q=is%3Aopen+is%3Aissue+label%3AEasy)|[PowerShell](https://github.com/powershell/powershell/issues?q=is%3Aopen+is%3Aissue+label%3AUp-for-Grabs)|[coala](https://github.com/coala/coala/issues?q=is%3Aopen+is%3Aissue+label%3Adifficulty%2Flow+label%3Adifficulty%2Fnewcomer)|[moment](https://github.com/moment/moment/issues?q=is%3Aopen+is%3Aissue+label%3AUp-For-Grabs)| -|[![ava](https://avatars0.githubusercontent.com/u/8527916?v=3&s=100)](https://github.com/avajs/ava/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+for+beginner%22)|[![freeCodeCamp](https://avatars0.githubusercontent.com/u/9892522?v=3&s=100)](https://github.com/freeCodeCamp/freeCodeCamp/issues?q=is%3Aopen+is%3Aissue+label%3Afirst-timers-only)|[![webpack](https://avatars3.githubusercontent.com/u/2105791?v=3&s=100)](https://github.com/webpack/webpack/issues?q=is%3Aopen+is%3Aissue+label%3A%22D1%3A+Easy+%28Contrib.+Difficulty%29%22)|[![hoodie](https://avatars1.githubusercontent.com/u/1888826?v=3&s=100)](https://github.com/hoodiehq/hoodie/issues?q=is%3Aopen+is%3Aissue+label%3Afirst-timers-only)|[![pouchdb](https://avatars3.githubusercontent.com/u/3406112?v=3&s=100)](https://github.com/pouchdb/pouchdb/issues?q=is%3Aopen+is%3Aissue+label%3A%22first+timers+only%22)|[![neovim](https://avatars0.githubusercontent.com/u/6471485?v=3&s=100)](https://github.com/neovim/neovim/issues?q=is%3Aopen+is%3Aissue+label%3Aentry-level)|[![babel](https://avatars2.githubusercontent.com/u/9637642?v=3&s=100)](https://github.com/babel/babel/issues?q=is%3Aopen+is%3Aissue+label%3Abeginner-friendly) |[](https://github.com/adobe/brackets/labels/Starter%20bug)| -|[ava](https://github.com/avajs/ava/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+for+beginner%22)|[freeCodeCamp](https://github.com/freeCodeCamp/freeCodeCamp/issues?q=is%3Aopen+is%3Aissue+label%3Afirst-timers-only)|[webpack](https://github.com/webpack/webpack/issues?q=is%3Aopen+is%3Aissue+label%3A%22D1%3A+Easy+%28Contrib.+Difficulty%29%22)|[hoodie](https://github.com/hoodiehq/hoodie/issues?q=is%3Aopen+is%3Aissue+label%3Afirst-timers-only)|[pouchdb](https://github.com/pouchdb/pouchdb/issues?q=is%3Aopen+is%3Aissue+label%3A%22first+timers+only%22)|[neovim](https://github.com/neovim/neovim/issues?q=is%3Aopen+is%3Aissue+label%3Aentry-level)|[babel](https://github.com/babel/babel/issues?q=is%3Aopen+is%3Aissue+label%3Abeginner-friendly) |[brackets](https://github.com/adobe/brackets/labels/Starter%20bug)| -| [![Node.js](https://avatars1.githubusercontent.com/u/9950313?v=3&s=100)](https://github.com/nodejs/node/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+contribution%22)|[](https://github.com/Semantic-Org/Semantic-UI-React/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+contribution%22)| -| [Node.js](https://github.com/nodejs/node/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+contribution%22) |[Semantic-UI-React](https://github.com/Semantic-Org/Semantic-UI-React/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+contribution%22) | +특히 도움이 되고자하신다면 [Twitter](https://twitter.com/sudo__bangbang) 와 [GitHub](https://github.com/roshanjossey)의 [Roshan](https://roshanjossey.github.io/)을 follow해주세요. From 49ea1a551d406b736132f109fc23668b0ec05208 Mon Sep 17 00:00:00 2001 From: Henrik J Date: Fri, 20 Oct 2017 00:56:57 +0200 Subject: [PATCH 088/195] =?UTF-8?q?Added=20Henrik=20J=C3=B6nsson?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Added Henrik Jönsson --- Contributors.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Contributors.md b/Contributors.md index 50281a47701..679fef19605 100644 --- a/Contributors.md +++ b/Contributors.md @@ -856,4 +856,5 @@ - [Emina Zolota](https://github.com/eminazolota) - [Ana Perez](https://github.com/anacperez) - [Arjun Rajpal](https://github.com/arjunrajpal) -- [Aman Jain](https://github.com/amanjain97) \ No newline at end of file +- [Aman Jain](https://github.com/amanjain97) +- [Henrik Jönsson](https://github.com/heggrik) From e336119a0c5907117d78a087d6f1dc273ff57375 Mon Sep 17 00:00:00 2001 From: david Date: Thu, 19 Oct 2017 16:41:16 -0700 Subject: [PATCH 089/195] Add David Carew to Contributors list --- Contributors.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Contributors.md b/Contributors.md index 50281a47701..f37e0642b8c 100644 --- a/Contributors.md +++ b/Contributors.md @@ -856,4 +856,5 @@ - [Emina Zolota](https://github.com/eminazolota) - [Ana Perez](https://github.com/anacperez) - [Arjun Rajpal](https://github.com/arjunrajpal) -- [Aman Jain](https://github.com/amanjain97) \ No newline at end of file +- [Aman Jain](https://github.com/amanjain97) +- [David Carew](https://github.com/carewdavid) From f86632d1d0726af6d91f939dfb50ac65f7389fc9 Mon Sep 17 00:00:00 2001 From: Mikaeri Ohana Date: Thu, 19 Oct 2017 22:52:11 -0200 Subject: [PATCH 090/195] Add miohana to Contributors list --- Contributors.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Contributors.md b/Contributors.md index 50281a47701..f3b57aec59d 100644 --- a/Contributors.md +++ b/Contributors.md @@ -1,4 +1,4 @@ -- [Rubén Ortiz](https://github.com/rubenortiz) +- [Rubén Ortiz](https://github.com/rubenortiz) - [Saideep Dicholkar](https://github.com/saideepd) - [Oliver Miller](https://github.com/Oliver-H-Miller) - [Gabriel Cueto](https://github.com/TheMushrr00m) @@ -856,4 +856,5 @@ - [Emina Zolota](https://github.com/eminazolota) - [Ana Perez](https://github.com/anacperez) - [Arjun Rajpal](https://github.com/arjunrajpal) -- [Aman Jain](https://github.com/amanjain97) \ No newline at end of file +- [Aman Jain](https://github.com/amanjain97) +- [Mikaeri Ohana](https://github.com/miohana) \ No newline at end of file From 8626648e9222453ebdb75db430312c0892c36773 Mon Sep 17 00:00:00 2001 From: Adithya J Date: Fri, 20 Oct 2017 06:25:23 +0530 Subject: [PATCH 091/195] Add Adithya J to Contributors list --- Contributors.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Contributors.md b/Contributors.md index 50281a47701..fc0153d0f15 100644 --- a/Contributors.md +++ b/Contributors.md @@ -856,4 +856,5 @@ - [Emina Zolota](https://github.com/eminazolota) - [Ana Perez](https://github.com/anacperez) - [Arjun Rajpal](https://github.com/arjunrajpal) -- [Aman Jain](https://github.com/amanjain97) \ No newline at end of file +- [Aman Jain](https://github.com/amanjain97) +- [Adithya J](https://github.com/adithya321) From 2d29035ade32b1d6a80669dab7735aa6b4d6e004 Mon Sep 17 00:00:00 2001 From: hardiksurana Date: Fri, 20 Oct 2017 08:57:01 +0530 Subject: [PATCH 092/195] add hardik-surana to Contributors List --- CONTRIBUTING.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 47ae65bbea3..fee5694864c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -29,4 +29,7 @@ We have some rules for translation. If you make the first translation for your l - [x] Fixed grammar for contribution Guide - [ ] Add more example and more guide +## Contributors +- Hardik Surana + Thanks! :heart: From fd7eac16058f2e3a2e683341bcc2bbf30dbdaee0 Mon Sep 17 00:00:00 2001 From: hardiksurana Date: Fri, 20 Oct 2017 09:27:00 +0530 Subject: [PATCH 093/195] changed contributors.md; added hardik-surana --- CONTRIBUTING.md | 2 -- Contributors.md | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index fee5694864c..26a27b4a00f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -29,7 +29,5 @@ We have some rules for translation. If you make the first translation for your l - [x] Fixed grammar for contribution Guide - [ ] Add more example and more guide -## Contributors -- Hardik Surana Thanks! :heart: diff --git a/Contributors.md b/Contributors.md index 182b52f1621..ed1e1651e26 100644 --- a/Contributors.md +++ b/Contributors.md @@ -861,3 +861,4 @@ - [bl-rd](https://github.com/bl-rd) - [Henrik Jönsson](https://github.com/heggrik) - [Adithya J](https://github.com/adithya321) +- [Hardik Surana](https://github.com/hardiksurana) \ No newline at end of file From 1e53748daf64731515a5318f7dcf90e6c728282b Mon Sep 17 00:00:00 2001 From: Carlos Alberto Date: Fri, 20 Oct 2017 01:57:24 -0200 Subject: [PATCH 094/195] Add Carlos to Contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 182b52f1621..19b61f962a9 100644 --- a/Contributors.md +++ b/Contributors.md @@ -861,3 +861,4 @@ - [bl-rd](https://github.com/bl-rd) - [Henrik Jönsson](https://github.com/heggrik) - [Adithya J](https://github.com/adithya321) +- [Carlos Lima](https://github.com/kakamg0) From 7aeefe8b04f4ebb99b10383c73d0df4a5f66c9ff Mon Sep 17 00:00:00 2001 From: Sukeerthi Khadri Date: Thu, 19 Oct 2017 21:14:04 -0700 Subject: [PATCH 095/195] Update Contributors.md --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 5701b36d92d..1a713eaa0d9 100644 --- a/Contributors.md +++ b/Contributors.md @@ -863,3 +863,4 @@ - [Adithya J](https://github.com/adithya321) - [Hardik Surana](https://github.com/hardiksurana) - [Carlos Lima](https://github.com/kakamg0) +- [Sukeer](https://github.com/Sukeer) From 2f78454498f58555b587747e27a4724c48ebed8f Mon Sep 17 00:00:00 2001 From: twroest Date: Thu, 19 Oct 2017 23:21:28 -0500 Subject: [PATCH 096/195] Add trevor-roest to Contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 5701b36d92d..09cb6cea85a 100644 --- a/Contributors.md +++ b/Contributors.md @@ -863,3 +863,4 @@ - [Adithya J](https://github.com/adithya321) - [Hardik Surana](https://github.com/hardiksurana) - [Carlos Lima](https://github.com/kakamg0) +- [Trevor Roest](https://github.com/twroest) From 337f0f157e007c55d493a0abaace0b4eafd16257 Mon Sep 17 00:00:00 2001 From: Rohit Mathew Date: Fri, 20 Oct 2017 10:48:00 +0530 Subject: [PATCH 097/195] Update Contributors.md --- Contributors.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Contributors.md b/Contributors.md index 65f08919292..7ec0e1f5a98 100644 --- a/Contributors.md +++ b/Contributors.md @@ -10,7 +10,7 @@ - [girlzap](https://github.com/girlzap) - [DevMaterial](https://github.com/DevMaterial) - [drac00l](https://github.com/drac00l) -- [Jonathan Rinciari] (https://github.com/jonathanRinciari) +- [Jonathan Rinciari](https://github.com/jonathanRinciari) - [Neha Upadhyay] - [jaro36](https://github.com/jaro36/) - [Björn Hjorth](https://github.com/Kaffesumpen) @@ -865,3 +865,4 @@ - [Carlos Lima](https://github.com/kakamg0) - [Trevor Roest](https://github.com/twroest) - [Sukeer](https://github.com/Sukeer) +- [Rohit Mathew](https://github.com/rohitjmathew/) From 1002e94bbd96a4b1fbe79402cd92007a4511f435 Mon Sep 17 00:00:00 2001 From: Elek Date: Fri, 20 Oct 2017 13:56:55 +0800 Subject: [PATCH 098/195] Add burste to Contributors list --- Contributors.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Contributors.md b/Contributors.md index 50281a47701..5ff882ac57c 100644 --- a/Contributors.md +++ b/Contributors.md @@ -856,4 +856,5 @@ - [Emina Zolota](https://github.com/eminazolota) - [Ana Perez](https://github.com/anacperez) - [Arjun Rajpal](https://github.com/arjunrajpal) -- [Aman Jain](https://github.com/amanjain97) \ No newline at end of file +- [Aman Jain](https://github.com/amanjain97) +- [Burste](https://github.com/Burste) \ No newline at end of file From ca6ad98568af17304c03da60b0cdf016b8325afe Mon Sep 17 00:00:00 2001 From: Bob Kim Date: Fri, 20 Oct 2017 06:46:06 +0000 Subject: [PATCH 099/195] Fix the beginning part of Korean traslation --- translations/README.ko.md | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/translations/README.ko.md b/translations/README.ko.md index ed6f3896289..dc0062cf01a 100644 --- a/translations/README.ko.md +++ b/translations/README.ko.md @@ -1,11 +1,17 @@ +[![Open Source Love](https://badges.frapsoft.com/os/v1/open-source.svg?v=103)](https://github.com/ellerbrock/open-source-badges/) +[](https://firstcontributions.herokuapp.com) +[![License: MIT](https://img.shields.io/badge/License-MIT-green.svg)](https://opensource.org/licenses/MIT) + + # 첫 기여 -이 저장소 포크하기 -*Read this in other languages: [English](../README.md), [Spanish](README.es.md), -[Dutch](README.nl.md), [Hindi](README.hi.md), [Russian](README.ru.md), -[Japanese](README.ja.md), [Vietnamese](README.vn.md), [Polish](README.pl.md), -[Korean](README.ko.md), [Greek](README.gr.md).* +힘이 듭니다. 처음으로 뭔가를하는 것은 언제나 어렵습니다. 특히 공동 작업 할 때 실수를 저지르는 것은 쉬운 일이 아닙니다. 그러나 오픈 소스는 협업과 협력에 관한 모든 것입니다. 우리는 새로운 오픈 소스 제공자가 처음 배우고 기여하는 방식을 단순화하고자했습니다. + +기사를 읽고 자습서를 보는 것이 도움이 될 수 있습니다. 그냥 덤벼들었다가 망쳐 놓는 것 보다는 낫겠죠. 이 프로젝트는 초보자가 첫 번째로 기여하는 방법을 안내하고 단순화하는 것을 목표로합니다. 기억하십시오 : 당신이 편안함을 느낄수록 배우는 것이 좋습니다. 첫 번째 기여를 하려면 아래의 간단한 단계를 따르십시오. 재미있을 것이라 약속드립니다. +#### *이 분서를 [다른 언어로 보기](../LANGUAGES.md)* + +이 저장소 포크하기 지금 Git 이 없으면 [설치](https://help.github.com/articles/set-up-git/)하세요. From ec21b77f6e81f2ab77193aca9f43a8b16a233e0d Mon Sep 17 00:00:00 2001 From: Nathan Mkaya Date: Fri, 20 Oct 2017 10:47:53 +0300 Subject: [PATCH 100/195] Add Nathan Mkaya to Contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 4d669882568..7899c8b2216 100644 --- a/Contributors.md +++ b/Contributors.md @@ -867,3 +867,4 @@ - [Trevor Roest](https://github.com/twroest) - [Sukeer](https://github.com/Sukeer) - [Rohit Mathew](https://github.com/rohitjmathew/) +- [Nathan Mkaya](https://githun.com/nathanmkaya/) From a1441adbe0eae8f10751703dd811cd3ba195ce5a Mon Sep 17 00:00:00 2001 From: Nathan Mkaya Date: Fri, 20 Oct 2017 10:50:49 +0300 Subject: [PATCH 101/195] Add Nathan Mkaya to Contributors list --- Contributors.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Contributors.md b/Contributors.md index 7899c8b2216..60fac0e6443 100644 --- a/Contributors.md +++ b/Contributors.md @@ -867,4 +867,4 @@ - [Trevor Roest](https://github.com/twroest) - [Sukeer](https://github.com/Sukeer) - [Rohit Mathew](https://github.com/rohitjmathew/) -- [Nathan Mkaya](https://githun.com/nathanmkaya/) +- [Nathan Mkaya](https://github.com/nathanmkaya/) From d599e0e310cb8380697824b861e8b52b356729dc Mon Sep 17 00:00:00 2001 From: JerryShen Date: Fri, 20 Oct 2017 16:41:15 +0800 Subject: [PATCH 102/195] Add awesomejerry to Contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 4d669882568..e00c5c49c0b 100644 --- a/Contributors.md +++ b/Contributors.md @@ -867,3 +867,4 @@ - [Trevor Roest](https://github.com/twroest) - [Sukeer](https://github.com/Sukeer) - [Rohit Mathew](https://github.com/rohitjmathew/) +- [awesomejerry](https://github.com/awesomejerry) From 4f72ec5e22225f985124bcdd9a54b98ce15563ce Mon Sep 17 00:00:00 2001 From: syamkumar Date: Fri, 20 Oct 2017 14:16:55 +0530 Subject: [PATCH 103/195] commit --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 4d669882568..a32c975ed55 100644 --- a/Contributors.md +++ b/Contributors.md @@ -867,3 +867,4 @@ - [Trevor Roest](https://github.com/twroest) - [Sukeer](https://github.com/Sukeer) - [Rohit Mathew](https://github.com/rohitjmathew/) +-[syamkumar](https://github.com/syam3526/) From 117cf148c63c8589fb59705ff37a25354269b1d3 Mon Sep 17 00:00:00 2001 From: Dumitru Date: Fri, 20 Oct 2017 13:07:09 +0300 Subject: [PATCH 104/195] Update Contributors.md --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 4d669882568..661971cea81 100644 --- a/Contributors.md +++ b/Contributors.md @@ -1,4 +1,5 @@ - [Rubén Ortiz](https://github.com/rubenortiz) +- [Petrov Dumitru](https://github.com/dp97) - [Saideep Dicholkar](https://github.com/saideepd) - [Oliver Miller](https://github.com/Oliver-H-Miller) - [Gabriel Cueto](https://github.com/TheMushrr00m) From 616293e16fe5ead0b269751a165b9122fb31b302 Mon Sep 17 00:00:00 2001 From: armaDio Date: Fri, 20 Oct 2017 12:28:31 +0200 Subject: [PATCH 105/195] Add Michele Armellini to contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 4d669882568..9c0da326c9d 100644 --- a/Contributors.md +++ b/Contributors.md @@ -867,3 +867,4 @@ - [Trevor Roest](https://github.com/twroest) - [Sukeer](https://github.com/Sukeer) - [Rohit Mathew](https://github.com/rohitjmathew/) +- [Michele Armellini] (https://github.com/armaDio) From 0134a31229d55e3fe4414fefd31f18eb89cf52cd Mon Sep 17 00:00:00 2001 From: Dumitru Date: Fri, 20 Oct 2017 13:58:07 +0300 Subject: [PATCH 106/195] Create README.ro.md --- translations/README.ro.md | 119 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 119 insertions(+) create mode 100644 translations/README.ro.md diff --git a/translations/README.ro.md b/translations/README.ro.md new file mode 100644 index 00000000000..bb5adb1b7b1 --- /dev/null +++ b/translations/README.ro.md @@ -0,0 +1,119 @@ +[![Open Source Love](https://badges.frapsoft.com/os/v1/open-source.svg?v=103)](https://github.com/ellerbrock/open-source-badges/) +[](https://firstcontributions.herokuapp.com) +[![License: MIT](https://img.shields.io/badge/License-MIT-green.svg)](https://opensource.org/licenses/MIT) + + +# Primele Contribuții + +Este greu. Este întotdeauna greu când faci ceva pentru prima dată. Mai ales când colaborezi. A face greșeli nu este un lucru confortabil. Dar cel mai important în open source este colaborarea și lucrul în echipă. Noi am vrut să simplificăm modul în care noii contribuabili în open source învață și contribuie pentru prima dată. + +Citirea articolelor și vizionarea tutorialelor poate ajuta, dar ce este mai bine decât să faci lucrurile fără a strica ceva? Acest proiect își propune să ofere îndrumare și simplificarea modului în care începătorii își fac prima contribuție. Amintește-ți: cu cât ești mai relaxat, cu atât mai bine înveți. Dacă dorești să faci prima ta contribuție, simplu urmați pașii de mai jos. Vă promit că va fi distractiv. + +#### *Citește în [alte limbi](LANGUAGES.md)* + +fork this repository + +Dacă nu ai git instalat, [ instalează-l ]( https://help.github.com/articles/set-up-git/ ). + +## Ramifică acest reopozitor(depozit) + + +Fork this repo by clicking on the fork button on the top of this page. +This will create a copy of this repository in your account. + +## Clone the repository + +clone this repository + +Now clone this repo to your machine. Click on the clone button and then click the *copy to clipboard* icon. + +Open a terminal and run the following git command: + +``` +git clone "url you just copied" +``` +where "url you just copied" (without the quote marks) is the url to this repository. See the previous steps to obtain the url. + +copy URL to clipboard + +For example: +``` +git clone https://github.com/this-is-you/first-contributions.git +``` +where `this-is-you` is your GitHub username. Here you're copying the contents of the first-contributions repository in GitHub to your computer. + +## Create a branch + +Change to the repository directory on your computer (if you are not already there): + +``` +cd first-contributions +``` +Now create a branch using the `git checkout` command: +``` +git checkout -b +``` + +For example: +``` +git checkout -b add-alonzo-church +``` +(The name of the branch does not need to have the word *add* in it, but it's a reasonable thing to include because the purpose of this branch is to add your name to a list.) + +## Make necessary changes and commit those changes + +Now open `Contributors.md` file in a text editor, add your name to it, and then save the file. If you go to the project directory and execute the command `git status`, you'll see there are changes. Add those changes to the branch you just created using the `git add` command: +``` +git add Contributors.md +``` + +Now commit those changes using the `git commit` command: +``` +git commit -m "Add to Contributors list" +``` +replacing `` with your name. + +## Push changes to GitHub + +Push your changes using the command `git push`: +``` +git push origin +``` +replacing `` with the name of the branch you created earlier. + +## Submit your changes for review + +If you go to your repository on GitHub, you'll see a `Compare & pull request` button. Click on that button. + +create a pull request + +Now submit the pull request. + +submit pull request + +Soon I'll be merging all your changes into the master branch of this project. You will get a notification email once the changes have been merged. + +## Where to go from here? + +Celebrate your contribution and share it with your friends and followers by going to [web app](https://roshanjossey.github.io/first-contributions/#social-share). + +You could join our slack team in case you need any help or have any questions. [Join slack team](https://firstcontributions.herokuapp.com). + +Now let's get you started with contributing to other projects. We've compiled a list of projects with easy issues you can get started on. Check out [the list of projects in web app](https://roshanjossey.github.io/first-contributions/#project-list). + +### [ Additional material ](additional-material/additional-material.md) + + +## Tutorials Using Other Tools + +|GitHub Desktop|Visual Studio 2017|GitKraken| +|---|---|---| +|[GitHub Desktop](github-desktop-tutorial.md)|[Visual Studio 2017](github-windows-vs2017-tutorial.md)|[GitKraken](gitkraken-tutorial.md)| + +## Self-Promotion + +If you liked this project, star it on [GitHub](https://github.com/Roshanjossey/first-contributions). +If you're feeling especially charitable, follow [Roshan](https://roshanjossey.github.io/) on +[Twitter](https://twitter.com/sudo__bangbang) and +[GitHub](https://github.com/roshanjossey). + From 812c1c61ce955acdf8399c6adffb3e90d1a61371 Mon Sep 17 00:00:00 2001 From: Renan Vichetti Date: Fri, 20 Oct 2017 09:52:20 -0200 Subject: [PATCH 107/195] Add Renan Vichetti to Contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index ca5473bd95d..e8b2483d8ee 100644 --- a/Contributors.md +++ b/Contributors.md @@ -872,3 +872,4 @@ - [syamkumar](https://github.com/syam3526/) - [awesomejerry](https://github.com/awesomejerry) - [Nathan Mkaya](https://github.com/nathanmkaya/) +- [Renan Vichetti](https://github.com/rvconessa/) \ No newline at end of file From a36db9abfe1aac886f225f12fb5fc6de39479cd6 Mon Sep 17 00:00:00 2001 From: Dumitru Date: Fri, 20 Oct 2017 14:58:14 +0300 Subject: [PATCH 108/195] Update README.ro.md full translated in romanian! --- translations/README.ro.md | 79 +++++++++++++++++++-------------------- 1 file changed, 39 insertions(+), 40 deletions(-) diff --git a/translations/README.ro.md b/translations/README.ro.md index bb5adb1b7b1..74a7370fd29 100644 --- a/translations/README.ro.md +++ b/translations/README.ro.md @@ -15,91 +15,90 @@ Citirea articolelor și vizionarea tutorialelor poate ajuta, dar ce este mai bin Dacă nu ai git instalat, [ instalează-l ]( https://help.github.com/articles/set-up-git/ ). -## Ramifică acest reopozitor(depozit) +## Ramifică reopozitoriul(depozit) +Ramifică acest repo(depozit) făcând clic pe butonul fork locat pe partea de sus a paginii. +Acesta va creea o copie a repozitoriului în contul tău. -Fork this repo by clicking on the fork button on the top of this page. -This will create a copy of this repository in your account. - -## Clone the repository +## Clonează repozitoriul(depozit) clone this repository -Now clone this repo to your machine. Click on the clone button and then click the *copy to clipboard* icon. +Acum clonează acest repo pe mașina ta. Fă clic pe butonul clone apoi clic pe *copiați în clipboard*. -Open a terminal and run the following git command: +Deschideți un terminal și executați următoarea comanda git: ``` -git clone "url you just copied" +git clone "adresa copiată" ``` -where "url you just copied" (without the quote marks) is the url to this repository. See the previous steps to obtain the url. +Unde "adresa copiată" (Fără de ghilimele) este adresa repozitorului. Vezi pașii anteriori pentru a obține adresa. copy URL to clipboard -For example: +De exemplu: ``` -git clone https://github.com/this-is-you/first-contributions.git +git clone https://github.com/acesta-ești-tu/prima-contribuție.git ``` -where `this-is-you` is your GitHub username. Here you're copying the contents of the first-contributions repository in GitHub to your computer. +Unde `acesta-ești-tu` este numele tău GitHub. Aici tu copii conținutul repozitorului GitHub "prima-contribuție" pe computerul tău. -## Create a branch +## Creează o Ramură -Change to the repository directory on your computer (if you are not already there): +Schimbați directorul în repozitoriu pe computer (dacă nu sunteți deja acolo): ``` -cd first-contributions +cd prima-contribuție ``` -Now create a branch using the `git checkout` command: +Acum creați o ramură cu ajutorul comenzii `git checkout`: ``` -git checkout -b +git checkout -b ``` -For example: +De exemplu: ``` -git checkout -b add-alonzo-church +git checkout -b adaug-alonzo-church ``` -(The name of the branch does not need to have the word *add* in it, but it's a reasonable thing to include because the purpose of this branch is to add your name to a list.) +(Numele ramurii nu e obligatoriu să fie *adaug*, dar e un lucru rezonabil pentru a include deoarece scopul acestei ramure este de a adăuga numele tău în lista!) -## Make necessary changes and commit those changes +## Fă schimbările necesare si comite aceste schimbări -Now open `Contributors.md` file in a text editor, add your name to it, and then save the file. If you go to the project directory and execute the command `git status`, you'll see there are changes. Add those changes to the branch you just created using the `git add` command: +Acum deschide fișierul `Contributors.md` într-un editor de text (ca NotePad, Vim, nano, emacs, etc.), adaugă numele tău în el, apoi salvează fișierul. Dacă accesezi directorul de proiect și execuți comanda `git status`, vei vedea schimbări. Adaugă acele schimbări la ramura creată de tine cu comanda `git add`: ``` git add Contributors.md ``` -Now commit those changes using the `git commit` command: +Acum comite acele schimbări cu comanda `git commit`: ``` -git commit -m "Add to Contributors list" +git commit -m "Adaug la lista de contribuitori" ``` -replacing `` with your name. +Schimbând `` cu numele tău. -## Push changes to GitHub +## Împinge Schimbările pe GitHub -Push your changes using the command `git push`: +Împinge schimbările tale cu comanda `git push`: ``` -git push origin +git push origin ``` -replacing `` with the name of the branch you created earlier. +Schimbând `` cu numele ramurii create de tine anterior. -## Submit your changes for review +## Trimite modificările pentru examinare -If you go to your repository on GitHub, you'll see a `Compare & pull request` button. Click on that button. +Dacă pleci la repozitoriul tău de pe GitHub, vei vedea butonul `Compare & pull request`(Compară & trage cererea). Fă clic pe el. create a pull request -Now submit the pull request. +Acum Trimiteți solicitarea de tragere. submit pull request -Soon I'll be merging all your changes into the master branch of this project. You will get a notification email once the changes have been merged. +Curând Eu voi îmbina toate schimbările în ramura principală a acestui proiect. Veți primi un e-mail de notificare odată ce schimbările au fost fuzionate. -## Where to go from here? +## De unde să mergi de aici? -Celebrate your contribution and share it with your friends and followers by going to [web app](https://roshanjossey.github.io/first-contributions/#social-share). +Sărbătați-vă contribuția și împărtășiți-o cu prietenii și adepții dvs. accesând [aplicația web] (https://roshanjossey.github.io/first-contributions/#social-share). -You could join our slack team in case you need any help or have any questions. [Join slack team](https://firstcontributions.herokuapp.com). +Ați putea să vă alăturați echipei noastre în cazul în care aveți nevoie de ajutor sau aveți întrebări. [Alaturăte echipei Slack](https://firstcontributions.herokuapp.com). -Now let's get you started with contributing to other projects. We've compiled a list of projects with easy issues you can get started on. Check out [the list of projects in web app](https://roshanjossey.github.io/first-contributions/#project-list). +Acum, să începem să contribuiți la alte proiecte. Am compilat o listă de proiecte cu probleme ușoare pe care le puteți începe. Verifică [lista de proiecte in aplicația web](https://roshanjossey.github.io/first-contributions/#project-list). ### [ Additional material ](additional-material/additional-material.md) @@ -112,8 +111,8 @@ Now let's get you started with contributing to other projects. We've compiled a ## Self-Promotion -If you liked this project, star it on [GitHub](https://github.com/Roshanjossey/first-contributions). -If you're feeling especially charitable, follow [Roshan](https://roshanjossey.github.io/) on -[Twitter](https://twitter.com/sudo__bangbang) and +Dacă ți-a plăcut acest proiect, pune-i o stea pe [GitHub](https://github.com/Roshanjossey/first-contributions). +Dacă vă simțiți deosebit de caritabili, urmați-mă [Roshan](https://roshanjossey.github.io/) pe +[Twitter](https://twitter.com/sudo__bangbang) și [GitHub](https://github.com/roshanjossey). From 6e119b5f6028713691aa10d0f32154b8f4bc20aa Mon Sep 17 00:00:00 2001 From: Dumitru Date: Fri, 20 Oct 2017 15:10:40 +0300 Subject: [PATCH 109/195] Update LANGUAGES.md --- LANGUAGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/LANGUAGES.md b/LANGUAGES.md index e1b49776fa4..ccbf8e8fc1a 100644 --- a/LANGUAGES.md +++ b/LANGUAGES.md @@ -24,5 +24,6 @@ | 🇹🇭 Thailand | [ภาษาไทย](translations/README.th.md) | | 🏴󠁥󠁳󠁧󠁡󠁿 Galicia | [Galician](translations/README.gl.md) | | 🇵🇰 Pakistan | [Urdu](translations/README.ur.md) | +| Moldova | [Romanian](translation/README.ro.md)| From 4c551a5b22343ea3e8846730b742a29546d69d78 Mon Sep 17 00:00:00 2001 From: AdamA Date: Fri, 20 Oct 2017 14:10:57 +0200 Subject: [PATCH 110/195] Add cek-cek to Contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index ca5473bd95d..03eb7af2a24 100644 --- a/Contributors.md +++ b/Contributors.md @@ -872,3 +872,4 @@ - [syamkumar](https://github.com/syam3526/) - [awesomejerry](https://github.com/awesomejerry) - [Nathan Mkaya](https://github.com/nathanmkaya/) +- [cek-cek](https://github.com/cek-cek) From 39eaed7cb785f9d6438abccbcc590dbfbba19601 Mon Sep 17 00:00:00 2001 From: Akkshay Lawrence Date: Fri, 20 Oct 2017 17:50:52 +0530 Subject: [PATCH 111/195] Add Akkshay Lawrence to Contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index ca5473bd95d..090a6c2ecb8 100644 --- a/Contributors.md +++ b/Contributors.md @@ -872,3 +872,4 @@ - [syamkumar](https://github.com/syam3526/) - [awesomejerry](https://github.com/awesomejerry) - [Nathan Mkaya](https://github.com/nathanmkaya/) +- [Akkshay Lawrence](https://github.com/akkshaylawrence) From e1415be00a1766538a58a38ebb443de3252a906b Mon Sep 17 00:00:00 2001 From: Abbott Date: Fri, 20 Oct 2017 07:44:49 -0500 Subject: [PATCH 112/195] Add Justin Abbott to Contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index ca5473bd95d..3f99623bff8 100644 --- a/Contributors.md +++ b/Contributors.md @@ -872,3 +872,4 @@ - [syamkumar](https://github.com/syam3526/) - [awesomejerry](https://github.com/awesomejerry) - [Nathan Mkaya](https://github.com/nathanmkaya/) +- [Justin Abbott](https://github.com/justinabbott) From aca07e076dd4d5ca024d4bc25a816f1f6b91546c Mon Sep 17 00:00:00 2001 From: mamai Date: Fri, 20 Oct 2017 09:13:43 -0400 Subject: [PATCH 113/195] Fixed typos in french translation. --- translations/README.fr.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/translations/README.fr.md b/translations/README.fr.md index 7cc9ce9da2d..467f47fd8c1 100644 --- a/translations/README.fr.md +++ b/translations/README.fr.md @@ -55,11 +55,11 @@ Par exemple: ``` git checkout -b add-koffi-sani ``` -(Le nom de la branch n'a pas besoin de contenir le terme *add*, mais c'est raisonnable de l'inclure parce que l'objectif de cette branche est d'ajouter votre nom à une liste.) +(Le nom de la branche n'a pas besoin de contenir le terme *add*, mais c'est raisonnable de l'inclure parce que l'objectif de cette branche est d'ajouter votre nom à une liste.) ## Effectuez les modifications nécessaires et engagez-les -Maintenant, ouvrez le fichier `Contributors.md` dans un éditeur de texte, ajoutez-y votre nom, et enrégistrez-le. Si vous ouvrez l'invite de commande et vous exécutez la commande `git status`, vous verrez qu'il y a des modifications. Ajoutez ces modifications à la branche que vous venez de créer avec la commande `git add` : +Maintenant, ouvrez le fichier `Contributors.md` dans un éditeur de texte, ajoutez-y votre nom, et enregistrez-le. Si vous ouvrez l'invite de commande et vous exécutez la commande `git status`, vous verrez qu'il y a des modifications. Ajoutez ces modifications à la branche que vous venez de créer avec la commande `git add` : ``` git add Contributors.md ``` @@ -137,7 +137,7 @@ Ceci n'est pas nécessaire, mais le nom de la branche montre que son objectif es ## Où aller ensuite ? -Vous pouvez aussi rejoindre notre équipe sur Slack au cas où vous avec besoin d'aide ou avez des questions. [Rejoindre l'équipe sur Slack](https://firstcontributions.herokuapp.com) +Vous pouvez aussi rejoindre notre équipe sur Slack au cas où vous auriez besoin d'aide ou auriez des questions. [Rejoindre l'équipe sur Slack](https://firstcontributions.herokuapp.com) Voici pour un débutant quelques problèmes que vous pourrez résoudre dans des répertoires populaires. Allez, visitez ces répertoires afin d'en apprendre davantage. From e64aff862455bb0c857432d1ad0d779033eff7e7 Mon Sep 17 00:00:00 2001 From: Rahat Date: Fri, 20 Oct 2017 13:22:49 +0000 Subject: [PATCH 114/195] Add Rahat to Contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index ca5473bd95d..82f0033407c 100644 --- a/Contributors.md +++ b/Contributors.md @@ -872,3 +872,4 @@ - [syamkumar](https://github.com/syam3526/) - [awesomejerry](https://github.com/awesomejerry) - [Nathan Mkaya](https://github.com/nathanmkaya/) +- [Rahat](https://github.com/MAHRahat) From 68c749d6133aabe4cfb947273ffacd1415ac8efe Mon Sep 17 00:00:00 2001 From: Dumitru Date: Fri, 20 Oct 2017 16:46:00 +0300 Subject: [PATCH 115/195] Update LANGUAGES.md --- LANGUAGES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LANGUAGES.md b/LANGUAGES.md index ccbf8e8fc1a..b8bf60e62d9 100644 --- a/LANGUAGES.md +++ b/LANGUAGES.md @@ -24,6 +24,6 @@ | 🇹🇭 Thailand | [ภาษาไทย](translations/README.th.md) | | 🏴󠁥󠁳󠁧󠁡󠁿 Galicia | [Galician](translations/README.gl.md) | | 🇵🇰 Pakistan | [Urdu](translations/README.ur.md) | -| Moldova | [Romanian](translation/README.ro.md)| +| :moldova: Moldova, :romania: Romania | [Romanian](translation/README.ro.md)| From d625dfaf7ecf0a55c4e6575d56963666f33923e3 Mon Sep 17 00:00:00 2001 From: Rahat Date: Fri, 20 Oct 2017 13:46:19 +0000 Subject: [PATCH 116/195] Add Bangla translation --- LANGUAGES.md | 1 + translations/README.bn.md | 118 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 119 insertions(+) create mode 100644 translations/README.bn.md diff --git a/LANGUAGES.md b/LANGUAGES.md index e1b49776fa4..8acab946b47 100644 --- a/LANGUAGES.md +++ b/LANGUAGES.md @@ -24,5 +24,6 @@ | 🇹🇭 Thailand | [ภาษาไทย](translations/README.th.md) | | 🏴󠁥󠁳󠁧󠁡󠁿 Galicia | [Galician](translations/README.gl.md) | | 🇵🇰 Pakistan | [Urdu](translations/README.ur.md) | +| :bangladesh: Bangladesh | [Bangla](translations/README.bn.md) | diff --git a/translations/README.bn.md b/translations/README.bn.md new file mode 100644 index 00000000000..bcdfe6705cb --- /dev/null +++ b/translations/README.bn.md @@ -0,0 +1,118 @@ +[![Open Source Love](https://badges.frapsoft.com/os/v1/open-source.svg?v=103)](https://github.com/ellerbrock/open-source-badges/) +[](https://firstcontributions.herokuapp.com) +[![License: MIT](https://img.shields.io/badge/License-MIT-green.svg)](https://opensource.org/licenses/MIT) + + +# প্রথম অবদান + +প্রথমবারের মত কোন কাজ করতে গেলে তা কঠিন বলেই মনে হবে। আর আপনি যদি অন্যদের কাজে সহযোগিতা করেন, তাহলে ভুলভ্রান্তিগুলো অত্যন্ত বিব্রতকর। অথচ 'ওপেন সোর্স'-এর মূল বিষয়টিই হচ্ছে পারস্পরিক সহযোগিতা ও একত্রে কাজ করা। আমরা চাই ওপেন সোর্সে অবদান রাখতে ইচ্ছুক নবীনরা যেন সহজেই শিখতে পারে এবং প্রথমবারের মত তাদের অবদান রাখতে পারে। + +প্রবন্ধ পড়ে এবং টিউটোরিয়াল দেখে অনেক কিছুই শেখা যায়, কিন্তু ব্যবহারিক পদ্ধতিতে কাজ করার চেয়ে ভালো কিছু হতে পারে না। এই প্রজেক্টের লক্ষ্য হচ্ছে নবীনদের দিকনির্দেশনা দেওয়া আর সেই সাথে তাদের প্রথম অবদান রাখার কাজটি সহজ করে তোলা। আপনি যদি ওপেন সোর্সে আপনার প্রথম অবদান রাখতে চান, তাহলে নিচের সহজ ধাপগুলো অনুসরণ করুন। কথা দিচ্ছি, এই প্রক্রিয়াটি অত্যন্ত মজার ও অানন্দদায়ক। + +#### *এই লেখাটি [অন্য ভাষা](LANGUAGES.md)য় পড়ুন* + +fork this repository + +আপনার কম্পিউটারে গিট না থাকলে, [ ইনস্টল করুন ]( https://help.github.com/articles/set-up-git/ )। + +## এই রিপোজিটরি ফর্ক করুন + +এই পৃষ্ঠার উপরের অংশে ফর্ক (fork) বাটনে ক্লিক করে এই রিপোজিটরি ফর্ক করুন। +এই প্রক্রিয়ায় আপনার অ্যাকাউন্টে এই রিপোজিটরির একটি কপি তৈরি হবে। + +## রিপোজিটরি ক্লোন করুন + +clone this repository + +এখন এই রিপোটি আপনার কম্পিউটারে ক্লোন করুন। এজন্যে প্রথমে ক্লোন(Clone) বাটনে ক্লিক করুন। এরপর ক্লিক করুন *ক্লিপবোর্ডে কপি করুন(copy to clipboard)* আইকনটিতে। + +টার্মিনাল চালু করুন এবং নিচের কমান্ড রান করুন: + +``` +git clone "url you just copied" +``` +যেখানে "url you just copied" (উদ্ধৃতি চিহ্ণ ব্যতীত) হচ্ছে এই রিপোজিটরির ইউআরএল যা আপনি পূর্বের ধাপেই পেয়েছেন। + +copy URL to clipboard + +উদাহরণ: +``` +git clone https://github.com/this-is-you/first-contributions.git +``` +এখানে `this-is-you` হচ্ছে আপনার গিটহাব ইউজারনেম। এই কমান্ডটির মাধ্যমে গিটহাবে অবস্থিত first-contributions রিপোজিটরির একটি কপি তৈরি হচ্ছে আপনার কম্পিউটারে। + +## একটি ব্রাঞ্চ তৈরি করুন + +আপনার কম্পিউটারে রিপোজিটরির ডিরেক্টরিতে যান (যদি এখনো অন্য ডিরেক্টরিতে থাকেন): + +``` +cd first-contributions +``` +এখন `git checkout` কমান্ডের মাধ্যমে একটি ব্রাঞ্চ তৈরি করুন: +``` +git checkout -b +``` + +উদাহরণ: +``` +git checkout -b add-alonzo-church +``` +(ব্রাঞ্চের নামে *add* শব্দটি যুক্ত থাকা জরুরী নয়। তবে এই ব্রাঞ্চের উদ্দেশ্য যেহেতু আপনার নাম তালিকাভুক্ত করা, সেহেতু *add* শব্দটি যুক্ত থাকাই কাম্য।) + +## প্রয়োজনীয় পরিবর্তন করুন ও পরিবর্তনগুলো কমিট করুন + +এখন যে কোন টেক্সট এডিটরে `Contributors.md` ফাইলটি খুলুন, এতে আপনার নাম যুক্ত করুন, অতঃপর ফাইলটি সেভ করুন। এবার প্রজেক্ট ডিরেক্টরি থেকে `git status` কমান্ড রান করলে আপনি পরিবর্তনগুলো দেখতে পাবেন। `git add` কমান্ড দ্বারা এই পরিবর্তনগুলো আপনার তৈরি ব্রাঞ্চে যুক্ত করুন: +``` +git add Contributors.md +``` + +এরপর `git commit` কমান্ড ব্যবহার করে এই পরিবর্তনগুলো কমিট করুন: +``` +git commit -m "Add to Contributors list" +``` +``-এর বদলে আপনার নাম লিখতে ভুলবেন না। + +## পরিবর্তনগুলো গিটহাবে পুশ করা + +`git push` কমান্ড ব্যবহার করে পরিবর্তনগুলো পুশ করুন: +``` +git push origin +``` +এক্ষেত্রে ``-এর বদলে পূর্বে আপনার তৈরি ব্রাঞ্চের নাম লিখুন। + +## রিভিউয়ের জন্য আপনার পরিবর্তনগুলো জমা দিন + +আপনার গিটহাব রিপোজিটরিতে `Compare & pull request` বাটনে ক্লিক করুন। + +create a pull request + +এখন *পুল রিকোয়েস্ট* সাবমিট করুন। + +submit pull request + +আমি যথা শীঘ্র সম্ভব আপনার পরিবর্তনগুলো এই প্রজেক্টের মাস্টার ব্রাঞ্চে মার্জ করব। মার্জ করা সম্পন্ন হলে আপনি একটি নিশ্চিতকরণ ই-মেইল পাবেন। + +## এরপর কী করব? + +আপনার অবদানের আনন্দ উপভোগ করুন এবং [ওয়েব অ্যাপ](https://roshanjossey.github.io/first-contributions/#social-share)-এর মাধ্যমে বন্ধু ও অনুসরণকারীদের সাথে শেয়ার করুন। + +কোন সহায়তার প্রয়োজন হলে বা আপনার কোন প্রশ্ন থাকলে আপনি আমাদের স্ল্যাক টিমে যুক্ত হতে পারেন। [স্ল্যাক টিমে যোগ দিন](https://firstcontributions.herokuapp.com) + +এখন আপনি অন্যান্য প্রজেক্টগুলোতেও অবদান রাখতে পারেন। আপনার সুবিধার্থে আমরা সহজ সমস্যা সম্বলিত প্রজেক্টগুলোর একটি তালিকা তৈরি করেছি। ওয়েব অ্যাপে [প্রজেক্টগুলোর তালিকা](https://roshanjossey.github.io/first-contributions/#project-list) দেখুন। + +### [ অতিরিক্ত উপাদানসমূহ ](additional-material/additional-material.md) + + +## অন্যান্য টুল ব্যবহারের টিউটোরিয়াল + +|GitHub Desktop|Visual Studio 2017|GitKraken| +|---|---|---| +|[গিটহাব ডেস্কটপ](github-desktop-tutorial.md)|[ভিজুয়াল স্টুডিও ২০১৭](github-windows-vs2017-tutorial.md)|[গিটক্র্যাকেন](gitkraken-tutorial.md)| + +## সেলফ-প্রমোশন + +এই প্রজেক্টটি পছন্দ হলে [গিটহাবে](https://github.com/Roshanjossey/first-contributions) তারকাচিহ্নিত(star) করুন। +এছাড়া আপনি [Roshan](https://roshanjossey.github.io/) কে ফলো করতে পারেন +[টুইটার](https://twitter.com/sudo__bangbang) এবং +[গিটহাব](https://github.com/roshanjossey)-এ। + From 8473b60ffc1ba4caf751ccd183237655486d01ae Mon Sep 17 00:00:00 2001 From: Dumitru Date: Fri, 20 Oct 2017 16:47:37 +0300 Subject: [PATCH 117/195] Update LANGUAGES.md --- LANGUAGES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LANGUAGES.md b/LANGUAGES.md index b8bf60e62d9..ae28551d9f8 100644 --- a/LANGUAGES.md +++ b/LANGUAGES.md @@ -24,6 +24,6 @@ | 🇹🇭 Thailand | [ภาษาไทย](translations/README.th.md) | | 🏴󠁥󠁳󠁧󠁡󠁿 Galicia | [Galician](translations/README.gl.md) | | 🇵🇰 Pakistan | [Urdu](translations/README.ur.md) | -| :moldova: Moldova, :romania: Romania | [Romanian](translation/README.ro.md)| +| https://assets-cdn.github.com/images/icons/emoji/unicode/1f1f7-1f1f4.png Moldova, :romania: Romania | [Romanian](translation/README.ro.md)| From bc0788801af27abfe865355646a3bc109587f59c Mon Sep 17 00:00:00 2001 From: Dumitru Date: Fri, 20 Oct 2017 16:50:11 +0300 Subject: [PATCH 118/195] Revert "Update LANGUAGES.md" --- LANGUAGES.md | 1 - 1 file changed, 1 deletion(-) diff --git a/LANGUAGES.md b/LANGUAGES.md index ae28551d9f8..e1b49776fa4 100644 --- a/LANGUAGES.md +++ b/LANGUAGES.md @@ -24,6 +24,5 @@ | 🇹🇭 Thailand | [ภาษาไทย](translations/README.th.md) | | 🏴󠁥󠁳󠁧󠁡󠁿 Galicia | [Galician](translations/README.gl.md) | | 🇵🇰 Pakistan | [Urdu](translations/README.ur.md) | -| https://assets-cdn.github.com/images/icons/emoji/unicode/1f1f7-1f1f4.png Moldova, :romania: Romania | [Romanian](translation/README.ro.md)| From 0212045c65906b2b183e8e6ac7a2f76c72759269 Mon Sep 17 00:00:00 2001 From: Dumitru Date: Fri, 20 Oct 2017 16:51:30 +0300 Subject: [PATCH 119/195] Update LANGUAGES.md )))) --- LANGUAGES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LANGUAGES.md b/LANGUAGES.md index e1b49776fa4..673dd897daa 100644 --- a/LANGUAGES.md +++ b/LANGUAGES.md @@ -24,5 +24,5 @@ | 🇹🇭 Thailand | [ภาษาไทย](translations/README.th.md) | | 🏴󠁥󠁳󠁧󠁡󠁿 Galicia | [Galician](translations/README.gl.md) | | 🇵🇰 Pakistan | [Urdu](translations/README.ur.md) | - +| :moldova: Moldova, :romania: Romania | [Romanian](translation/README.ro.md)| From 78a10780f8104e9e5d20cae635d3919e8520ad71 Mon Sep 17 00:00:00 2001 From: Dumitru Date: Fri, 20 Oct 2017 16:56:51 +0300 Subject: [PATCH 120/195] Update README.ro.md Little grammar correction and path of images corrected. --- translations/README.ro.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/translations/README.ro.md b/translations/README.ro.md index 74a7370fd29..26489ab3a61 100644 --- a/translations/README.ro.md +++ b/translations/README.ro.md @@ -11,18 +11,18 @@ Citirea articolelor și vizionarea tutorialelor poate ajuta, dar ce este mai bin #### *Citește în [alte limbi](LANGUAGES.md)* -fork this repository +fork this repository Dacă nu ai git instalat, [ instalează-l ]( https://help.github.com/articles/set-up-git/ ). -## Ramifică reopozitoriul(depozit) +## Ramifică repozitoriul(depozit) Ramifică acest repo(depozit) făcând clic pe butonul fork locat pe partea de sus a paginii. Acesta va creea o copie a repozitoriului în contul tău. ## Clonează repozitoriul(depozit) -clone this repository +clone this repository Acum clonează acest repo pe mașina ta. Fă clic pe butonul clone apoi clic pe *copiați în clipboard*. @@ -33,7 +33,7 @@ git clone "adresa copiată" ``` Unde "adresa copiată" (Fără de ghilimele) este adresa repozitorului. Vezi pașii anteriori pentru a obține adresa. -copy URL to clipboard +copy URL to clipboard De exemplu: ``` @@ -84,11 +84,11 @@ Schimbând `` cu numele ramurii create de tine anterior. Dacă pleci la repozitoriul tău de pe GitHub, vei vedea butonul `Compare & pull request`(Compară & trage cererea). Fă clic pe el. -create a pull request +create a pull request Acum Trimiteți solicitarea de tragere. -submit pull request +submit pull request Curând Eu voi îmbina toate schimbările în ramura principală a acestui proiect. Veți primi un e-mail de notificare odată ce schimbările au fost fuzionate. From 60518745a5e5ba5f7429a5bb0dbfe909dcdaf661 Mon Sep 17 00:00:00 2001 From: Dumitru Date: Fri, 20 Oct 2017 17:01:21 +0300 Subject: [PATCH 121/195] Revert "Revert "Update LANGUAGES.md"" --- LANGUAGES.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/LANGUAGES.md b/LANGUAGES.md index 673dd897daa..ae28551d9f8 100644 --- a/LANGUAGES.md +++ b/LANGUAGES.md @@ -24,5 +24,6 @@ | 🇹🇭 Thailand | [ภาษาไทย](translations/README.th.md) | | 🏴󠁥󠁳󠁧󠁡󠁿 Galicia | [Galician](translations/README.gl.md) | | 🇵🇰 Pakistan | [Urdu](translations/README.ur.md) | -| :moldova: Moldova, :romania: Romania | [Romanian](translation/README.ro.md)| +| https://assets-cdn.github.com/images/icons/emoji/unicode/1f1f7-1f1f4.png Moldova, :romania: Romania | [Romanian](translation/README.ro.md)| + From 3a71c5f0d9569823b202b51a6e976f85b5f43aa5 Mon Sep 17 00:00:00 2001 From: Dumitru Date: Fri, 20 Oct 2017 17:02:25 +0300 Subject: [PATCH 122/195] Update LANGUAGES.md phew --- LANGUAGES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LANGUAGES.md b/LANGUAGES.md index ae28551d9f8..b62ede6fba8 100644 --- a/LANGUAGES.md +++ b/LANGUAGES.md @@ -24,6 +24,6 @@ | 🇹🇭 Thailand | [ภาษาไทย](translations/README.th.md) | | 🏴󠁥󠁳󠁧󠁡󠁿 Galicia | [Galician](translations/README.gl.md) | | 🇵🇰 Pakistan | [Urdu](translations/README.ur.md) | -| https://assets-cdn.github.com/images/icons/emoji/unicode/1f1f7-1f1f4.png Moldova, :romania: Romania | [Romanian](translation/README.ro.md)| +| :moldova: Moldova, :romania: Romania | [Romanian](translations/README.ro.md)| From 99b70a9e8099a401945496e8c37119025b809cb0 Mon Sep 17 00:00:00 2001 From: Dumitru Date: Fri, 20 Oct 2017 17:06:50 +0300 Subject: [PATCH 123/195] Update README.ro.md link problem solved. --- translations/README.ro.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/README.ro.md b/translations/README.ro.md index 26489ab3a61..3587bbf10fc 100644 --- a/translations/README.ro.md +++ b/translations/README.ro.md @@ -94,7 +94,7 @@ Curând Eu voi îmbina toate schimbările în ramura principală a acestui proie ## De unde să mergi de aici? -Sărbătați-vă contribuția și împărtășiți-o cu prietenii și adepții dvs. accesând [aplicația web] (https://roshanjossey.github.io/first-contributions/#social-share). +Sărbătați-vă contribuția și împărtășiți-o cu prietenii și adepții dvs. accesând [aplicația web](https://roshanjossey.github.io/first-contributions/#social-share). Ați putea să vă alăturați echipei noastre în cazul în care aveți nevoie de ajutor sau aveți întrebări. [Alaturăte echipei Slack](https://firstcontributions.herokuapp.com). From e718ebb265f7c58ee80ba090f229e44a0798d682 Mon Sep 17 00:00:00 2001 From: MikeWLloyd Date: Fri, 20 Oct 2017 10:17:32 -0400 Subject: [PATCH 124/195] Add MikeWLloyd to Contributors list --- Contributors.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Contributors.md b/Contributors.md index 8eeea58e603..5cb96f15321 100644 --- a/Contributors.md +++ b/Contributors.md @@ -1,4 +1,4 @@ -- [Rubén Ortiz](https://github.com/rubenortiz) +- [Rubén Ortiz](https://github.com/rubenortiz) - [Petrov Dumitru](https://github.com/dp97) - [Saideep Dicholkar](https://github.com/saideepd) - [Oliver Miller](https://github.com/Oliver-H-Miller) @@ -877,3 +877,4 @@ - [Akkshay Lawrence](https://github.com/akkshaylawrence) - [cek-cek](https://github.com/cek-cek) - [Renan Vichetti](https://github.com/rvconessa/) +- [MikeWLloyd](https://github.com/MikeWLloyd) From ea48a815c812f782b801233c77920c8025f95eb5 Mon Sep 17 00:00:00 2001 From: Gagan Date: Fri, 20 Oct 2017 19:49:47 +0530 Subject: [PATCH 125/195] Add gagan-deep-singh to Contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 8eeea58e603..22941733b31 100644 --- a/Contributors.md +++ b/Contributors.md @@ -877,3 +877,4 @@ - [Akkshay Lawrence](https://github.com/akkshaylawrence) - [cek-cek](https://github.com/cek-cek) - [Renan Vichetti](https://github.com/rvconessa/) +- [GaganDeep Singh](https://github.com/SGagan) From 7a0a8ba7e6faa5b5ef75eb817fbac0810b006324 Mon Sep 17 00:00:00 2001 From: akanijade <32926230+akanijade@users.noreply.github.com> Date: Fri, 20 Oct 2017 21:36:56 +0700 Subject: [PATCH 126/195] Update Contributors.md --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 545fbd00bca..d87a1f9e5f8 100644 --- a/Contributors.md +++ b/Contributors.md @@ -879,3 +879,4 @@ - [Renan Vichetti](https://github.com/rvconessa/) - [GaganDeep Singh](https://github.com/SGagan) - [MikeWLloyd](https://github.com/MikeWLloyd) +- [Akani](https://github.com/akanijade) From 95891ff505977e9a2abc2b29210182527c1bbafc Mon Sep 17 00:00:00 2001 From: shreyanshdwivedi Date: Fri, 20 Oct 2017 20:23:17 +0530 Subject: [PATCH 127/195] Add Shreyansh Dwivedi to contributor list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 545fbd00bca..5cc703c876e 100644 --- a/Contributors.md +++ b/Contributors.md @@ -879,3 +879,4 @@ - [Renan Vichetti](https://github.com/rvconessa/) - [GaganDeep Singh](https://github.com/SGagan) - [MikeWLloyd](https://github.com/MikeWLloyd) +- [Shreyansh Dwivedi](https://github.com/shreyanshdwivedi) From d3dd78864731901ba91029ab747752cd0995f325 Mon Sep 17 00:00:00 2001 From: plemomay <32961748+plemomay@users.noreply.github.com> Date: Fri, 20 Oct 2017 21:57:46 +0700 Subject: [PATCH 128/195] Add my name to Contributors.md --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 545fbd00bca..cce0f851162 100644 --- a/Contributors.md +++ b/Contributors.md @@ -879,3 +879,4 @@ - [Renan Vichetti](https://github.com/rvconessa/) - [GaganDeep Singh](https://github.com/SGagan) - [MikeWLloyd](https://github.com/MikeWLloyd) +- [Ple](https://github.com/plemomay) From 4cb06b7d1d89fd1ad4cf4f806a35cac3f7818dbf Mon Sep 17 00:00:00 2001 From: Jaeyeong Baek Date: Fri, 20 Oct 2017 23:59:09 +0900 Subject: [PATCH 129/195] Translate the rest of this post TODO: translate inline links --- .../translations/additional-material.ko.md | 34 ++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/additional-material/translations/additional-material.ko.md b/additional-material/translations/additional-material.ko.md index 872497064c3..0348b2ad388 100644 --- a/additional-material/translations/additional-material.ko.md +++ b/additional-material/translations/additional-material.ko.md @@ -8,4 +8,36 @@ ### [ 여러분이 포크한 저장소와 싱크상태 유지하기 ](keeping-your-fork-synced-with-this-repository.ko.md) 이 문서는 포크 된 저장소를 기본 저장소로 최신 상태로 유지하는 방법에 대한 정보를 제공합니다. 여러분과 다른 많은 사람들이 프로젝트에 기여하기를 바랍니다. -> 포크 된 상위 저장소가 변경되지 않은 경우 다음 단계를 수행하십시오. \ No newline at end of file +> 포크 된 상위 저장소가 변경되지 않은 경우 다음 단계를 수행하십시오. + +### [ 커밋 되돌리기 ](../undoing-a-commit.md) +이 문서는 원격 저장소에서 커밋을 되돌리는 방법에 대한 정보를 제공합니다. 이미 Github에 푸시 된 커밋을 되돌리려는 경우 유용합니다. +> 커밋을 되돌리려면 이 단계를 수행하십시오. + +### [ 커밋 수정하기 ](../amending-a-commit.md) +이 문서는 원격 저장소에서 커밋을 수정하는 방법에 대한 정보를 제공합니다. +> 당신이 만든 커밋을 수정해야 할 때 사용하십시오. + +### [ 로컬 커밋 되돌리기 ](../undoing-a-commit.md) +이 문서는 로컬 저장소에서 커밋을 실행 취소하는 방법에 대한 정보를 제공합니다. 로컬 저장소가 엉망이라고 느껴 당신이 로컬 저장소를 리셋하고자 할 때 당신이 해야 할 일입니다. +> 로컬 커밋을 취소하려면 이 단계를 수행하십시오. + +### [ 병합 충돌 해결하기 ](../resolving-merge-conflicts.md) +이 문서는 병합 충돌을 해결하는 방법에 대한 정보를 제공합니다. +> 이 단계를 수행하여 곤란한 병합 충돌을 해결하십시오. + +### [ 커밋을 다른 브랜치로 이동하기 ](../moving-a-commit-to-a-different-branch.md) +이 문서는 커밋을 다른 브랜치로 이동하는 방법에 대한 정보를 제공합니다. +> 이 단계를 수행하여 커밋을 다른 브랜치로 이동하십시오. + +### [ git 설정하기 ](../configuring-git.md) +이 문서는 git에서 사용자 정보 및 기타 옵션을 구성하는 방법에 대한 정보를 제공합니다. +> git 설정을 더 잘 다루려면 이 단계를 수행하십시오. + +### [ 유용한 링크 ](../Useful-links-for-further-learning.md) +이 문서는 모든 블로그 게시물, 유용한 사이트, 유용한 정보 및 웹 사이트에 대한 내용을 담고 있습니다. 우리가 모든 필요를 위해 참조하는 것은 초심자 또는 전문가 일 것입니다. 이 페이지는 오픈 소스 도메인을 처음 접하거나 더 많은 것을 배우고자 하는 사람들을 돕는 지표 역할을 해야 합니다. + +### [ 스쿼시 커밋하기 ](../squashing-commits.md) +이 문서는 대화형 리베이스로 커밋을 스쿼시하는 방법에 대한 정보를 제공합니다. +> 오픈 소스 프로젝트에서 PR을 보낼 때 리뷰어가 모든 커밋을 하나로 스쿼시하도록 요청하는 경우 유익한 커밋 메시지와 함께 이것을 사용하십시오. + From 0c8c02ebc41ae6f26cdee1d7c01f1cba0e865b36 Mon Sep 17 00:00:00 2001 From: Sangeetha Sasikumar Date: Fri, 20 Oct 2017 11:04:08 -0400 Subject: [PATCH 130/195] Update Contributors.md --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 545fbd00bca..0e7792ef57b 100644 --- a/Contributors.md +++ b/Contributors.md @@ -879,3 +879,4 @@ - [Renan Vichetti](https://github.com/rvconessa/) - [GaganDeep Singh](https://github.com/SGagan) - [MikeWLloyd](https://github.com/MikeWLloyd) +- [Sangeetha Sasikumar] (https://github.com/Sangeetha-007) From 9bf00e3f7637b76c92f15621e41737c89d73a2f1 Mon Sep 17 00:00:00 2001 From: Dilan Nilaksha Date: Fri, 20 Oct 2017 20:39:22 +0530 Subject: [PATCH 131/195] Update Contributors.md --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 545fbd00bca..ba24e25bd22 100644 --- a/Contributors.md +++ b/Contributors.md @@ -879,3 +879,4 @@ - [Renan Vichetti](https://github.com/rvconessa/) - [GaganDeep Singh](https://github.com/SGagan) - [MikeWLloyd](https://github.com/MikeWLloyd) +- [Dilan Nilaksha](https://github.com/jpdilan) gd one dudes :) From 7320acc9b22ff6a77e23e0e55088046a1bf19db0 Mon Sep 17 00:00:00 2001 From: Mintoo Kumar Date: Fri, 20 Oct 2017 21:50:47 +0530 Subject: [PATCH 132/195] Update Contributors.md --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 545fbd00bca..85c68194cab 100644 --- a/Contributors.md +++ b/Contributors.md @@ -1,3 +1,4 @@ +- [Mintoo Kumar](https://github.com/mintoo511) - [Rubén Ortiz](https://github.com/rubenortiz) - [Petrov Dumitru](https://github.com/dp97) - [Saideep Dicholkar](https://github.com/saideepd) From 9ff319ddccec129bc4f30b6e5849524e63faf80b Mon Sep 17 00:00:00 2001 From: Shashwat Date: Fri, 20 Oct 2017 21:51:41 +0530 Subject: [PATCH 133/195] Add Shashwat to Contributors.md --- Contributors.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Contributors.md b/Contributors.md index 4e687147cc5..bf7c955beaf 100644 --- a/Contributors.md +++ b/Contributors.md @@ -820,4 +820,5 @@ - [Faisal Hassan](https://faisalhassanx.bitbucket.io) - [daniel-enriquez](https://github.com/daniel-enriquez) - [Luke Taylor](https://github.com/Luke-Taylor) -- [Jim Plourde](https://github.com/giant995/first-contributions) \ No newline at end of file +- [Jim Plourde](https://github.com/giant995/first-contributions) +- [Shashwat](https://github.com/shpulak) \ No newline at end of file From c1355b3a2f43e034fb3fd708ee3fa1f7fe7cc0ff Mon Sep 17 00:00:00 2001 From: hussainHMC Date: Fri, 20 Oct 2017 21:52:03 +0530 Subject: [PATCH 134/195] Updated contributors.md --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 545fbd00bca..4b1aebf2a18 100644 --- a/Contributors.md +++ b/Contributors.md @@ -879,3 +879,4 @@ - [Renan Vichetti](https://github.com/rvconessa/) - [GaganDeep Singh](https://github.com/SGagan) - [MikeWLloyd](https://github.com/MikeWLloyd) +- [Hussain Mustafa](https://github.com/hussainbadri21) From ee45ca2a553233875254ed324eafd26b982fa6fb Mon Sep 17 00:00:00 2001 From: DTeshan <32963599+DTeshan@users.noreply.github.com> Date: Fri, 20 Oct 2017 22:08:09 +0530 Subject: [PATCH 135/195] update the Contributors.md --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 545fbd00bca..55935577dd8 100644 --- a/Contributors.md +++ b/Contributors.md @@ -879,3 +879,4 @@ - [Renan Vichetti](https://github.com/rvconessa/) - [GaganDeep Singh](https://github.com/SGagan) - [MikeWLloyd](https://github.com/MikeWLloyd) +- [Dulantha_teshan](https://github.com/DTeshan) From 81b84b65a3f9bdab0cca3b730f3a04f0b647ee13 Mon Sep 17 00:00:00 2001 From: Javier Montero Date: Fri, 20 Oct 2017 19:17:26 +0200 Subject: [PATCH 136/195] Add javmonisu to Contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 545fbd00bca..70ccd1976d3 100644 --- a/Contributors.md +++ b/Contributors.md @@ -879,3 +879,4 @@ - [Renan Vichetti](https://github.com/rvconessa/) - [GaganDeep Singh](https://github.com/SGagan) - [MikeWLloyd](https://github.com/MikeWLloyd) +- [javmonisu](https://github.com/javmonisu) From d9bd8568b27ac6178cc20a7beed8638175dfff46 Mon Sep 17 00:00:00 2001 From: David Li Date: Fri, 20 Oct 2017 14:59:50 -0400 Subject: [PATCH 137/195] Add my name (Xinnan Li) to contributors.md --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 545fbd00bca..6f66aeb9ffe 100644 --- a/Contributors.md +++ b/Contributors.md @@ -879,3 +879,4 @@ - [Renan Vichetti](https://github.com/rvconessa/) - [GaganDeep Singh](https://github.com/SGagan) - [MikeWLloyd](https://github.com/MikeWLloyd) +- [Xinnan Li](https://github.com/xn0611) From dfe001d196c3f3caa08a22ff9e678f5e4133c4c2 Mon Sep 17 00:00:00 2001 From: LRThesier <26285354+LRThesier@users.noreply.github.com> Date: Fri, 20 Oct 2017 12:18:25 -0700 Subject: [PATCH 138/195] Add LRThesier to contributors' list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 4881c7ac794..320941a98d3 100644 --- a/Contributors.md +++ b/Contributors.md @@ -792,3 +792,4 @@ - [James Lave](https://github.com/jameslave) - [Rovaron](https://github.com/Rovaron) - [Augusto Queiroz](https://github.com/AugustoQueiroz) +- [LRThesier](https://github.com/lrthesier) From da69aad0aab30ee758ab2914133f3f82031d2fbe Mon Sep 17 00:00:00 2001 From: Andrew Niekamp Date: Fri, 20 Oct 2017 15:27:20 -0400 Subject: [PATCH 139/195] Add Andrew Niekamp to Contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 545fbd00bca..2cb980b33c9 100644 --- a/Contributors.md +++ b/Contributors.md @@ -879,3 +879,4 @@ - [Renan Vichetti](https://github.com/rvconessa/) - [GaganDeep Singh](https://github.com/SGagan) - [MikeWLloyd](https://github.com/MikeWLloyd) +- [Andrew Niekamp](https://github.com/andrewniekamp) From 34028b52827fce2b872a9e3810cf1668a298d631 Mon Sep 17 00:00:00 2001 From: Aayush Babbar Date: Sat, 21 Oct 2017 00:57:24 +0530 Subject: [PATCH 140/195] Add Aayush Babbar Contributors List --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 545fbd00bca..469d4970da5 100644 --- a/Contributors.md +++ b/Contributors.md @@ -879,3 +879,4 @@ - [Renan Vichetti](https://github.com/rvconessa/) - [GaganDeep Singh](https://github.com/SGagan) - [MikeWLloyd](https://github.com/MikeWLloyd) +- [Aayush Babbar](https://github.com/mooonshot) From 0985f6a61daff2e742ff877cc5074db8af04a074 Mon Sep 17 00:00:00 2001 From: Felipe Lerma Date: Fri, 20 Oct 2017 12:33:05 -0700 Subject: [PATCH 141/195] Updating Contributors.md --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 545fbd00bca..0b113238ff5 100644 --- a/Contributors.md +++ b/Contributors.md @@ -879,3 +879,4 @@ - [Renan Vichetti](https://github.com/rvconessa/) - [GaganDeep Singh](https://github.com/SGagan) - [MikeWLloyd](https://github.com/MikeWLloyd) +- [Thespawnexe](https://github.com/Thespawnexe) From e9c77a16b34f3575e741884ad0848aa75563cb9b Mon Sep 17 00:00:00 2001 From: Passok11 Date: Fri, 20 Oct 2017 18:04:01 -0200 Subject: [PATCH 142/195] Update Contributors.md --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 3a38b516552..61d88b4b38e 100644 --- a/Contributors.md +++ b/Contributors.md @@ -894,3 +894,4 @@ - [Ple](https://github.com/plemomay) - [Shreyansh Dwivedi](https://github.com/shreyanshdwivedi) - [Akani](https://github.com/akanijade) +- [Passok11](https://github.com/Passok11) From 961025f5d08306266a790a0c2628e754f5c6ba9e Mon Sep 17 00:00:00 2001 From: aosurface Date: Fri, 20 Oct 2017 13:26:09 -0700 Subject: [PATCH 143/195] Add aowongster --- Contributors.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Contributors.md b/Contributors.md index 61d88b4b38e..a1bccec65f8 100644 --- a/Contributors.md +++ b/Contributors.md @@ -887,11 +887,12 @@ - [Aayush Babbar](https://github.com/mooonshot) - [Xinnan Li](https://github.com/xn0611) - [javmonisu](https://github.com/javmonisu) -- [Dulantha_teshan](https://github.com/DTeshan) +- [Dulantha_teshan](https://github.com/DTeshan) - [Hussain Mustafa](https://github.com/hussainbadri21) -- [Dilan Nilaksha](https://github.com/jpdilan) gd one dudes :) +- [Dilan Nilaksha](https://github.com/jpdilan) gd one dudes :) - [Sangeetha Sasikumar] (https://github.com/Sangeetha-007) - [Ple](https://github.com/plemomay) - [Shreyansh Dwivedi](https://github.com/shreyanshdwivedi) - [Akani](https://github.com/akanijade) - [Passok11](https://github.com/Passok11) +- [Aowongster](https://github.com/aowongster) From 8bc0e38483d39608368f356a6d424ff3c643d61a Mon Sep 17 00:00:00 2001 From: Aprisyta Date: Sat, 21 Oct 2017 02:08:03 +0530 Subject: [PATCH 144/195] Add Aprisyta to Contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 61d88b4b38e..68e016347bc 100644 --- a/Contributors.md +++ b/Contributors.md @@ -895,3 +895,4 @@ - [Shreyansh Dwivedi](https://github.com/shreyanshdwivedi) - [Akani](https://github.com/akanijade) - [Passok11](https://github.com/Passok11) +- [Aprisyta](https://github.com/Aprisyta) From c963700953d2bf7612ccda95026751f196068f99 Mon Sep 17 00:00:00 2001 From: leaous Date: Fri, 20 Oct 2017 17:02:42 -0400 Subject: [PATCH 145/195] Add Spencer to contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 50281a47701..9963bbb5aed 100644 --- a/Contributors.md +++ b/Contributors.md @@ -736,6 +736,7 @@ - [subhamtandon](https://github.com/subhamtandon) - [Vanessa Osuka](https://github.com/Ijebusoma) - [Akash Saravanan](https://github.com/akashsara) +- [Spencer Burleigh](https://github.com/leaous) - [Shaun O'Connor](https://github.com/shaunoc09) - [Marek Dano](https://github.com/marekdano) - [Marcos Gómez](https://github.com/margobra8) From 4cd309933aecc29e16db9ae8432439bb24b54b39 Mon Sep 17 00:00:00 2001 From: FedericoPonzi Date: Fri, 20 Oct 2017 23:15:02 +0200 Subject: [PATCH 146/195] adds my name --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index a1bccec65f8..33032d33094 100644 --- a/Contributors.md +++ b/Contributors.md @@ -896,3 +896,4 @@ - [Akani](https://github.com/akanijade) - [Passok11](https://github.com/Passok11) - [Aowongster](https://github.com/aowongster) +- [Federico](https://github.com/FedericoPonzi) From a13eddd322d03dbb2ea8f29f98aa0a6e346702eb Mon Sep 17 00:00:00 2001 From: ironsketch Date: Fri, 20 Oct 2017 14:44:11 -0700 Subject: [PATCH 147/195] Add ironsketch to Contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 361876ebe8a..c51a3b89004 100644 --- a/Contributors.md +++ b/Contributors.md @@ -898,3 +898,4 @@ - [Passok11](https://github.com/Passok11) - [Aprisyta](https://github.com/Aprisyta) - [Aowongster](https://github.com/aowongster) + [ironsketch](https://github.com/ironsketch) From 08c1be8c87595ad163d677d70046f28ec0e509d6 Mon Sep 17 00:00:00 2001 From: hosjiu1702 Date: Sat, 21 Oct 2017 08:10:50 +0700 Subject: [PATCH 148/195] Add hosjiu to Contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 361876ebe8a..06618c4ee58 100644 --- a/Contributors.md +++ b/Contributors.md @@ -898,3 +898,4 @@ - [Passok11](https://github.com/Passok11) - [Aprisyta](https://github.com/Aprisyta) - [Aowongster](https://github.com/aowongster) +- [hosjiu](https://github.com/hosjiu1702) From b5d055c0bee7f7a91e871b9528d5de08fd068c4f Mon Sep 17 00:00:00 2001 From: Wildan Mubarok Date: Sat, 21 Oct 2017 08:45:10 +0700 Subject: [PATCH 149/195] add-willnode --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 361876ebe8a..a396e22fd38 100644 --- a/Contributors.md +++ b/Contributors.md @@ -898,3 +898,4 @@ - [Passok11](https://github.com/Passok11) - [Aprisyta](https://github.com/Aprisyta) - [Aowongster](https://github.com/aowongster) +- [Wildan Mubarok](https://github.com/willnode) From dcd1ee35bfee48d94293620044ec105b1c98dde6 Mon Sep 17 00:00:00 2001 From: CacaoRick Date: Sat, 21 Oct 2017 11:12:34 +0800 Subject: [PATCH 150/195] Add cacaorick to Contributors list --- Contributors.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Contributors.md b/Contributors.md index 8a1461b4e78..02cc95bebbd 100644 --- a/Contributors.md +++ b/Contributors.md @@ -900,4 +900,5 @@ - [Aowongster](https://github.com/aowongster) - [Wildan Mubarok](https://github.com/willnode) - [hosjiu](https://github.com/hosjiu1702) - [ironsketch](https://github.com/ironsketch) +- [ironsketch](https://github.com/ironsketch) +- [cacaorick](https://github.com/cacaorick) From 76026dccd069346e7dda79d68faf2079fdf597cc Mon Sep 17 00:00:00 2001 From: namanpreetsingh Date: Sat, 21 Oct 2017 13:03:39 +0530 Subject: [PATCH 151/195] Add contributor namanpreetsingh --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 02cc95bebbd..8109831bed7 100644 --- a/Contributors.md +++ b/Contributors.md @@ -902,3 +902,4 @@ - [hosjiu](https://github.com/hosjiu1702) - [ironsketch](https://github.com/ironsketch) - [cacaorick](https://github.com/cacaorick) +- [namanpreetsingh](https://github.com/namanpreetsingh_) From bccbe32c28ca2c560461aa3dbb25714c55b94337 Mon Sep 17 00:00:00 2001 From: Jaeyeong Baek Date: Sat, 21 Oct 2017 17:49:38 +0900 Subject: [PATCH 152/195] Fix link text --- additional-material/translations/additional-material.ko.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/additional-material/translations/additional-material.ko.md b/additional-material/translations/additional-material.ko.md index 0348b2ad388..f9a2fc3395d 100644 --- a/additional-material/translations/additional-material.ko.md +++ b/additional-material/translations/additional-material.ko.md @@ -10,7 +10,7 @@ 이 문서는 포크 된 저장소를 기본 저장소로 최신 상태로 유지하는 방법에 대한 정보를 제공합니다. 여러분과 다른 많은 사람들이 프로젝트에 기여하기를 바랍니다. > 포크 된 상위 저장소가 변경되지 않은 경우 다음 단계를 수행하십시오. -### [ 커밋 되돌리기 ](../undoing-a-commit.md) +### [ 커밋 되돌리기 ](../reverting-a-commit.md) 이 문서는 원격 저장소에서 커밋을 되돌리는 방법에 대한 정보를 제공합니다. 이미 Github에 푸시 된 커밋을 되돌리려는 경우 유용합니다. > 커밋을 되돌리려면 이 단계를 수행하십시오. From 546e8b59d4046184d907b1b662dc945552ae1cc8 Mon Sep 17 00:00:00 2001 From: Ekas Preet Singh Date: Sat, 21 Oct 2017 14:22:14 +0530 Subject: [PATCH 153/195] Add ekas to Contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 02cc95bebbd..6856d9fa388 100644 --- a/Contributors.md +++ b/Contributors.md @@ -902,3 +902,4 @@ - [hosjiu](https://github.com/hosjiu1702) - [ironsketch](https://github.com/ironsketch) - [cacaorick](https://github.com/cacaorick) +- [ekas](https://github.com/ekas) From 09664464342544f060b5b738133d3474fa29d225 Mon Sep 17 00:00:00 2001 From: ShubhamSinghChauhan Date: Sat, 21 Oct 2017 14:32:51 +0530 Subject: [PATCH 154/195] shubh --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 02cc95bebbd..49efd2c02dc 100644 --- a/Contributors.md +++ b/Contributors.md @@ -1,3 +1,4 @@ +- [Shubham Chauhan](https://github.com/ShubhamSinghChauhan) - [Mintoo Kumar](https://github.com/mintoo511) - [Rubén Ortiz](https://github.com/rubenortiz) - [Petrov Dumitru](https://github.com/dp97) From 069b5fe5d10904717183c9914ee92d33f73e67d7 Mon Sep 17 00:00:00 2001 From: namanpreetsingh Date: Sat, 21 Oct 2017 14:53:06 +0530 Subject: [PATCH 155/195] Add hindi translation of README.md in README.hi.md --- translations/README.hi.md | 87 +++++++++++---------------------------- 1 file changed, 25 insertions(+), 62 deletions(-) diff --git a/translations/README.hi.md b/translations/README.hi.md index e4d6ee1866e..042bd38ea29 100644 --- a/translations/README.hi.md +++ b/translations/README.hi.md @@ -4,19 +4,21 @@ अन्य भाषाओं में इस पढ़ें: [अंग्रेजी](../README.md), [स्पेन](README.es.md), [डच](README.nl.md), [हिंदी](README.hi.md) [जापानी](README.ja.md) [रूसी](README.ru.md) -कठिन होता है| पहली बार कुछ करना हमेशा कठिन होता है| ख़ास तौर पर जब आप सहयोग और गलतियां करना आरामदायक नहीं होता । परन्तु ओपन सोर्स सहयोग के बारे में है । +पहली बार कुछ करना कठिन होता है| ख़ास तौर पर जब आप मिलकर काम कर रहे हों तब गलतियां करना एक अच्छी बात नहीं है| मगर आपस में मिलना और एक जुट होकर काम करना ही तो है ओपन सोर्स| हम आपका ये पहला ओपन सोर्स कॉन्ट्रिब्यूशन आसान बनाने में आपकी मदद करेंगे| + +आर्टिकल्स पढ़ना और ऑनलाइन ट्यूटोरियलज़ देखना मदद कर सकते हैं मगर बिना कुछ गलत करे खुद वो काम करने से अच्छा क्या हो सकता है? यह प्रोजेक्ट आपको आपके पहले कॉन्ट्रिब्यूशन के लिए दिशा निर्देशन में मदद करेगा| याद रखिये - जितने तनाव मुक्त होकर आप सीखेंगे उतना ही बेहतर सीख पाएंगे| अगर आप अपनी पहली कॉन्ट्रिब्यूशन करना चाहते हैं तो आगे दिए गए स्टेप्स को फॉलो करें| अगर आपके मशीन पर Git नहीं है तो, [इसे स्थापित करें](https://help.github.com/articles/set-up-git/) -## कांट इस भंडार +## रिपॉज़िटरी को फॉर्क करना -कांटा बटन पर क्लिक करके इस रेपो कांटा +कांटा बटन पर क्लिक करके इस रिपॉज़िटरी को फॉर्क कर सकते हैं| ## रिपोजिटरी क्लोन clone this repository -अब आप अपने मशीन को यह रेपो क्लोन। क्लोन बटन पर क्लिक करें और फिर कॉपी आइकन क्लिपबोर्ड +अब आप यह रेपो अपने मशीन में क्लोन करें| क्लोन बटन पर क्लिक करें और फिर कॉपी टू क्लिपबोर्ड आइकॉन पर क्लिक करें| एक टर्मिनल खोलें और निम्न git आदेश चलाएँ: @@ -34,17 +36,17 @@ git clone https://github.com/यह तुम हो/first-contributions.git copy URL to clipboard -' यह तुम हो 'अपने GitHub उपयोगकर्ता नाम है। यहाँ आप अपने कंप्यूटर के लिए GitHub में पहली योगदान भंडार की सामग्री नकल कर रहे हैं +' यह तुम हो 'आपके GitHub अकाउंट का नाम है। यहाँ आप अपने कंप्यूटर में GitHub से फर्स्ट-कंट्रिब्यूशंज़ रेपो को क्लोन कर रहे हैं| -## एक शाखा बनाएं +## एक ब्राँच बनाएं -आपके कंप्यूटर पर रिपोजिटरी निर्देशिका के लिए परिवर्तित करें अगर आप पहले से ही वहाँ नहीं कर रहे हैं। +अपने कंप्यूटर में रेपो डायरेक्टरी चेंज करें अगर अभी तक नहीं की है तो -- ``` cd first-contributions ``` -अब एक शाखा बना `git checkout command` उपयोग करके +अब एक शाखा बनाएं `git checkout command` उपयोग करके| ``` git checkout -b <अपना नाम जोड़> @@ -56,89 +58,50 @@ git checkout -b <अपना नाम जोड़> git checkout -b add-alonzo-church ``` -## आवश्यक परिवर्तन करें और उन परिवर्तनों के लिए प्रतिबद्ध +## आवश्यक परिवर्तन करें और उन परिवर्तनों को कमिट करें- -अब खुले `Contributors.md` फ़ाइल एक पाठ संपादक में और इसे आपके नाम जोड़, और फ़ाइल सहेजें। आप अगर इस परियोजना निर्देशिका कर और `git status` करते हैं, तो आप परिवर्तन देखेंगे। उन परिवर्तनों को नीचे `git add` commad का उपयोग कर जोड़ें। +अब `Contributors.md` फ़ाइल को एक टेक्स्ट एडिटर में खोलकर इसमें अपना नाम लिखें, और फ़ाइल को सेव करें| आप अगर `git status` निर्देश चलाएंगे , तो आप परिवर्तन देखेंगे। उन परिवर्तनों को नीचे `git add` कमान्ड का उपयोग कर जोड़ें। ``` git add Contributors.md ``` -अब नीचे `git commit` आदेश का उपयोग उन परिवर्तनों को प्रतिबद्ध है। +अब अपने किये गए बदलावों को कमिट करें `git commit` आदेश का उपयोग करके| ``` git commit -m "Add <आपका-नाम> to Contributors list" ``` -आपके नाम के साथ `<आपका-नाम>` की जगह +<आपका-नाम> की जगह अपना नाम डालें| -## GitHub में परिवर्तन पुश +## अपने बदलावों को github में पुश करें| -`git push` का उपयोग कर अपने परिवर्तन धक्का +`git push` का उपयोग कर अपने परिवर्तन को पुश करें| ``` git push origin <अपना नाम जोड़> ``` -बदलें `<अपना नाम जोड़>` शाखा आपने पहले बनाया के नाम के साथ - -## समीक्षा के लिए अपने परिवर्तनों को जमा करें +`<अपना नाम जोड़>` की जगह अपना नाम डालें| -आप GitHub पर अपने भंडार के लिए जाना है, तो आप देख `Compare & pull request` बटन खींच लेंगे। उस बटन पर क्लिक करें। +## अपने बदलावों को रिव्यु के लिए सबमिट करें| +अगर आप अपने github प्रोफाइल पर अपनी रेपो में जायेंगे तो आपको Compare & pull request का ऑप्शन दिखेगा| उसे दबाएं| create a pull request -अब पुल अनुरोध सबमिट करें। +अब अपनी pull request सबमिट करें| submit pull request +जल्द ही मैं आपके बदलावों को इस प्रोजेक्ट की मास्टर ब्राँच में मर्ज क्र दूंगा| आपको एक मेल आजायेगी जब आपके बदलाव मर्ज होंगे| -## अपने कांटा इस भंडार के साथ समन्वयित रखते हुए - -अब मैं इस परियोजना के मास्टर शाखा में अपने सभी परिवर्तन विलय हो जाएगा। अपने कांटा उन परिवर्तनों की जरूरत नहीं होगी। आदेश में अपने कांटा खान के साथ समन्वयित रखने के लिए, `upstream remote url` के रूप में मेरे रेपो के यूआरएल जोड़ें। - -``` -git remote add upstream https://github.com/multunus/first-contributions -``` - -यह git को इस परियोजना के दूसरे संस्करण निर्दिष्ट यूआरएल में मौजूद बताने का एक तरीका है और हम इसे मास्टर बुला रहे हैं। एक बार परिवर्तन विलय कर रहे हैं, मेरे रिपॉजिटरी के नए संस्करण लाने। - -``` -git fetch upstream -``` - -यहाँ हम अपने कांटा (अपस्ट्रीम दूरदराज) में सभी परिवर्तन ला रहे हैं। अब, आप अपने गुरु शाखा में अपने भंडार के नए संशोधन विलय करने की जरूरत है। - -``` -git rebase upstream/master -``` - -यहाँ आप सभी परिवर्तनों को आप गुरु शाखा को दिलवाया आवेदन कर रहे हैं। तुम अब मास्टर शाखा धक्का, अपने कांटा भी परिवर्तन होगा - -``` -git push origin master -``` - -यहां सूचना आप दूरदराज के नाम पर रखा मूल करने के लिए जोर दे रहे हैं। +## यहाँ से कहाँ जाएं ? +Github पे अपने पहले योगदान की खुश में जश्न मनाएं और अपने दोस्तों के साथ शेयर करें [वेब एप्प](https://roshanjossey.github.io/first-contributions/#social-share) पे जाके| +आप हमारी स्लैक टीम को ज्वाइन कर सकते हैं अगर आपको कोई मदद चाहिए या आपके कोई परेशानी हों| [स्लैक पे ज्वाइन करें](https://firstcontributions.herokuapp.com) +अब आप और प्रोजेक्ट्स में कंट्रीब्यूट करना शुरू कर सकते हैं| हमने आपके लिए एक लिस्ट बनायीं है जो कि बहुत आसान मुद्दे हैं| [प्रोजेक्ट्स कि लिस्ट](https://roshanjossey.github.io/first-contributions/#project-list) ## अन्य टूल का उपयोग करके ट्यूटोरियल |GitHub Desktop|Visual Studio 2017|GitKraken| |---|---|---| |[GitHub Desktop](../github-desktop-tutorial.md)|[Visual Studio 2017](../github-windows-vs2017-tutorial.md)|[GitKraken](../gitkraken-tutorial.md)| - - - -## यहाँ से कहाँ जाएं ? - -यहाँ लोकप्रिय रेपो कि आप को हल कर सकते हैं में कुछ शुरुआत के स्तर के मुद्दों है। आगे बढ़ो और अधिक जानने के लिए उन रेपो करने के लिए जाना - -|[![exercism](https://avatars2.githubusercontent.com/u/5624255?v=3&s=100)](https://github.com/exercism/exercism.io/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+patch%22)|[![fun-retro](https://avatars3.githubusercontent.com/u/15913975?v=3&s=100)](https://github.com/funretro/distributed/issues?q=is%3Aopen+is%3Aissue+label%3Abeginner-friendly)|[](https://github.com/facebook/react/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+bug%22)|[![habitat](https://avatars1.githubusercontent.com/u/18171698?v=3&s=100)](https://github.com/habitat-sh/habitat/issues?q=is%3Aopen+is%3Aissue+label%3AEasy)|[![scikit-learn](https://avatars0.githubusercontent.com/u/365630?v=3&s=100)](https://github.com/scikit-learn/scikit-learn/issues?q=is%3Aopen+is%3Aissue+label%3AEasy)|[](https://github.com/technomancy/leiningen/issues?q=is%3Aopen+is%3Aissue+label%3ANewbie)|[](https://github.com/numpy/numpy/issues?q=is%3Aopen+is%3Aissue+label%3A%22Easy+Fix%22)|[![elasticsearch](https://avatars2.githubusercontent.com/u/6764390?v=3&s=100)](https://github.com/elastic/elasticsearch/issues?q=is%3Aopen+is%3Aissue+label%3A%22low+hanging+fruit%22)| -|---|---|---|---|---|---|---|---| -|[exercism](https://github.com/exercism/exercism.io/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+patch%22)|[Fun Retros](https://github.com/funretro/distributed/issues?q=is%3Aopen+is%3Aissue+label%3Abeginner-friendly)|[react](https://github.com/facebook/react/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+bug%22)|[habitat](https://github.com/habitat-sh/habitat/issues?q=is%3Aopen+is%3Aissue+label%3AEasy)|[scikit-learn](https://github.com/scikit-learn/scikit-learn/issues?q=is%3Aopen+is%3Aissue+label%3AEasy)|[Leiningen](https://github.com/technomancy/leiningen/issues?q=is%3Aopen+is%3Aissue+label%3ANewbie)|[numpy](https://github.com/numpy/numpy/issues?q=is%3Aopen+is%3Aissue+label%3A%22Easy+Fix%22)|[elasticsearch](https://github.com/elastic/elasticsearch/issues?q=is%3Aopen+is%3Aissue+label%3A%22low+hanging+fruit%22)| -|[![homebrew](https://avatars2.githubusercontent.com/u/1503512?v=3&s=100)](https://github.com/Homebrew/brew/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22)|[![rust](https://avatars1.githubusercontent.com/u/5430905?v=3&s=100)](https://github.com/rust-lang/rust/issues?q=is%3Aopen+is%3Aissue+label%3AE-easy)|[![vuejs](https://avatars1.githubusercontent.com/u/6128107?v=3&s=100)](https://github.com/vuejs/vue/issues?q=is%3Aopen+is%3Aissue+label%3A%22contribution+welcome%22)|[![Suave](https://avatars2.githubusercontent.com/u/5822862?v=3&s=100)](https://github.com/SuaveIO/suave/issues?q=is%3Aopen+is%3Aissue+label%3Ahardness-easy)|[![OpenRA](https://avatars3.githubusercontent.com/u/409046?v=3&s=100)](https://github.com/OpenRA/OpenRA/issues?q=is%3Aopen+is%3Aissue+label%3AEasy)|[![PowerShell](https://avatars0.githubusercontent.com/u/11524380?v=3&s=100)](https://github.com/powershell/powershell/issues?q=is%3Aopen+is%3Aissue+label%3AUp-for-Grabs)|[![coala](https://avatars2.githubusercontent.com/u/10620750?v=3&s=100)](https://github.com/coala/coala/issues?q=is%3Aopen+is%3Aissue+label%3Adifficulty%2Flow+label%3Adifficulty%2Fnewcomer)|[![moment](https://avatars2.githubusercontent.com/u/4129662?v=3&s=100)](https://github.com/moment/moment/issues?q=is%3Aopen+is%3Aissue+label%3AUp-For-Grabs)| -|[homebrew](https://github.com/Homebrew/brew/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22)|[Rust](https://github.com/rust-lang/rust/issues?q=is%3Aopen+is%3Aissue+label%3AE-easy)|[vuejs](https://github.com/vuejs/vue/issues?q=is%3Aopen+is%3Aissue+label%3A%22contribution+welcome%22)|[Suave](https://github.com/SuaveIO/suave/issues?q=is%3Aopen+is%3Aissue+label%3Ahardness-easy)|[OpenRA](https://github.com/OpenRA/OpenRA/issues?q=is%3Aopen+is%3Aissue+label%3AEasy)|[PowerShell](https://github.com/powershell/powershell/issues?q=is%3Aopen+is%3Aissue+label%3AUp-for-Grabs)|[coala](https://github.com/coala/coala/issues?q=is%3Aopen+is%3Aissue+label%3Adifficulty%2Flow+label%3Adifficulty%2Fnewcomer)|[moment](https://github.com/moment/moment/issues?q=is%3Aopen+is%3Aissue+label%3AUp-For-Grabs)| -|[![ava](https://avatars0.githubusercontent.com/u/8527916?v=3&s=100)](https://github.com/avajs/ava/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+for+beginner%22)|[![freeCodeCamp](https://avatars0.githubusercontent.com/u/9892522?v=3&s=100)](https://github.com/freeCodeCamp/freeCodeCamp/issues?q=is%3Aopen+is%3Aissue+label%3Afirst-timers-only)|[![webpack](https://avatars3.githubusercontent.com/u/2105791?v=3&s=100)](https://github.com/webpack/webpack/issues?q=is%3Aopen+is%3Aissue+label%3A%22D1%3A+Easy+%28Contrib.+Difficulty%29%22)|[![hoodie](https://avatars1.githubusercontent.com/u/1888826?v=3&s=100)](https://github.com/hoodiehq/hoodie/issues?q=is%3Aopen+is%3Aissue+label%3Afirst-timers-only)|[![pouchdb](https://avatars3.githubusercontent.com/u/3406112?v=3&s=100)](https://github.com/pouchdb/pouchdb/issues?q=is%3Aopen+is%3Aissue+label%3A%22first+timers+only%22)|[![neovim](https://avatars0.githubusercontent.com/u/6471485?v=3&s=100)](https://github.com/neovim/neovim/issues?q=is%3Aopen+is%3Aissue+label%3Aentry-level)|[![babel](https://avatars2.githubusercontent.com/u/9637642?v=3&s=100)](https://github.com/babel/babel/issues?q=is%3Aopen+is%3Aissue+label%3Abeginner-friendly) |[](https://github.com/adobe/brackets/labels/Starter%20bug)| -|[ava](https://github.com/avajs/ava/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+for+beginner%22)|[freeCodeCamp](https://github.com/freeCodeCamp/freeCodeCamp/issues?q=is%3Aopen+is%3Aissue+label%3Afirst-timers-only)|[webpack](https://github.com/webpack/webpack/issues?q=is%3Aopen+is%3Aissue+label%3A%22D1%3A+Easy+%28Contrib.+Difficulty%29%22)|[hoodie](https://github.com/hoodiehq/hoodie/issues?q=is%3Aopen+is%3Aissue+label%3Afirst-timers-only)|[pouchdb](https://github.com/pouchdb/pouchdb/issues?q=is%3Aopen+is%3Aissue+label%3A%22first+timers+only%22)|[neovim](https://github.com/neovim/neovim/issues?q=is%3Aopen+is%3Aissue+label%3Aentry-level)|[babel](https://github.com/babel/babel/issues?q=is%3Aopen+is%3Aissue+label%3Abeginner-friendly) |[brackets](https://github.com/adobe/brackets/labels/Starter%20bug)| -| [![Node.js](https://avatars1.githubusercontent.com/u/9950313?v=3&s=100)](https://github.com/nodejs/node/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+contribution%22)|[](https://github.com/Semantic-Org/Semantic-UI-React/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+contribution%22)| -| [Node.js](https://github.com/nodejs/node/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+contribution%22) |[Semantic-UI-React](https://github.com/Semantic-Org/Semantic-UI-React/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+contribution%22) | From 14c33be93f936c9f830c4829589a3b14d658ec56 Mon Sep 17 00:00:00 2001 From: Ahmad Javed Date: Sat, 21 Oct 2017 14:54:49 +0530 Subject: [PATCH 156/195] Add Ahmad Javed to Contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 02cc95bebbd..b692e45c76c 100644 --- a/Contributors.md +++ b/Contributors.md @@ -902,3 +902,4 @@ - [hosjiu](https://github.com/hosjiu1702) - [ironsketch](https://github.com/ironsketch) - [cacaorick](https://github.com/cacaorick) +- [Ahmad Javed](https://github.com/ahmadjaved97) \ No newline at end of file From b539142e8c47ff834af8fbf19a3f992bd94e9f1d Mon Sep 17 00:00:00 2001 From: Pham Thi Thanh Binh Date: Sat, 21 Oct 2017 16:52:34 +0700 Subject: [PATCH 157/195] Update Contributors.md --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 02cc95bebbd..65a9bf70bd4 100644 --- a/Contributors.md +++ b/Contributors.md @@ -902,3 +902,4 @@ - [hosjiu](https://github.com/hosjiu1702) - [ironsketch](https://github.com/ironsketch) - [cacaorick](https://github.com/cacaorick) +- [BinhPhamKMA](https://github.com/BinhPhamKMA) From 2c739990d1206297e48ec691994c49f28338d9fc Mon Sep 17 00:00:00 2001 From: gaurav rai Date: Sat, 21 Oct 2017 16:03:02 +0530 Subject: [PATCH 158/195] Add gaurav to Contribution list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 02cc95bebbd..876898341b1 100644 --- a/Contributors.md +++ b/Contributors.md @@ -1,3 +1,4 @@ +- [Gaurav Rai](https://github.com/ThinkHattke) - [Mintoo Kumar](https://github.com/mintoo511) - [Rubén Ortiz](https://github.com/rubenortiz) - [Petrov Dumitru](https://github.com/dp97) From acc015e599583d866145519ba64e786021f8133a Mon Sep 17 00:00:00 2001 From: Christopher Zentgraf Date: Sat, 21 Oct 2017 12:43:04 +0200 Subject: [PATCH 159/195] Add name to Contributors.md --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 02cc95bebbd..357c3d52e6f 100644 --- a/Contributors.md +++ b/Contributors.md @@ -902,3 +902,4 @@ - [hosjiu](https://github.com/hosjiu1702) - [ironsketch](https://github.com/ironsketch) - [cacaorick](https://github.com/cacaorick) +- [TheZenti](https://github.com/TheZenti) From 7634ac3ca0212130e0cbc3272db8ddcdfa577df8 Mon Sep 17 00:00:00 2001 From: Brett Date: Sat, 21 Oct 2017 14:04:48 +0200 Subject: [PATCH 160/195] Add Brett to Contributors.md --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 02cc95bebbd..a201f4ec87b 100644 --- a/Contributors.md +++ b/Contributors.md @@ -1,3 +1,4 @@ +- [Brett Davis](https://github.com/saintbernie) - [Mintoo Kumar](https://github.com/mintoo511) - [Rubén Ortiz](https://github.com/rubenortiz) - [Petrov Dumitru](https://github.com/dp97) From 9de553ea5d32dd88dfb7cdb4cb1b2780a4139232 Mon Sep 17 00:00:00 2001 From: Matheus Date: Sat, 21 Oct 2017 10:29:01 -0200 Subject: [PATCH 161/195] Add Matheus Lucena to Contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 02cc95bebbd..85257fdf024 100644 --- a/Contributors.md +++ b/Contributors.md @@ -902,3 +902,4 @@ - [hosjiu](https://github.com/hosjiu1702) - [ironsketch](https://github.com/ironsketch) - [cacaorick](https://github.com/cacaorick) +- [Matheus Lucena] (https://github.com/matehuslucena) From b067bcdde60d66048e1d836c26c3e67635034a38 Mon Sep 17 00:00:00 2001 From: Supachai Date: Sat, 21 Oct 2017 20:20:42 +0700 Subject: [PATCH 162/195] Add Galleria to Contributors list Add Galleria to Contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 02cc95bebbd..afa18cddabc 100644 --- a/Contributors.md +++ b/Contributors.md @@ -902,3 +902,4 @@ - [hosjiu](https://github.com/hosjiu1702) - [ironsketch](https://github.com/ironsketch) - [cacaorick](https://github.com/cacaorick) +- [Galleria](https://github.com/Galleria) From 42abbea7b11c7167d38bddcb6e8806430fea4815 Mon Sep 17 00:00:00 2001 From: Aditya Arie Nugraha Date: Sat, 21 Oct 2017 15:54:55 +0200 Subject: [PATCH 163/195] Add Aditya Nugraha to Contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 02cc95bebbd..34dcb5b76d6 100644 --- a/Contributors.md +++ b/Contributors.md @@ -902,3 +902,4 @@ - [hosjiu](https://github.com/hosjiu1702) - [ironsketch](https://github.com/ironsketch) - [cacaorick](https://github.com/cacaorick) +- [Aditya Nugraha](https://github.com/aanugraha) From 708908189b7940c4bb757ad5f2598b4e7c69d3bf Mon Sep 17 00:00:00 2001 From: namanpreetsingh Date: Sat, 21 Oct 2017 20:20:52 +0530 Subject: [PATCH 164/195] Change formatting of line 99 by adding line breaks --- translations/README.hi.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/translations/README.hi.md b/translations/README.hi.md index 042bd38ea29..aaf762f3842 100644 --- a/translations/README.hi.md +++ b/translations/README.hi.md @@ -96,9 +96,9 @@ git push origin <अपना नाम जोड़> ## यहाँ से कहाँ जाएं ? -Github पे अपने पहले योगदान की खुश में जश्न मनाएं और अपने दोस्तों के साथ शेयर करें [वेब एप्प](https://roshanjossey.github.io/first-contributions/#social-share) पे जाके| -आप हमारी स्लैक टीम को ज्वाइन कर सकते हैं अगर आपको कोई मदद चाहिए या आपके कोई परेशानी हों| [स्लैक पे ज्वाइन करें](https://firstcontributions.herokuapp.com) -अब आप और प्रोजेक्ट्स में कंट्रीब्यूट करना शुरू कर सकते हैं| हमने आपके लिए एक लिस्ट बनायीं है जो कि बहुत आसान मुद्दे हैं| [प्रोजेक्ट्स कि लिस्ट](https://roshanjossey.github.io/first-contributions/#project-list) +Github पे अपने पहले योगदान की खुश में जश्न मनाएं और अपने दोस्तों के साथ शेयर करें [वेब एप्प](https://roshanjossey.github.io/first-contributions/#social-share) पे जाके|
+आप हमारी स्लैक टीम को ज्वाइन कर सकते हैं अगर आपको कोई मदद चाहिए या आपके कोई परेशानी हों| [स्लैक पे ज्वाइन करें](https://firstcontributions.herokuapp.com)
+अब आप और प्रोजेक्ट्स में कंट्रीब्यूट करना शुरू कर सकते हैं| हमने आपके लिए एक लिस्ट बनायीं है जो कि बहुत आसान मुद्दे हैं| [प्रोजेक्ट्स कि लिस्ट](https://roshanjossey.github.io/first-contributions/#project-list)
## अन्य टूल का उपयोग करके ट्यूटोरियल From 9856f0cd0f89aa56188e586863a0c88f542c2090 Mon Sep 17 00:00:00 2001 From: namanpreetsingh Date: Sat, 21 Oct 2017 20:47:05 +0530 Subject: [PATCH 165/195] Correct link to github profile in Contributors.md --- Contributors.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Contributors.md b/Contributors.md index c561325202e..5e06d5dbda8 100644 --- a/Contributors.md +++ b/Contributors.md @@ -904,9 +904,9 @@ - [hosjiu](https://github.com/hosjiu1702) - [ironsketch](https://github.com/ironsketch) - [cacaorick](https://github.com/cacaorick) +- [namanpreetsingh](https://github.com/namanpreetsingh) - [Aditya Nugraha](https://github.com/aanugraha) - [ekas](https://github.com/ekas) -- [namanpreetsingh](https://github.com/namanpreetsingh_) - [Ahmad Javed](https://github.com/ahmadjaved97) - [BinhPhamKMA](https://github.com/BinhPhamKMA) - [TheZenti](https://github.com/TheZenti) From 3a4e8200bd8dbfd6e26c049d80830e199d0dff9a Mon Sep 17 00:00:00 2001 From: namanpreetsingh Date: Sat, 21 Oct 2017 14:53:06 +0530 Subject: [PATCH 166/195] Add hindi translation of README.md in README.hi.md --- translations/README.hi.md | 87 +++++++++++---------------------------- 1 file changed, 25 insertions(+), 62 deletions(-) diff --git a/translations/README.hi.md b/translations/README.hi.md index e4d6ee1866e..042bd38ea29 100644 --- a/translations/README.hi.md +++ b/translations/README.hi.md @@ -4,19 +4,21 @@ अन्य भाषाओं में इस पढ़ें: [अंग्रेजी](../README.md), [स्पेन](README.es.md), [डच](README.nl.md), [हिंदी](README.hi.md) [जापानी](README.ja.md) [रूसी](README.ru.md) -कठिन होता है| पहली बार कुछ करना हमेशा कठिन होता है| ख़ास तौर पर जब आप सहयोग और गलतियां करना आरामदायक नहीं होता । परन्तु ओपन सोर्स सहयोग के बारे में है । +पहली बार कुछ करना कठिन होता है| ख़ास तौर पर जब आप मिलकर काम कर रहे हों तब गलतियां करना एक अच्छी बात नहीं है| मगर आपस में मिलना और एक जुट होकर काम करना ही तो है ओपन सोर्स| हम आपका ये पहला ओपन सोर्स कॉन्ट्रिब्यूशन आसान बनाने में आपकी मदद करेंगे| + +आर्टिकल्स पढ़ना और ऑनलाइन ट्यूटोरियलज़ देखना मदद कर सकते हैं मगर बिना कुछ गलत करे खुद वो काम करने से अच्छा क्या हो सकता है? यह प्रोजेक्ट आपको आपके पहले कॉन्ट्रिब्यूशन के लिए दिशा निर्देशन में मदद करेगा| याद रखिये - जितने तनाव मुक्त होकर आप सीखेंगे उतना ही बेहतर सीख पाएंगे| अगर आप अपनी पहली कॉन्ट्रिब्यूशन करना चाहते हैं तो आगे दिए गए स्टेप्स को फॉलो करें| अगर आपके मशीन पर Git नहीं है तो, [इसे स्थापित करें](https://help.github.com/articles/set-up-git/) -## कांट इस भंडार +## रिपॉज़िटरी को फॉर्क करना -कांटा बटन पर क्लिक करके इस रेपो कांटा +कांटा बटन पर क्लिक करके इस रिपॉज़िटरी को फॉर्क कर सकते हैं| ## रिपोजिटरी क्लोन clone this repository -अब आप अपने मशीन को यह रेपो क्लोन। क्लोन बटन पर क्लिक करें और फिर कॉपी आइकन क्लिपबोर्ड +अब आप यह रेपो अपने मशीन में क्लोन करें| क्लोन बटन पर क्लिक करें और फिर कॉपी टू क्लिपबोर्ड आइकॉन पर क्लिक करें| एक टर्मिनल खोलें और निम्न git आदेश चलाएँ: @@ -34,17 +36,17 @@ git clone https://github.com/यह तुम हो/first-contributions.git copy URL to clipboard -' यह तुम हो 'अपने GitHub उपयोगकर्ता नाम है। यहाँ आप अपने कंप्यूटर के लिए GitHub में पहली योगदान भंडार की सामग्री नकल कर रहे हैं +' यह तुम हो 'आपके GitHub अकाउंट का नाम है। यहाँ आप अपने कंप्यूटर में GitHub से फर्स्ट-कंट्रिब्यूशंज़ रेपो को क्लोन कर रहे हैं| -## एक शाखा बनाएं +## एक ब्राँच बनाएं -आपके कंप्यूटर पर रिपोजिटरी निर्देशिका के लिए परिवर्तित करें अगर आप पहले से ही वहाँ नहीं कर रहे हैं। +अपने कंप्यूटर में रेपो डायरेक्टरी चेंज करें अगर अभी तक नहीं की है तो -- ``` cd first-contributions ``` -अब एक शाखा बना `git checkout command` उपयोग करके +अब एक शाखा बनाएं `git checkout command` उपयोग करके| ``` git checkout -b <अपना नाम जोड़> @@ -56,89 +58,50 @@ git checkout -b <अपना नाम जोड़> git checkout -b add-alonzo-church ``` -## आवश्यक परिवर्तन करें और उन परिवर्तनों के लिए प्रतिबद्ध +## आवश्यक परिवर्तन करें और उन परिवर्तनों को कमिट करें- -अब खुले `Contributors.md` फ़ाइल एक पाठ संपादक में और इसे आपके नाम जोड़, और फ़ाइल सहेजें। आप अगर इस परियोजना निर्देशिका कर और `git status` करते हैं, तो आप परिवर्तन देखेंगे। उन परिवर्तनों को नीचे `git add` commad का उपयोग कर जोड़ें। +अब `Contributors.md` फ़ाइल को एक टेक्स्ट एडिटर में खोलकर इसमें अपना नाम लिखें, और फ़ाइल को सेव करें| आप अगर `git status` निर्देश चलाएंगे , तो आप परिवर्तन देखेंगे। उन परिवर्तनों को नीचे `git add` कमान्ड का उपयोग कर जोड़ें। ``` git add Contributors.md ``` -अब नीचे `git commit` आदेश का उपयोग उन परिवर्तनों को प्रतिबद्ध है। +अब अपने किये गए बदलावों को कमिट करें `git commit` आदेश का उपयोग करके| ``` git commit -m "Add <आपका-नाम> to Contributors list" ``` -आपके नाम के साथ `<आपका-नाम>` की जगह +<आपका-नाम> की जगह अपना नाम डालें| -## GitHub में परिवर्तन पुश +## अपने बदलावों को github में पुश करें| -`git push` का उपयोग कर अपने परिवर्तन धक्का +`git push` का उपयोग कर अपने परिवर्तन को पुश करें| ``` git push origin <अपना नाम जोड़> ``` -बदलें `<अपना नाम जोड़>` शाखा आपने पहले बनाया के नाम के साथ - -## समीक्षा के लिए अपने परिवर्तनों को जमा करें +`<अपना नाम जोड़>` की जगह अपना नाम डालें| -आप GitHub पर अपने भंडार के लिए जाना है, तो आप देख `Compare & pull request` बटन खींच लेंगे। उस बटन पर क्लिक करें। +## अपने बदलावों को रिव्यु के लिए सबमिट करें| +अगर आप अपने github प्रोफाइल पर अपनी रेपो में जायेंगे तो आपको Compare & pull request का ऑप्शन दिखेगा| उसे दबाएं| create a pull request -अब पुल अनुरोध सबमिट करें। +अब अपनी pull request सबमिट करें| submit pull request +जल्द ही मैं आपके बदलावों को इस प्रोजेक्ट की मास्टर ब्राँच में मर्ज क्र दूंगा| आपको एक मेल आजायेगी जब आपके बदलाव मर्ज होंगे| -## अपने कांटा इस भंडार के साथ समन्वयित रखते हुए - -अब मैं इस परियोजना के मास्टर शाखा में अपने सभी परिवर्तन विलय हो जाएगा। अपने कांटा उन परिवर्तनों की जरूरत नहीं होगी। आदेश में अपने कांटा खान के साथ समन्वयित रखने के लिए, `upstream remote url` के रूप में मेरे रेपो के यूआरएल जोड़ें। - -``` -git remote add upstream https://github.com/multunus/first-contributions -``` - -यह git को इस परियोजना के दूसरे संस्करण निर्दिष्ट यूआरएल में मौजूद बताने का एक तरीका है और हम इसे मास्टर बुला रहे हैं। एक बार परिवर्तन विलय कर रहे हैं, मेरे रिपॉजिटरी के नए संस्करण लाने। - -``` -git fetch upstream -``` - -यहाँ हम अपने कांटा (अपस्ट्रीम दूरदराज) में सभी परिवर्तन ला रहे हैं। अब, आप अपने गुरु शाखा में अपने भंडार के नए संशोधन विलय करने की जरूरत है। - -``` -git rebase upstream/master -``` - -यहाँ आप सभी परिवर्तनों को आप गुरु शाखा को दिलवाया आवेदन कर रहे हैं। तुम अब मास्टर शाखा धक्का, अपने कांटा भी परिवर्तन होगा - -``` -git push origin master -``` - -यहां सूचना आप दूरदराज के नाम पर रखा मूल करने के लिए जोर दे रहे हैं। +## यहाँ से कहाँ जाएं ? +Github पे अपने पहले योगदान की खुश में जश्न मनाएं और अपने दोस्तों के साथ शेयर करें [वेब एप्प](https://roshanjossey.github.io/first-contributions/#social-share) पे जाके| +आप हमारी स्लैक टीम को ज्वाइन कर सकते हैं अगर आपको कोई मदद चाहिए या आपके कोई परेशानी हों| [स्लैक पे ज्वाइन करें](https://firstcontributions.herokuapp.com) +अब आप और प्रोजेक्ट्स में कंट्रीब्यूट करना शुरू कर सकते हैं| हमने आपके लिए एक लिस्ट बनायीं है जो कि बहुत आसान मुद्दे हैं| [प्रोजेक्ट्स कि लिस्ट](https://roshanjossey.github.io/first-contributions/#project-list) ## अन्य टूल का उपयोग करके ट्यूटोरियल |GitHub Desktop|Visual Studio 2017|GitKraken| |---|---|---| |[GitHub Desktop](../github-desktop-tutorial.md)|[Visual Studio 2017](../github-windows-vs2017-tutorial.md)|[GitKraken](../gitkraken-tutorial.md)| - - - -## यहाँ से कहाँ जाएं ? - -यहाँ लोकप्रिय रेपो कि आप को हल कर सकते हैं में कुछ शुरुआत के स्तर के मुद्दों है। आगे बढ़ो और अधिक जानने के लिए उन रेपो करने के लिए जाना - -|[![exercism](https://avatars2.githubusercontent.com/u/5624255?v=3&s=100)](https://github.com/exercism/exercism.io/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+patch%22)|[![fun-retro](https://avatars3.githubusercontent.com/u/15913975?v=3&s=100)](https://github.com/funretro/distributed/issues?q=is%3Aopen+is%3Aissue+label%3Abeginner-friendly)|[](https://github.com/facebook/react/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+bug%22)|[![habitat](https://avatars1.githubusercontent.com/u/18171698?v=3&s=100)](https://github.com/habitat-sh/habitat/issues?q=is%3Aopen+is%3Aissue+label%3AEasy)|[![scikit-learn](https://avatars0.githubusercontent.com/u/365630?v=3&s=100)](https://github.com/scikit-learn/scikit-learn/issues?q=is%3Aopen+is%3Aissue+label%3AEasy)|[](https://github.com/technomancy/leiningen/issues?q=is%3Aopen+is%3Aissue+label%3ANewbie)|[](https://github.com/numpy/numpy/issues?q=is%3Aopen+is%3Aissue+label%3A%22Easy+Fix%22)|[![elasticsearch](https://avatars2.githubusercontent.com/u/6764390?v=3&s=100)](https://github.com/elastic/elasticsearch/issues?q=is%3Aopen+is%3Aissue+label%3A%22low+hanging+fruit%22)| -|---|---|---|---|---|---|---|---| -|[exercism](https://github.com/exercism/exercism.io/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+patch%22)|[Fun Retros](https://github.com/funretro/distributed/issues?q=is%3Aopen+is%3Aissue+label%3Abeginner-friendly)|[react](https://github.com/facebook/react/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+bug%22)|[habitat](https://github.com/habitat-sh/habitat/issues?q=is%3Aopen+is%3Aissue+label%3AEasy)|[scikit-learn](https://github.com/scikit-learn/scikit-learn/issues?q=is%3Aopen+is%3Aissue+label%3AEasy)|[Leiningen](https://github.com/technomancy/leiningen/issues?q=is%3Aopen+is%3Aissue+label%3ANewbie)|[numpy](https://github.com/numpy/numpy/issues?q=is%3Aopen+is%3Aissue+label%3A%22Easy+Fix%22)|[elasticsearch](https://github.com/elastic/elasticsearch/issues?q=is%3Aopen+is%3Aissue+label%3A%22low+hanging+fruit%22)| -|[![homebrew](https://avatars2.githubusercontent.com/u/1503512?v=3&s=100)](https://github.com/Homebrew/brew/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22)|[![rust](https://avatars1.githubusercontent.com/u/5430905?v=3&s=100)](https://github.com/rust-lang/rust/issues?q=is%3Aopen+is%3Aissue+label%3AE-easy)|[![vuejs](https://avatars1.githubusercontent.com/u/6128107?v=3&s=100)](https://github.com/vuejs/vue/issues?q=is%3Aopen+is%3Aissue+label%3A%22contribution+welcome%22)|[![Suave](https://avatars2.githubusercontent.com/u/5822862?v=3&s=100)](https://github.com/SuaveIO/suave/issues?q=is%3Aopen+is%3Aissue+label%3Ahardness-easy)|[![OpenRA](https://avatars3.githubusercontent.com/u/409046?v=3&s=100)](https://github.com/OpenRA/OpenRA/issues?q=is%3Aopen+is%3Aissue+label%3AEasy)|[![PowerShell](https://avatars0.githubusercontent.com/u/11524380?v=3&s=100)](https://github.com/powershell/powershell/issues?q=is%3Aopen+is%3Aissue+label%3AUp-for-Grabs)|[![coala](https://avatars2.githubusercontent.com/u/10620750?v=3&s=100)](https://github.com/coala/coala/issues?q=is%3Aopen+is%3Aissue+label%3Adifficulty%2Flow+label%3Adifficulty%2Fnewcomer)|[![moment](https://avatars2.githubusercontent.com/u/4129662?v=3&s=100)](https://github.com/moment/moment/issues?q=is%3Aopen+is%3Aissue+label%3AUp-For-Grabs)| -|[homebrew](https://github.com/Homebrew/brew/issues?q=is%3Aopen+is%3Aissue+label%3A%22help+wanted%22)|[Rust](https://github.com/rust-lang/rust/issues?q=is%3Aopen+is%3Aissue+label%3AE-easy)|[vuejs](https://github.com/vuejs/vue/issues?q=is%3Aopen+is%3Aissue+label%3A%22contribution+welcome%22)|[Suave](https://github.com/SuaveIO/suave/issues?q=is%3Aopen+is%3Aissue+label%3Ahardness-easy)|[OpenRA](https://github.com/OpenRA/OpenRA/issues?q=is%3Aopen+is%3Aissue+label%3AEasy)|[PowerShell](https://github.com/powershell/powershell/issues?q=is%3Aopen+is%3Aissue+label%3AUp-for-Grabs)|[coala](https://github.com/coala/coala/issues?q=is%3Aopen+is%3Aissue+label%3Adifficulty%2Flow+label%3Adifficulty%2Fnewcomer)|[moment](https://github.com/moment/moment/issues?q=is%3Aopen+is%3Aissue+label%3AUp-For-Grabs)| -|[![ava](https://avatars0.githubusercontent.com/u/8527916?v=3&s=100)](https://github.com/avajs/ava/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+for+beginner%22)|[![freeCodeCamp](https://avatars0.githubusercontent.com/u/9892522?v=3&s=100)](https://github.com/freeCodeCamp/freeCodeCamp/issues?q=is%3Aopen+is%3Aissue+label%3Afirst-timers-only)|[![webpack](https://avatars3.githubusercontent.com/u/2105791?v=3&s=100)](https://github.com/webpack/webpack/issues?q=is%3Aopen+is%3Aissue+label%3A%22D1%3A+Easy+%28Contrib.+Difficulty%29%22)|[![hoodie](https://avatars1.githubusercontent.com/u/1888826?v=3&s=100)](https://github.com/hoodiehq/hoodie/issues?q=is%3Aopen+is%3Aissue+label%3Afirst-timers-only)|[![pouchdb](https://avatars3.githubusercontent.com/u/3406112?v=3&s=100)](https://github.com/pouchdb/pouchdb/issues?q=is%3Aopen+is%3Aissue+label%3A%22first+timers+only%22)|[![neovim](https://avatars0.githubusercontent.com/u/6471485?v=3&s=100)](https://github.com/neovim/neovim/issues?q=is%3Aopen+is%3Aissue+label%3Aentry-level)|[![babel](https://avatars2.githubusercontent.com/u/9637642?v=3&s=100)](https://github.com/babel/babel/issues?q=is%3Aopen+is%3Aissue+label%3Abeginner-friendly) |[](https://github.com/adobe/brackets/labels/Starter%20bug)| -|[ava](https://github.com/avajs/ava/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+for+beginner%22)|[freeCodeCamp](https://github.com/freeCodeCamp/freeCodeCamp/issues?q=is%3Aopen+is%3Aissue+label%3Afirst-timers-only)|[webpack](https://github.com/webpack/webpack/issues?q=is%3Aopen+is%3Aissue+label%3A%22D1%3A+Easy+%28Contrib.+Difficulty%29%22)|[hoodie](https://github.com/hoodiehq/hoodie/issues?q=is%3Aopen+is%3Aissue+label%3Afirst-timers-only)|[pouchdb](https://github.com/pouchdb/pouchdb/issues?q=is%3Aopen+is%3Aissue+label%3A%22first+timers+only%22)|[neovim](https://github.com/neovim/neovim/issues?q=is%3Aopen+is%3Aissue+label%3Aentry-level)|[babel](https://github.com/babel/babel/issues?q=is%3Aopen+is%3Aissue+label%3Abeginner-friendly) |[brackets](https://github.com/adobe/brackets/labels/Starter%20bug)| -| [![Node.js](https://avatars1.githubusercontent.com/u/9950313?v=3&s=100)](https://github.com/nodejs/node/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+contribution%22)|[](https://github.com/Semantic-Org/Semantic-UI-React/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+contribution%22)| -| [Node.js](https://github.com/nodejs/node/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+contribution%22) |[Semantic-UI-React](https://github.com/Semantic-Org/Semantic-UI-React/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+contribution%22) | From cc5db17cc95500e581934a8733dcc6cf5e0fa69e Mon Sep 17 00:00:00 2001 From: namanpreetsingh Date: Sat, 21 Oct 2017 20:20:52 +0530 Subject: [PATCH 167/195] Change formatting of line 99 by adding line breaks --- translations/README.hi.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/translations/README.hi.md b/translations/README.hi.md index 042bd38ea29..aaf762f3842 100644 --- a/translations/README.hi.md +++ b/translations/README.hi.md @@ -96,9 +96,9 @@ git push origin <अपना नाम जोड़> ## यहाँ से कहाँ जाएं ? -Github पे अपने पहले योगदान की खुश में जश्न मनाएं और अपने दोस्तों के साथ शेयर करें [वेब एप्प](https://roshanjossey.github.io/first-contributions/#social-share) पे जाके| -आप हमारी स्लैक टीम को ज्वाइन कर सकते हैं अगर आपको कोई मदद चाहिए या आपके कोई परेशानी हों| [स्लैक पे ज्वाइन करें](https://firstcontributions.herokuapp.com) -अब आप और प्रोजेक्ट्स में कंट्रीब्यूट करना शुरू कर सकते हैं| हमने आपके लिए एक लिस्ट बनायीं है जो कि बहुत आसान मुद्दे हैं| [प्रोजेक्ट्स कि लिस्ट](https://roshanjossey.github.io/first-contributions/#project-list) +Github पे अपने पहले योगदान की खुश में जश्न मनाएं और अपने दोस्तों के साथ शेयर करें [वेब एप्प](https://roshanjossey.github.io/first-contributions/#social-share) पे जाके|
+आप हमारी स्लैक टीम को ज्वाइन कर सकते हैं अगर आपको कोई मदद चाहिए या आपके कोई परेशानी हों| [स्लैक पे ज्वाइन करें](https://firstcontributions.herokuapp.com)
+अब आप और प्रोजेक्ट्स में कंट्रीब्यूट करना शुरू कर सकते हैं| हमने आपके लिए एक लिस्ट बनायीं है जो कि बहुत आसान मुद्दे हैं| [प्रोजेक्ट्स कि लिस्ट](https://roshanjossey.github.io/first-contributions/#project-list)
## अन्य टूल का उपयोग करके ट्यूटोरियल From 4aa248ec01c03835c015104f477230fdfde9d32f Mon Sep 17 00:00:00 2001 From: vrs-git Date: Sat, 21 Oct 2017 21:18:10 +0530 Subject: [PATCH 168/195] Add Vishal to Contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index c561325202e..29d079e59af 100644 --- a/Contributors.md +++ b/Contributors.md @@ -912,3 +912,4 @@ - [TheZenti](https://github.com/TheZenti) - [Matheus Lucena] (https://github.com/matehuslucena) - [Galleria](https://github.com/Galleria) +- [Vishal Raj Shukla](https://github.com/vrs-git) From b092de34da05204a677ac7cc10bbd297c3f60258 Mon Sep 17 00:00:00 2001 From: masta-bhawk Date: Sat, 21 Oct 2017 10:51:37 -0500 Subject: [PATCH 169/195] add masta-bhawk --- Contributors.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Contributors.md b/Contributors.md index c561325202e..40ed6ec0f95 100644 --- a/Contributors.md +++ b/Contributors.md @@ -1,4 +1,4 @@ -- [Shubham Chauhan](https://github.com/ShubhamSinghChauhan) +- [Shubham Chauhan](https://github.com/ShubhamSinghChauhan) - [Gaurav Rai](https://github.com/ThinkHattke) - [Mintoo Kumar](https://github.com/mintoo511) - [Rubén Ortiz](https://github.com/rubenortiz) @@ -912,3 +912,4 @@ - [TheZenti](https://github.com/TheZenti) - [Matheus Lucena] (https://github.com/matehuslucena) - [Galleria](https://github.com/Galleria) +- [masta-bhawk](https://github.com/masta-bhawk) From 56c528512cd51986062ce6239c874fb1244d9cc7 Mon Sep 17 00:00:00 2001 From: gipsi Date: Sat, 21 Oct 2017 17:04:39 +0100 Subject: [PATCH 170/195] Update Contributors.md --- Contributors.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Contributors.md b/Contributors.md index c561325202e..e9d70bfa937 100644 --- a/Contributors.md +++ b/Contributors.md @@ -1,5 +1,5 @@ - [Shubham Chauhan](https://github.com/ShubhamSinghChauhan) -- [Gaurav Rai](https://github.com/ThinkHattke) +- [Gaurav Rai](https://github.com/ThinkHattke) - [Mintoo Kumar](https://github.com/mintoo511) - [Rubén Ortiz](https://github.com/rubenortiz) - [Petrov Dumitru](https://github.com/dp97) From e291fcdf6b34024420c003565aa8dd84e9506578 Mon Sep 17 00:00:00 2001 From: AJ Berman Date: Sat, 21 Oct 2017 12:29:46 -0400 Subject: [PATCH 171/195] Add to Contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index c561325202e..51c05218e61 100644 --- a/Contributors.md +++ b/Contributors.md @@ -912,3 +912,4 @@ - [TheZenti](https://github.com/TheZenti) - [Matheus Lucena] (https://github.com/matehuslucena) - [Galleria](https://github.com/Galleria) +- [AJ Berman](https://github.com/AlexanderAJBerman) From bb446ab51c273b963d8050a5887b8cf95e3640d0 Mon Sep 17 00:00:00 2001 From: Kirill Motkov Date: Sat, 21 Oct 2017 19:51:04 +0300 Subject: [PATCH 172/195] Add Kirill-Motkov to Contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index c561325202e..a74f5136bbf 100644 --- a/Contributors.md +++ b/Contributors.md @@ -912,3 +912,4 @@ - [TheZenti](https://github.com/TheZenti) - [Matheus Lucena] (https://github.com/matehuslucena) - [Galleria](https://github.com/Galleria) +- [Kirill Motkov](https://github.com/sosiska) From f07171408316d12f4450369d7c89a5ca293d102c Mon Sep 17 00:00:00 2001 From: Jibin Mathews Date: Sat, 21 Oct 2017 22:56:03 +0530 Subject: [PATCH 173/195] Update Contributors.md --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index c561325202e..54a215e349c 100644 --- a/Contributors.md +++ b/Contributors.md @@ -145,6 +145,7 @@ - [Adarsh Lilha](https://github.com/adarshlilha) - [Meghana](https://github.com/meMegna) - [mrluissan](https://github.com/mrluissan) +- [Jibin Mathews](https://github.com/jazzyarchitects) - [ramseyjacob](https://github.com/ramseyjacob) - [Nithin K Vijayan](https://github.com/nithin-vijayan) - [Karan Deep Batra](https://github.com/krnbatra) From 906b8106cf04cc825a82570200192ff110c0ed3f Mon Sep 17 00:00:00 2001 From: Nicky Meuleman Date: Sat, 21 Oct 2017 20:12:03 +0200 Subject: [PATCH 174/195] minor broken link fix andere talen link up a directory first before going to file. --- translations/README.nl.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/README.nl.md b/translations/README.nl.md index c9e15cac40c..5c35e2b76e5 100644 --- a/translations/README.nl.md +++ b/translations/README.nl.md @@ -9,7 +9,7 @@ Het kan helpen om de artikelen te lezen en de video's te bekijken, maar niets is fork this repository -#### *Lees dit in [andere talen](LANGUAGES.md)* +#### *Lees dit in [andere talen](../LANGUAGES.md)* Indien je git nog niet hebt op je systeem, [ installeer het dan eerst ]( https://help.github.com/articles/set-up-git/ ) From 8d2cbff2aa5ac3695f9cad63f998aa5e760e9300 Mon Sep 17 00:00:00 2001 From: Joseph Davidson Date: Sat, 21 Oct 2017 21:13:04 +0300 Subject: [PATCH 175/195] share button design update --- .../components/SocialShare/SocialShare.css | 22 ++++++------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/app/src/components/SocialShare/SocialShare.css b/app/src/components/SocialShare/SocialShare.css index 3ee51e735ca..c4231b4dd71 100644 --- a/app/src/components/SocialShare/SocialShare.css +++ b/app/src/components/SocialShare/SocialShare.css @@ -2,7 +2,8 @@ display: flex; flex-direction: column; align-items: center; - padding: 1em; + padding: 1.2em; + background: #4b4949; } #social-share > h2 { @@ -19,20 +20,11 @@ display: flex; align-items: center; justify-content: center; - width: 136px; - height: 160px; - margin: .25em; - background-color: rgb(255, 255, 255); + width: 90px; + height: 90px; + margin: 15px; border-radius: 2px; - box-shadow: rgba(0, 0, 0, 0.12) 0px 1px 6px, rgba(0, 0, 0, 0.12) 0px 1px 4px; - -webkit-transition: box-shadow .1s ease-in-out; - transition: box-shadow .1s ease-in-out; + background: #4b4949; + border: solid white 4px; } -.icon-card:hover{ - box-shadow: rgba(0, 0, 0, 0.16) 0px 3px 10px, rgba(0, 0, 0, 0.23) 0px 3px 10px; -} - -.twitter { - background-color: rgb(29, 202, 255); -} From 96f4e08cf1c8f2f765f6f3178ae9e88881fdae8c Mon Sep 17 00:00:00 2001 From: Joseph Davidson Date: Sat, 21 Oct 2017 21:17:44 +0300 Subject: [PATCH 176/195] small padding fix for btn design --- app/src/components/SocialShare/SocialShare.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/components/SocialShare/SocialShare.css b/app/src/components/SocialShare/SocialShare.css index c4231b4dd71..ee00d59b287 100644 --- a/app/src/components/SocialShare/SocialShare.css +++ b/app/src/components/SocialShare/SocialShare.css @@ -2,7 +2,7 @@ display: flex; flex-direction: column; align-items: center; - padding: 1.2em; + padding: 1em; background: #4b4949; } @@ -22,7 +22,7 @@ justify-content: center; width: 90px; height: 90px; - margin: 15px; + margin: 1.1em; border-radius: 2px; background: #4b4949; border: solid white 4px; From 1b772311342c8d17c84294315bb7f9aa11bc4e2b Mon Sep 17 00:00:00 2001 From: Shadab Khan Date: Sun, 22 Oct 2017 00:10:03 +0530 Subject: [PATCH 177/195] Add shadab-khan to Contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index c561325202e..508f64c9252 100644 --- a/Contributors.md +++ b/Contributors.md @@ -1,3 +1,4 @@ +- [Shadab Khan](https://github.com/shadabk96) - [Shubham Chauhan](https://github.com/ShubhamSinghChauhan) - [Gaurav Rai](https://github.com/ThinkHattke) - [Mintoo Kumar](https://github.com/mintoo511) From 071942b9a96f5a81f4cbbb295ebc0ce1321405e4 Mon Sep 17 00:00:00 2001 From: "Emmanuel Odianosen .O" Date: Sat, 21 Oct 2017 19:58:51 +0100 Subject: [PATCH 178/195] Add emmaodia to Contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index c561325202e..dea31c51dfe 100644 --- a/Contributors.md +++ b/Contributors.md @@ -912,3 +912,4 @@ - [TheZenti](https://github.com/TheZenti) - [Matheus Lucena] (https://github.com/matehuslucena) - [Galleria](https://github.com/Galleria) +- [emmaodia](https://github.com/emmaodia) From 0d919035d5f3dc10a48455f7418e20611974a8c5 Mon Sep 17 00:00:00 2001 From: Manuel Romero <> Date: Sat, 21 Oct 2017 15:05:01 -0500 Subject: [PATCH 179/195] First-contribution --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 57e480c9cfb..64098bd06e5 100644 --- a/Contributors.md +++ b/Contributors.md @@ -916,3 +916,4 @@ - [Galleria](https://github.com/Galleria) - [Vishal Raj Shukla](https://github.com/vrs-git) - [emmaodia](https://github.com/emmaodia) +- [Manuel Romero](https://github.com/Manu8083) From df26a7210bf79e75eb238c96270e312de03de92d Mon Sep 17 00:00:00 2001 From: Fadma Saadaoui <32970250+ninjandroid@users.noreply.github.com> Date: Sat, 21 Oct 2017 21:23:41 +0100 Subject: [PATCH 180/195] add ninjandroid --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 77d54582723..49fc6b58ba8 100644 --- a/Contributors.md +++ b/Contributors.md @@ -920,3 +920,4 @@ - [masta-bhawk](https://github.com/masta-bhawk) - [Vishal Raj Shukla](https://github.com/vrs-git) - [emmaodia](https://github.com/emmaodia) +- [ninjandroid](https://github.com/ninjandroid) From 76e0740a467a4b9de122856d1dea74572e298873 Mon Sep 17 00:00:00 2001 From: allykates Date: Sat, 21 Oct 2017 16:37:28 -0400 Subject: [PATCH 181/195] Add myself to contributors --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index 77d54582723..6727dd40f56 100644 --- a/Contributors.md +++ b/Contributors.md @@ -920,3 +920,4 @@ - [masta-bhawk](https://github.com/masta-bhawk) - [Vishal Raj Shukla](https://github.com/vrs-git) - [emmaodia](https://github.com/emmaodia) +- [allykates](https://github.com/allykates) From 019448b3ba9a6ea36e6d49e1410b40f0db4b822b Mon Sep 17 00:00:00 2001 From: decantr Date: Sat, 21 Oct 2017 23:07:45 +0100 Subject: [PATCH 182/195] add decantr to Contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index d27cbd57e42..3ddee533d6d 100644 --- a/Contributors.md +++ b/Contributors.md @@ -924,3 +924,4 @@ - [Manuel Romero](https://github.com/Manu8083) - [ninjandroid](https://github.com/ninjandroid) - [allykates](https://github.com/allykates) +- [decantr](https://github.com/decantr) From ba6d9f5a3b356e004dd18ad4d14ec9f6253fac2c Mon Sep 17 00:00:00 2001 From: Long Le Date: Sun, 22 Oct 2017 00:36:32 +0200 Subject: [PATCH 183/195] Add long --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index d27cbd57e42..3bb66c8591d 100644 --- a/Contributors.md +++ b/Contributors.md @@ -924,3 +924,4 @@ - [Manuel Romero](https://github.com/Manu8083) - [ninjandroid](https://github.com/ninjandroid) - [allykates](https://github.com/allykates) +- [lthlong](https://github.com/lthlong) From cf56e954d460a9a589601f48afbced782fa6a207 Mon Sep 17 00:00:00 2001 From: Ian Bromwich Date: Sun, 22 Oct 2017 00:32:38 +0100 Subject: [PATCH 184/195] Add: added brumgb --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index d27cbd57e42..443f34099f6 100644 --- a/Contributors.md +++ b/Contributors.md @@ -924,3 +924,4 @@ - [Manuel Romero](https://github.com/Manu8083) - [ninjandroid](https://github.com/ninjandroid) - [allykates](https://github.com/allykates) +- [BrumGB](https://github.com/brumgb) From 18dc26a5e6a5d2fc07ee5da999e434bd68aefb43 Mon Sep 17 00:00:00 2001 From: Ian Bromwich Date: Sun, 22 Oct 2017 00:34:58 +0100 Subject: [PATCH 185/195] Fix: fixed formatting --- Contributors.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Contributors.md b/Contributors.md index 443f34099f6..89bb5b342b0 100644 --- a/Contributors.md +++ b/Contributors.md @@ -813,7 +813,7 @@ - [Augusto Queiroz](https://github.com/AugustoQueiroz) - [LRThesier](https://github.com/lrthesier) - [Brianna Florio](https://github.com/Bflorio14) -- [Joe Wilson] (https://github.com/jaw0608) +- [Joe Wilson](https://github.com/jaw0608) - [Paul Chabot](https://github.com/paulch4bot) - [Tim Guenthner](https://github.com/aerotog) - [Jhonatan Casale](https://github.com/jhonatancasale) @@ -855,7 +855,7 @@ - [Berkay Ersengun](https://github.com/berkayersengun) - [Guy Livni](https://github.com/GuyLivni) - [Gilad Bar](https://github.com/GomuGilad6) -- [Daniel Benton] (https://github.com/dbenton2) +- [Daniel Benton](https://github.com/dbenton2) - [Cesar Omar](https://github.com/wasa4587) - [Huntley Reep](https://github.com/huntleyreep) - [dtk](https://github.com/dtk0528) @@ -878,7 +878,7 @@ - [Trevor Roest](https://github.com/twroest) - [Sukeer](https://github.com/Sukeer) - [Rohit Mathew](https://github.com/rohitjmathew/) -- [Michele Armellini] (https://github.com/armaDio) +- [Michele Armellini](https://github.com/armaDio) - [syamkumar](https://github.com/syam3526/) - [awesomejerry](https://github.com/awesomejerry) - [Nathan Mkaya](https://github.com/nathanmkaya/) @@ -897,7 +897,7 @@ - [Dulantha_teshan](https://github.com/DTeshan) - [Hussain Mustafa](https://github.com/hussainbadri21) - [Dilan Nilaksha](https://github.com/jpdilan) gd one dudes :) -- [Sangeetha Sasikumar] (https://github.com/Sangeetha-007) +- [Sangeetha Sasikumar](https://github.com/Sangeetha-007) - [Ple](https://github.com/plemomay) - [Shreyansh Dwivedi](https://github.com/shreyanshdwivedi) - [Akani](https://github.com/akanijade) @@ -914,14 +914,14 @@ - [Ahmad Javed](https://github.com/ahmadjaved97) - [BinhPhamKMA](https://github.com/BinhPhamKMA) - [TheZenti](https://github.com/TheZenti) -- [Matheus Lucena] (https://github.com/matehuslucena) +- [Matheus Lucena](https://github.com/matehuslucena) - [Galleria](https://github.com/Galleria) - [Kirill Motkov](https://github.com/sosiska) - [AJ Berman](https://github.com/AlexanderAJBerman) - [masta-bhawk](https://github.com/masta-bhawk) - [Vishal Raj Shukla](https://github.com/vrs-git) - [emmaodia](https://github.com/emmaodia) -- [Manuel Romero](https://github.com/Manu8083) +- [Manuel Romero](https://github.com/Manu8083) - [ninjandroid](https://github.com/ninjandroid) - [allykates](https://github.com/allykates) -- [BrumGB](https://github.com/brumgb) +- [BrumGB](https://github.com/brumgb) \ No newline at end of file From c6c86ea37848f7fb47c82d9652775b2823ced802 Mon Sep 17 00:00:00 2001 From: Dario Gabriel Date: Sat, 21 Oct 2017 20:42:51 -0300 Subject: [PATCH 186/195] Add dario-gabriel to Contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index d27cbd57e42..012d1eb67a7 100644 --- a/Contributors.md +++ b/Contributors.md @@ -924,3 +924,4 @@ - [Manuel Romero](https://github.com/Manu8083) - [ninjandroid](https://github.com/ninjandroid) - [allykates](https://github.com/allykates) +- [Dario Gabriel](https://github.com/dariogabriel113) From 29e7c60144e92a858838f1fdcd48798b41da9a4a Mon Sep 17 00:00:00 2001 From: Melisa Im Date: Sat, 21 Oct 2017 17:13:52 -0700 Subject: [PATCH 187/195] Add Melisa Im to Contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index d27cbd57e42..165fa37c05c 100644 --- a/Contributors.md +++ b/Contributors.md @@ -924,3 +924,4 @@ - [Manuel Romero](https://github.com/Manu8083) - [ninjandroid](https://github.com/ninjandroid) - [allykates](https://github.com/allykates) +- [melisaim](https://github.com/MelisaIm) From 40fef799cb4b751037e3c09eed9c6e4f7c8fe10a Mon Sep 17 00:00:00 2001 From: Ian Myrfield Date: Sat, 21 Oct 2017 18:17:59 -0700 Subject: [PATCH 188/195] Adding name for hacktoberfest --- Contributors.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Contributors.md b/Contributors.md index d27cbd57e42..7a62c3af7df 100644 --- a/Contributors.md +++ b/Contributors.md @@ -924,3 +924,5 @@ - [Manuel Romero](https://github.com/Manu8083) - [ninjandroid](https://github.com/ninjandroid) - [allykates](https://github.com/allykates) +- [imyrfield](https://github.com/imyrfield) + From 7eb80c9ba07a311a06528eb67f089a128337994e Mon Sep 17 00:00:00 2001 From: Charles Monson Date: Sat, 21 Oct 2017 20:59:07 -0500 Subject: [PATCH 189/195] Add charlesmonson to Contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index d27cbd57e42..5515597dfae 100644 --- a/Contributors.md +++ b/Contributors.md @@ -924,3 +924,4 @@ - [Manuel Romero](https://github.com/Manu8083) - [ninjandroid](https://github.com/ninjandroid) - [allykates](https://github.com/allykates) +- [charlesmonson](https://github.com/charlesmonson) From 70db0334ed0b4128ed6db23b3110123351a7773d Mon Sep 17 00:00:00 2001 From: RandallWhitlock Date: Sat, 21 Oct 2017 22:48:11 -0400 Subject: [PATCH 190/195] Add Randall Whitlock to Contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index d27cbd57e42..7b3291bb1cc 100644 --- a/Contributors.md +++ b/Contributors.md @@ -924,3 +924,4 @@ - [Manuel Romero](https://github.com/Manu8083) - [ninjandroid](https://github.com/ninjandroid) - [allykates](https://github.com/allykates) +- [Randall Whitlock](https://github.com/randallwhitlock) From 5eb0a6a77e2e3c1292f11f0d740c6b120010c131 Mon Sep 17 00:00:00 2001 From: Dylan Date: Sat, 21 Oct 2017 23:43:52 -0400 Subject: [PATCH 191/195] Added Pavillin to Contributors.md --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index d27cbd57e42..0cb1cb9069b 100644 --- a/Contributors.md +++ b/Contributors.md @@ -924,3 +924,4 @@ - [Manuel Romero](https://github.com/Manu8083) - [ninjandroid](https://github.com/ninjandroid) - [allykates](https://github.com/allykates) +- [Pavillin](https://github.com/Pavillin) From db4b8e20451731a26144ac4d2fa912dd05651c75 Mon Sep 17 00:00:00 2001 From: Akshay Date: Sat, 21 Oct 2017 23:24:08 -0500 Subject: [PATCH 192/195] Add Akshay Ramesh to Contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index d27cbd57e42..796ecc47040 100644 --- a/Contributors.md +++ b/Contributors.md @@ -924,3 +924,4 @@ - [Manuel Romero](https://github.com/Manu8083) - [ninjandroid](https://github.com/ninjandroid) - [allykates](https://github.com/allykates) +- [Akshay Ramesh](https://github.com/AkshayRameshAppDEV) From 558377c18c44eca9d94df7da72aa38812fbc1b33 Mon Sep 17 00:00:00 2001 From: Muh Farid Zia Date: Sun, 22 Oct 2017 12:44:31 +0800 Subject: [PATCH 193/195] Add muhfaridzia to Contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index d27cbd57e42..a5b3e1be1a6 100644 --- a/Contributors.md +++ b/Contributors.md @@ -924,3 +924,4 @@ - [Manuel Romero](https://github.com/Manu8083) - [ninjandroid](https://github.com/ninjandroid) - [allykates](https://github.com/allykates) +- [MuhFaridZia](https://github.com/mfaridzia) From e2704d234f2a181466c44265df3edd70cf66ac54 Mon Sep 17 00:00:00 2001 From: leomi7 Date: Sun, 22 Oct 2017 10:43:44 +0530 Subject: [PATCH 194/195] Add Meghna Ayyar to Contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index d27cbd57e42..491b69ac224 100644 --- a/Contributors.md +++ b/Contributors.md @@ -924,3 +924,4 @@ - [Manuel Romero](https://github.com/Manu8083) - [ninjandroid](https://github.com/ninjandroid) - [allykates](https://github.com/allykates) +- [Meghna Ayyar][https://github.com/leomi7] \ No newline at end of file From 6f40020833279faf0f15750a1f68b0b37a858bd4 Mon Sep 17 00:00:00 2001 From: Roy Cai Date: Sun, 22 Oct 2017 13:38:23 +0800 Subject: [PATCH 195/195] Add roy-sung to Contributors list --- Contributors.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Contributors.md b/Contributors.md index d27cbd57e42..8f23718e88a 100644 --- a/Contributors.md +++ b/Contributors.md @@ -924,3 +924,4 @@ - [Manuel Romero](https://github.com/Manu8083) - [ninjandroid](https://github.com/ninjandroid) - [allykates](https://github.com/allykates) +- [Roy Sung](https://github.com/roysung) \ No newline at end of file