Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
a6117aa
Update README.md
M1zz Aug 27, 2022
2c03186
add email, gitID
PorkbellyBigfan Apr 10, 2023
1576f66
Update prfoile.txt
PorkbellyBigfan Apr 10, 2023
ce6c039
rollback add gitID
PorkbellyBigfan Apr 10, 2023
4835dd4
퀘스트 진행, 구슬 8개 나뭇가지 4개
PorkbellyBigfan Apr 10, 2023
114395f
add marble 40
PorkbellyBigfan Apr 10, 2023
58fc126
add tree 19
PorkbellyBigfan Apr 10, 2023
67c2d42
add marble 50
PorkbellyBigfan Apr 10, 2023
ad5c9ba
Merge branch 'marbleBranch'
PorkbellyBigfan Apr 10, 2023
e422029
add tree 40
PorkbellyBigfan Apr 10, 2023
1aa60fd
Merge branch 'treeBranch' and 'marbleBranch'
PorkbellyBigfan Apr 10, 2023
9d4815c
change line
PorkbellyBigfan Apr 10, 2023
f0c2b91
add todoList content
PorkbellyBigfan Apr 12, 2023
2a92e07
Merge branch 'todoList' into develop
PorkbellyBigfan Apr 12, 2023
01aab21
fix Profile
PorkbellyBigfan Apr 12, 2023
b50da37
Merge branch 'profileFix' into develop
PorkbellyBigfan Apr 12, 2023
f982afa
add Kakaotalk login feature
PorkbellyBigfan Apr 12, 2023
ff2e207
add kakaotalk, apple, google login feature
PorkbellyBigfan Apr 12, 2023
f80a7e9
Merge branch 'newLogin' into develop
PorkbellyBigfan Apr 12, 2023
c5ba0d1
finish 잡초뽑기
PorkbellyBigfan Apr 13, 2023
edbe3d4
finish 물주기
PorkbellyBigfan Apr 13, 2023
2c6a4f0
finish 분갈이
PorkbellyBigfan Apr 13, 2023
5af9590
finish 청소기
PorkbellyBigfan Apr 13, 2023
43f3d44
finish 세탁기
PorkbellyBigfan Apr 13, 2023
191e450
finish 건조기
PorkbellyBigfan Apr 13, 2023
4617b30
add Guestbook
PorkbellyBigfan Apr 13, 2023
4d80f95
add nickname, gitID, review
PorkbellyBigfan Apr 13, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions 11. firstPR/.idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions 11. firstPR/.idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

68 changes: 68 additions & 0 deletions 11. firstPR/.idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions 11. firstPR/guestBook
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
|닉네임|gitID|후기|
|------|------|------|
|삼겹살맨|Porkbellyweb|강의를 통해 Git의 흐름에 대해서 조금이나마 알게되었습니다.|
|삼겹살맨2|Porkbellyweb2|강의를 통해 Git의 흐름에 대해서 조금이나마 알게되었습니다.2|
3 changes: 3 additions & 0 deletions 3.commit/.idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions 3.commit/.idea/3.commit.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions 3.commit/.idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions 3.commit/.idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions 3.commit/.idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions 3.commit/prfoile.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
email :
gitID :
email : [email protected]
gitID : porkbellyweb
3 changes: 3 additions & 0 deletions 4.branchANdMerge/.idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions 4.branchANdMerge/.idea/4.branchANdMerge.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions 4.branchANdMerge/.idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions 4.branchANdMerge/.idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions 4.branchANdMerge/.idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions 4.branchANdMerge/Quests.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
깨진 구슬조각 (0/50)
낡은 나뭇가지(0/40)
깨진 구슬조각 (50/50)
낡은 나뭇가지(40/40)
6 changes: 6 additions & 0 deletions 6.stash/.idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

50 changes: 50 additions & 0 deletions 6.stash/.idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions 6.stash/prfoile.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
email : 이메일을 다시 작성해주세요
gitID : 깃아이디를 입력해주세요
email : [email protected]
gitID : porkbellyweb
2 changes: 2 additions & 0 deletions 6.stash/todoList.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
1. 식사
2. 운동
6 changes: 6 additions & 0 deletions 7.cherryPick/.idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

51 changes: 51 additions & 0 deletions 7.cherryPick/.idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions 7.cherryPick/로그인
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
기능
1. 카카오톡으로 로그인
2. 애플로 로그인
3. 구글로 로그인
50 changes: 50 additions & 0 deletions 9.rebase/.idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions 9.rebase/clean
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
1. 청소기 (0/1)
2. 세탁기 (0/1)
3. 건조기 (0/1)
1. 청소기 (1/1)
2. 세탁기 (1/1)
3. 건조기 (1/1)
6 changes: 3 additions & 3 deletions 9.rebase/plant
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
1. 잡초뽑기 (0/30)
2. 물주기 (0/5)
3. 분갈이 (0/3)
1. 잡초뽑기 (30/30)
2. 물주기 (5/5)
3. 분갈이 (3/3)
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@
1. 화면 왼쪽 위에 Fork 버튼을 눌러 레포지토리를 포크 해주세요.
2. Code를 눌러서 git Clone을 해주세요. 혹은 GUI에서 git clone을 진행해주세요.
3. 각각의 챕터에 가서 다시 readme를 읽으면서 진행해주세요!
4. 레포지토리 마음에 드셨으면 Star를 눌러주세요!