From a6117aa9b7f9161bbd9a7bebe2534f8261926f87 Mon Sep 17 00:00:00 2001 From: Leeo Date: Sat, 27 Aug 2022 11:23:40 +0900 Subject: [PATCH 01/17] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 9e114a7..ff3a7b2 100644 --- a/README.md +++ b/README.md @@ -5,3 +5,4 @@ 1. 화면 왼쪽 위에 Fork 버튼을 눌러 레포지토리를 포크 해주세요. 2. Code를 눌러서 git Clone을 해주세요. 혹은 GUI에서 git clone을 진행해주세요. 3. 각각의 챕터에 가서 다시 readme를 읽으면서 진행해주세요! +4. 레포지토리 마음에 드셨으면 Star를 눌러주세요! From 4d0c114305a082b488ab0764bc5b6739be7c758a Mon Sep 17 00:00:00 2001 From: Default Profile Date: Mon, 13 Mar 2023 15:41:28 +0900 Subject: [PATCH 02/17] add email, gitID --- 3.commit/prfoile.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/3.commit/prfoile.txt b/3.commit/prfoile.txt index 9522792..281ace1 100644 --- a/3.commit/prfoile.txt +++ b/3.commit/prfoile.txt @@ -1,2 +1,2 @@ -email : -gitID : +email : rain@uzen.net +gitID : WoonyWoo From 11bcf7578f371b9d69a215cf2e26ff429c7ca5eb Mon Sep 17 00:00:00 2001 From: WoonWoo Lee <72733306+WoonyWoo@users.noreply.github.com> Date: Mon, 13 Mar 2023 15:43:46 +0900 Subject: [PATCH 03/17] Update prfoile.txt --- 3.commit/prfoile.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/3.commit/prfoile.txt b/3.commit/prfoile.txt index 281ace1..4b1e652 100644 --- a/3.commit/prfoile.txt +++ b/3.commit/prfoile.txt @@ -1,2 +1,2 @@ -email : rain@uzen.net -gitID : WoonyWoo +email : +gitID : From 271ccb045dd8aac5395e238a2b3b34ff75678bb8 Mon Sep 17 00:00:00 2001 From: Default Profile Date: Mon, 13 Mar 2023 15:50:00 +0900 Subject: [PATCH 04/17] =?UTF-8?q?=ED=80=98=EC=8A=A4=ED=8A=B8=20=EC=A7=84?= =?UTF-8?q?=ED=96=89,=20=EA=B5=AC=EC=8A=AC=2012=EA=B0=9C,=20=EB=82=98?= =?UTF-8?q?=EB=AD=87=EA=B0=80=EC=A7=80=206=EA=B0=9C=20-=20=ED=98=84?= =?UTF-8?q?=ED=83=80=EC=98=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 4.branchANdMerge/Quests.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/4.branchANdMerge/Quests.txt b/4.branchANdMerge/Quests.txt index c44f904..fe6e1db 100644 --- a/4.branchANdMerge/Quests.txt +++ b/4.branchANdMerge/Quests.txt @@ -1,2 +1,2 @@ -깨진 구슬조각 (0/50) -낡은 나뭇가지(0/40) +깨진 구슬조각 (12/50) +낡은 나뭇가지(6/40) From 7fc8888be30329c5111f6f92e303d7002bc22d40 Mon Sep 17 00:00:00 2001 From: Default Profile Date: Mon, 13 Mar 2023 15:51:21 +0900 Subject: [PATCH 05/17] =?UTF-8?q?=ED=80=98=EC=8A=A4=ED=8A=B8=20=EC=A7=84?= =?UTF-8?q?=ED=96=89,=20=EA=B5=AC=EC=8A=AC=2030=EA=B0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 4.branchANdMerge/Quests.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/4.branchANdMerge/Quests.txt b/4.branchANdMerge/Quests.txt index fe6e1db..4be424a 100644 --- a/4.branchANdMerge/Quests.txt +++ b/4.branchANdMerge/Quests.txt @@ -1,2 +1,2 @@ -깨진 구슬조각 (12/50) +깨진 구슬조각 (30/50) 낡은 나뭇가지(6/40) From 995636061a324aff401751b77417c0a424c64749 Mon Sep 17 00:00:00 2001 From: Default Profile Date: Mon, 13 Mar 2023 15:51:45 +0900 Subject: [PATCH 06/17] =?UTF-8?q?=ED=80=98=EC=8A=A4=ED=8A=B8=20=EC=99=84?= =?UTF-8?q?=EB=A3=8C,=20=EA=B5=AC=EC=8A=AC=2050=EA=B0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 4.branchANdMerge/Quests.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/4.branchANdMerge/Quests.txt b/4.branchANdMerge/Quests.txt index 4be424a..2ea535b 100644 --- a/4.branchANdMerge/Quests.txt +++ b/4.branchANdMerge/Quests.txt @@ -1,2 +1,2 @@ -깨진 구슬조각 (30/50) +깨진 구슬조각 (50/50) 낡은 나뭇가지(6/40) From c89f2d2222591c547139a90991bad96cc5ecd6f6 Mon Sep 17 00:00:00 2001 From: Default Profile Date: Mon, 13 Mar 2023 15:53:51 +0900 Subject: [PATCH 07/17] =?UTF-8?q?=ED=80=98=EC=8A=A4=ED=8A=B8=20=EC=A7=84?= =?UTF-8?q?=ED=96=89,=20=EB=82=98=EB=AD=87=EA=B0=80=EC=A7=80=2020=EA=B0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 4.branchANdMerge/Quests.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/4.branchANdMerge/Quests.txt b/4.branchANdMerge/Quests.txt index fe6e1db..dd2aa7c 100644 --- a/4.branchANdMerge/Quests.txt +++ b/4.branchANdMerge/Quests.txt @@ -1,2 +1,2 @@ 깨진 구슬조각 (12/50) -낡은 나뭇가지(6/40) +낡은 나뭇가지(20/40) From 1d766bf49874bec2f9bb86c5f9a3b2066983faed Mon Sep 17 00:00:00 2001 From: Default Profile Date: Mon, 13 Mar 2023 15:54:13 +0900 Subject: [PATCH 08/17] =?UTF-8?q?=ED=80=98=EC=8A=A4=ED=8A=B8=20=EC=99=84?= =?UTF-8?q?=EB=A3=8C,=20=EB=82=98=EB=AD=87=EA=B0=80=EC=A7=80=2040=EA=B0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 4.branchANdMerge/Quests.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/4.branchANdMerge/Quests.txt b/4.branchANdMerge/Quests.txt index dd2aa7c..c671eda 100644 --- a/4.branchANdMerge/Quests.txt +++ b/4.branchANdMerge/Quests.txt @@ -1,2 +1,2 @@ 깨진 구슬조각 (12/50) -낡은 나뭇가지(20/40) +낡은 나뭇가지(40/40) From 5009b568e06d36de2f10cd8d8ec18b60ea1db09f Mon Sep 17 00:00:00 2001 From: Default Profile Date: Mon, 13 Mar 2023 17:02:50 +0900 Subject: [PATCH 09/17] =?UTF-8?q?=EC=95=84=EB=B2=84=EC=A7=80=EA=B0=80=20?= =?UTF-8?q?=EB=B0=A9=EC=97=90=20=EB=93=A4=EC=96=B4=EA=B0=80=EC=8B=A0?= =?UTF-8?q?=EB=8B=A4=20=EC=98=A4=ED=83=80=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 6.stash/hasTypo.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/6.stash/hasTypo.txt b/6.stash/hasTypo.txt index a4b9065..5dcfe2a 100644 --- a/6.stash/hasTypo.txt +++ b/6.stash/hasTypo.txt @@ -1 +1 @@ -아버지 가방에 들어가신댜규요? +아버지가 방에 들어가신댜구요? From aaa5e3e293c19b2f93238f9d7cb5cd4458f2f49a Mon Sep 17 00:00:00 2001 From: Default Profile Date: Mon, 13 Mar 2023 17:04:22 +0900 Subject: [PATCH 10/17] complete todoList --- 6.stash/todoList.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/6.stash/todoList.txt b/6.stash/todoList.txt index e69de29..6c48120 100644 --- a/6.stash/todoList.txt +++ b/6.stash/todoList.txt @@ -0,0 +1,2 @@ +1. 밥을 먹는다 +2. 운동을 한다 \ No newline at end of file From 4fe4be5d35045b8b45a43657e9a2944e02fdd421 Mon Sep 17 00:00:00 2001 From: Default Profile Date: Mon, 13 Mar 2023 18:04:21 +0900 Subject: [PATCH 11/17] complete emailm gitId --- 6.stash/prfoile.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/6.stash/prfoile.txt b/6.stash/prfoile.txt index 20cf4d0..f59a271 100644 --- a/6.stash/prfoile.txt +++ b/6.stash/prfoile.txt @@ -1,2 +1,2 @@ -email : 이메일을 다시 작성해주세요 -gitID : 깃아이디를 입력해주세요 +email : 이메일 작성함 +gitID : m1zz From d0eaeba557d394bcb14134d824f3e75391b7ed2f Mon Sep 17 00:00:00 2001 From: Default Profile Date: Mon, 13 Mar 2023 18:16:31 +0900 Subject: [PATCH 12/17] add facebook follow --- "7.cherryPick/\355\214\224\353\241\234\354\232\260" | 1 + 1 file changed, 1 insertion(+) diff --git "a/7.cherryPick/\355\214\224\353\241\234\354\232\260" "b/7.cherryPick/\355\214\224\353\241\234\354\232\260" index 2fa30c2..03912b7 100644 --- "a/7.cherryPick/\355\214\224\353\241\234\354\232\260" +++ "b/7.cherryPick/\355\214\224\353\241\234\354\232\260" @@ -1 +1,2 @@ 기능 +1. facebook 팔로우 기능 \ No newline at end of file From 40555cbbc2d6e53c96aa7c65a4da9bc377c75d87 Mon Sep 17 00:00:00 2001 From: Default Profile Date: Mon, 13 Mar 2023 18:17:01 +0900 Subject: [PATCH 13/17] =?UTF-8?q?add=20facebook=20=EC=9C=BC=EB=A1=9C=20?= =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- "7.cherryPick/\353\241\234\352\267\270\354\235\270" | 1 + 1 file changed, 1 insertion(+) diff --git "a/7.cherryPick/\353\241\234\352\267\270\354\235\270" "b/7.cherryPick/\353\241\234\352\267\270\354\235\270" index 2fa30c2..5d7a634 100644 --- "a/7.cherryPick/\353\241\234\352\267\270\354\235\270" +++ "b/7.cherryPick/\353\241\234\352\267\270\354\235\270" @@ -1 +1,2 @@ 기능 +1. 페이스 북으로 로그인 \ No newline at end of file From d93bdd7aa5a34e0a580f8e8eb35d0268cb3c4d00 Mon Sep 17 00:00:00 2001 From: Default Profile Date: Tue, 14 Mar 2023 10:23:39 +0900 Subject: [PATCH 14/17] =?UTF-8?q?finish=20=EC=9E=A1=EC=B4=88=EB=BD=91?= =?UTF-8?q?=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 9.rebase/plant | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/9.rebase/plant b/9.rebase/plant index f3033bb..6fadfa8 100644 --- a/9.rebase/plant +++ b/9.rebase/plant @@ -1,3 +1,3 @@ -1. 잡초뽑기 (0/30) +1. 잡초뽑기 (30/30) 2. 물주기 (0/5) 3. 분갈이 (0/3) From 53f3f9278b773ac88c10cf4f4776ab178aaf4145 Mon Sep 17 00:00:00 2001 From: Default Profile Date: Tue, 14 Mar 2023 10:23:52 +0900 Subject: [PATCH 15/17] =?UTF-8?q?finish=20=EB=AC=BC=EC=A3=BC=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 9.rebase/plant | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/9.rebase/plant b/9.rebase/plant index 6fadfa8..966498b 100644 --- a/9.rebase/plant +++ b/9.rebase/plant @@ -1,3 +1,3 @@ 1. 잡초뽑기 (30/30) -2. 물주기 (0/5) +2. 물주기 (5/5) 3. 분갈이 (0/3) From cea43062720105c46acaf1866be2768118611528 Mon Sep 17 00:00:00 2001 From: Default Profile Date: Tue, 14 Mar 2023 10:46:21 +0900 Subject: [PATCH 16/17] Auto stash before rebase of "new-plant-food" --- 9.rebase/food | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/9.rebase/food b/9.rebase/food index bb5e882..c29ef48 100644 --- a/9.rebase/food +++ b/9.rebase/food @@ -1,3 +1,3 @@ -1. mainDish (0/1) -2. pasta (0/2) -3. drink (0/4) +1. mainDish (1/1) +2. pasta (2/2) +3. drink (4/4) From 2e50c095aeeaa1502457ab4f52fe2a66b27d707c Mon Sep 17 00:00:00 2001 From: Default Profile Date: Tue, 14 Mar 2023 11:02:54 +0900 Subject: [PATCH 17/17] =?UTF-8?q?add=20=EB=8B=89=EB=84=A4=EC=9E=84,=20?= =?UTF-8?q?=EA=B9=83=EC=95=84=EC=9D=B4=EB=94=94,=20=ED=9B=84=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 11. firstPR/guestBook | 1 + 1 file changed, 1 insertion(+) diff --git a/11. firstPR/guestBook b/11. firstPR/guestBook index 5f07315..9850c8a 100644 --- a/11. firstPR/guestBook +++ b/11. firstPR/guestBook @@ -1,2 +1,3 @@ |닉네임|gitID|후기| |------|------|------| +|리이오|Le20|덕분에 깃 이라는게 어떻게 돌아가는지 알게되었습니다!| \ No newline at end of file