-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathein
275 lines (275 loc) · 21.6 KB
/
ein
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
* [33m9cea5ff[m[33m ([m[1;36mHEAD -> [m[1;32mdev/header[m[33m, [m[1;31morigin/dev/header[m[33m)[m test중
[31m|[m * [33m45396fe[m[33m ([m[1;31morigin/dev/article[m[33m)[m article 업로드
[31m|[m [32m|[m * [33mdbba2af[m[33m ([m[1;31morigin/master[m[33m, [m[1;31morigin/HEAD[m[33m)[m Merge remote-tracking branch 'origin/backend'
[31m|[m [32m|[m [33m|[m[32m\[m
[31m|[m [32m|[m [33m|[m[32m/[m
[31m|[m [32m|[m[32m/[m[33m|[m
[31m|[m * [33m|[m [33maf31a62[m[33m ([m[1;31morigin/dev/user[m[33m, [m[1;31morigin/backend[m[33m)[m S04P12A401-130 [+] Edit AWS 연동 수정 & Swagger로 회원가입 처리
[31m|[m * [33m|[m [33mddf3220[m S04P12A401-130[+] Add AWS 연동 수정 & Swagger로 회원가입 처리
[31m|[m [34m|[m * [33m6d7f303[m[33m ([m[1;31morigin/dev/board[m[33m)[m 파일명 변경: SignUp.vue, SignUpSave.vue
[31m|[m [34m|[m * [33ma217a98[m Merge branch 'dev/board' into 'master'
[31m|[m [34m|[m [35m|[m[36m\[m
[31m|[m [34m|[m [35m|[m * [33med6c428[m S04P12A401-128 [+] 회원가입페이지 수정
[31m|[m [34m|[m * [36m|[m [33m9f9bc16[m Merge branch 'database'
[31m|[m [34m|[m [1;31m|[m[1;32m\[m [36m\[m
[31m|[m [34m|[m [1;31m|[m * [36m\[m [33m599b1e9[m Merge branch 'master' into database
[31m|[m [34m|[m [1;31m|[m [1;33m|[m[1;34m\[m [36m\[m
[31m|[m [34m|[m [1;31m|[m * [1;34m|[m [36m|[m [33m142936e[m[33m ([m[1;31morigin/database[m[33m)[m db 데킬라 컵 정보 추가
[31m|[m [34m|[m [1;31m|[m * [1;34m|[m [36m|[m [33mb5e92e9[m db 데킬라 종합
[31m|[m [34m|[m [1;31m|[m[34m/[m [1;34m/[m [36m/[m
[31m|[m [34m|[m[34m/[m[1;31m|[m [1;34m|[m [36m|[m
[31m|[m [34m|[m * [1;34m|[m [36m|[m [33m347f0ff[m[33m ([m[1;32mmaster[m[33m)[m Merge branch 'dev/board' into 'master'
[31m|[m [34m|[m [1;35m|[m[36m\[m [1;34m\[m [36m\[m
[31m|[m [34m|[m [1;35m|[m [36m|[m [1;34m|[m[36m/[m
[31m|[m [34m|[m [1;35m|[m [36m|[m[36m/[m[1;34m|[m
[31m|[m [34m|[m [1;35m|[m * [1;34m|[m [33mfaa80dc[m S04P12A401-154 [-] BoardList2
[31m|[m [34m|[m * [1;36m|[m [1;34m|[m [33mb390541[m FindPassword.vue 추가 및 로그인 모달창과 링크 연동
[31m|[m [34m|[m * [1;36m|[m [1;34m|[m [33m7c025ff[m S04P12A401-155 [+] 0125 회의록
[31m|[m [34m|[m * [1;36m|[m [1;34m|[m [33mbe02239[m S04P12A401-127 [+] 로그인 창 구현
[31m|[m [34m|[m * [1;36m|[m [1;34m|[m [33m0eb7220[m update README.md
[31m|[m [34m|[m * [1;36m|[m [1;34m|[m [33mb6206a8[m Merge branch 'dev/board' into 'master'
[31m|[m [34m|[m [1;34m|[m[1;36m\[m [1;36m\[m [1;34m\[m
[31m|[m [34m|[m [1;34m|[m [1;36m|[m[1;36m/[m [1;34m/[m
[31m|[m [34m|[m [1;34m|[m [1;36m|[m [1;34m/[m
[31m|[m [34m|[m [1;34m|[m [1;36m|[m[1;34m/[m
[31m|[m [34m|[m [1;34m|[m[1;34m/[m[1;36m|[m
[31m|[m [34m|[m [1;34m|[m * [33m34a0bd9[m S04P12A401-154 [+] 자유게시판 구현
[31m|[m [34m|[m * [32m|[m [33m7c63692[m Merge branch 'master' of https://lab.ssafy.com/s04-webmobile1-sub2/s04p12a401
[31m|[m [34m|[m [33m|[m[34m\[m [32m\[m
[31m|[m [34m|[m * [34m\[m [32m\[m [33m6bf1179[m Merge branch 'database'
[31m|[m [34m|[m [35m|[m[34m\[m [34m\[m [32m\[m
[31m|[m [34m|[m [35m|[m[34m/[m [34m/[m [32m/[m
[31m|[m [34m|[m[34m/[m[35m|[m [34m|[m [32m|[m
[31m|[m * [35m|[m [34m|[m [32m|[m [33m475db8f[m S04P12A401-111 [+] Edit DB recipe 통
[31m|[m * [35m|[m [34m|[m [32m|[m [33m7e71cd2[m Edit SQL File - User
[31m|[m * [35m|[m [34m|[m [32m|[m [33m2df3a80[m Merge branch 'database' of https://lab.ssafy.com/s04-webmobile1-sub2/s04p12a401 into database
[31m|[m [1;31m|[m[1;32m\[m [35m\[m [34m\[m [32m\[m
[31m|[m [1;31m|[m * [35m\[m [34m\[m [32m\[m [33me4dde37[m db merge
[31m|[m [1;31m|[m [1;33m|[m[1;34m\[m [35m\[m [34m\[m [32m\[m
[31m|[m [1;31m|[m * [1;34m|[m [35m|[m [34m|[m [32m|[m [33m45f1405[m database merge
[31m|[m * [1;34m|[m [1;34m|[m [35m|[m [34m|[m [32m|[m [33ma96cd61[m S04P12A401-118[+] Add SpringBoot & Swagger 설정
[31m|[m [1;34m|[m [1;34m|[m[1;34m/[m [35m/[m [34m/[m [32m/[m
[31m|[m [1;34m|[m[1;34m/[m[1;34m|[m [35m|[m [34m|[m [32m|[m
[31m|[m [1;34m|[m [1;34m|[m [35m|[m [34m|[m [32m|[m * [33m57da6b2[m[33m ([m[1;31morigin/spring[m[33m)[m S04P12A401-153 [+] 레시피 작성 logic 구현
[31m|[m [1;34m|[m [1;34m|[m [35m|[m [34m|[m [32m|[m[34m/[m
[31m|[m [1;34m|[m [1;34m|[m [35m|[m [34m|[m[34m/[m[32m|[m
[31m|[m [1;34m|[m [1;34m|[m [35m|[m * [32m|[m [33m033d688[m[33m ([m[1;31morigin/dev/recommendation[m[33m, [m[1;32mdev/recommendation[m[33m)[m create dev/recommendation branch
[31m|[m [1;34m|[m [1;34m|[m [35m|[m [32m|[m[32m/[m
[31m|[m [1;34m|[m [1;34m|[m [35m|[m * [33me71cdc7[m merge
[31m|[m [1;34m|[m [1;34m|[m [35m|[m [1;36m|[m[31m\[m
[31m|[m [1;34m|[m [1;34m|[m [35m|[m [1;36m|[m * [33m404676f[m Merge branch 'dev/signup' into 'master'
[31m|[m [1;34m|[m [1;34m|[m [35m|[m [1;36m|[m [32m|[m[33m\[m
[31m|[m [1;34m|[m [1;34m|[m [35m|[m [1;36m|[m [32m|[m * [33me22a1d3[m[33m ([m[1;31morigin/dev/signup[m[33m)[m S04P12A401-128 [+] 회원가입 페이지 구현
[31m|[m [1;34m|[m [1;34m|[m [35m|[m [1;36m|[m [32m|[m[32m/[m
[31m|[m [1;34m|[m [1;34m|[m [35m|[m * [32m|[m [33m29e6d7a[m S04P12A401-151[+] nav에 있는 페이지 생성 및 router로 연결
[31m|[m [1;34m|[m [1;34m|[m [35m|[m [32m|[m[32m/[m
[31m|[m [1;34m|[m [1;34m|[m [35m|[m * [33mcaf5559[m[33m ([m[1;31morigin/dev/footer[m[33m, [m[1;32mdev/footer[m[33m)[m S04P12A401-150[+] footer에 링크된 페이지 router 작업
[31m|[m [1;34m|[m[31m_[m[1;34m|[m[31m_[m[35m|[m[31m/[m
[31m|[m[31m/[m[1;34m|[m [1;34m|[m [35m|[m
* [1;34m|[m [1;34m|[m [35m|[m [33m30a5fe4[m S04P12A401-126 [+] 헤더 component 개발
* [1;34m|[m [1;34m|[m [35m|[m [33md69749f[m S04P12A401-147 [+] 프로젝트 기본 설정
* [1;34m|[m [1;34m|[m [35m|[m [33m358795c[m Merge branch 'frontend' into 'master'
[34m|[m[35m\[m [1;34m\[m [1;34m\[m [35m\[m
[34m|[m * [1;34m|[m [1;34m|[m [35m|[m [33mc5e200c[m Frontend branch merge and delete 요청
[34m|[m[34m/[m [1;34m/[m [1;34m/[m [35m/[m
* [1;34m|[m [1;34m|[m [35m|[m [33m658c4bd[m edit readme in bangbar
[35m|[m [1;34m|[m [1;34m|[m [35m|[m * [33meb9119a[m[33m ([m[1;31morigin/frontend[m[33m)[m Merge branch 'frontend' of https://lab.ssafy.com/s04-webmobile1-sub2/s04p12a401 into frontend
[35m|[m [1;34m|[m [1;34m|[m [35m|[m [36m|[m[35m\[m
[35m|[m [1;34m|[m[35m_[m[1;34m|[m[35m_[m[35m|[m[35m_[m[36m|[m[35m/[m
[35m|[m[35m/[m[1;34m|[m [1;34m|[m [35m|[m [36m|[m
* [1;34m|[m [1;34m|[m [35m|[m [36m|[m [33m791ab7b[m[33m ([m[1;32mfrontend[m[33m)[m update readme
[1;31m|[m [1;34m|[m [1;34m|[m [35m|[m * [33m3041d85[m S04P12A401-126 [+] logo.png
[1;31m|[m [1;34m|[m[1;31m_[m[1;34m|[m[1;31m_[m[35m|[m[1;31m/[m
[1;31m|[m[1;31m/[m[1;34m|[m [1;34m|[m [35m|[m
* [1;34m|[m [1;34m|[m [35m|[m [33me6ea63e[m 기본 설정
* [1;34m|[m [1;34m|[m [35m|[m [33m4152a5a[m vue project 생성
[35m|[m [1;34m|[m[35m_[m[1;34m|[m[35m/[m
[35m|[m[35m/[m[1;34m|[m [1;34m|[m
* [1;34m|[m [1;34m|[m [33m12e1357[m[33m ([m[1;31morigin/architecture[m[33m)[m S04P12A401-102 [+] 게시판 글 상세보기 페이지 목업
* [1;34m|[m [1;34m|[m [33m4f9e9b1[m Merge branch 'database'
[1;32m|[m[1;34m\[m [1;34m\[m [1;34m\[m
[1;32m|[m [1;34m|[m[1;34m/[m [1;34m/[m
[1;32m|[m * [1;34m|[m [33mc3e6dd3[m S04P12A401-112 [+]Add 데이터 서치 & 정리 - alcohol
[1;32m|[m * [1;34m|[m [33m6f74aae[m S04P12A401-79 [+] 기능명세서_헤더~메인페이지
[1;32m|[m [1;34m|[m[1;34m/[m
* [1;34m|[m [33m99f2bfa[m Merge branch 'architecture'
[1;34m|[m[1;35m\[m [1;34m\[m
[1;34m|[m * [1;34m\[m [33mff65064[m Merge branch 'architecture' of https://lab.ssafy.com/s04-webmobile1-sub2/s04p12a401 into architecture
[1;34m|[m [1;36m|[m[31m\[m [1;34m\[m
[1;34m|[m [1;36m|[m * [1;34m|[m [33m1002c0a[m S04P12A401-104 [+] 검색결과 페이지 수정
[1;34m|[m [1;36m|[m * [1;34m|[m [33m23c7e28[m S04P12A401-81 [+] 기능명세서 작성
[1;34m|[m [1;36m|[m * [1;34m|[m [33m461e953[m S04P12A401-107 [+] 어드민 페이지 목업
[1;34m|[m * [31m|[m [1;34m|[m [33m83493a8[m S04P12A401-106 [+] 마이페이지 수정 및 추가
[1;34m|[m * [31m|[m [1;34m|[m [33mc6d1b69[m S04P12A401-105 [+] 회원가입 페이지 수정
[1;34m|[m * [31m|[m [1;34m|[m [33mb3d31d4[m S04P12A401-110 [+] 회원가입 페이지 추가 목업 - 영구정지 회원 제한 모달창
[1;34m|[m [31m|[m[31m/[m [1;34m/[m
* [31m|[m [1;34m|[m [33m8074851[m S04P12A401-100 [+] 0122 회의록 업로드
[31m|[m[31m/[m [1;34m/[m
* [1;34m|[m [33m21d9339[m S04P12A401-101 [+] 게시판 글 작성/수정 페이지 목업
* [1;34m|[m [33m892ff4d[m S04P12A401-103 [+] 메인페이지 검색부분 수정
* [1;34m|[m [33m6594710[m S04P12A401-109 [+] 레시피 작성 페이지 수정
[1;34m|[m[1;34m/[m
* [33m1d99436[m S04P12A401-117 [+] Edit DB recipe 데킬라
* [33m615def8[m S04P12A401-115 [+] Edit DB 개요 마무리
* [33m0c647eb[m S04P12A401-115 [+] Edit DB 개요 마무리
* [33m720d855[m S04P12A401-77 [+] 마이페이지 목업 ver.1.3
* [33m17a27f6[m S04P12A401-91 [+] 비밀번호 찾기 및 재설정 페이지 목업
* [33m43dbdab[m Merge branch 'master' of https://lab.ssafy.com/s04-webmobile1-sub2/s04p12a401
[32m|[m[33m\[m
[32m|[m * [33m0adcff3[m Merge branch 'database' into 'master'
[32m|[m [34m|[m[35m\[m
[32m|[m [34m|[m * [33m22b8611[m S04P12A401-89 [+] 기능 설계서_헤더,레시피 검색,레시피 작성
[32m|[m [34m|[m * [33mc4ca3e1[m File folder
[32m|[m * [35m|[m [33ma5d394c[m Merge branch 'architecture' into 'master'
[32m|[m [36m|[m[1;31m\[m [35m\[m
[32m|[m [36m|[m * [35m|[m [33m25fdb82[m S04P12A401-81 [+] 기능명세서 1.0.0 upload
[32m|[m * [1;31m|[m [35m|[m [33ma91b3d7[m Merge branch 'database'
[32m|[m [1;31m|[m[35m\[m [1;31m\[m [35m\[m
[32m|[m [1;31m|[m [35m|[m[1;31m/[m [35m/[m
[32m|[m [1;31m|[m[1;31m/[m[35m|[m [35m/[m
[32m|[m [1;31m|[m [35m|[m[35m/[m
[32m|[m [1;31m|[m * [33m5c425cb[m S04P12A401-82 [+] AWS 연동 & sql file 수정
[32m|[m * [1;33m|[m [33me850d7c[m S04P12A401-64 [+] 회원가입 페이지 검수
[32m|[m * [1;33m|[m [33md3c9221[m S04P12A401-73 [+] 0121 회의록 업로드
[32m|[m * [1;33m|[m [33me0c70c2[m S04P12A401-76 [+] 자유게시판 목업 ver1.1
[32m|[m * [1;33m|[m [33mc88408e[m S04P12A401-59 [+] 레시피 작성 페이지 ver1.3
[32m|[m * [1;33m|[m [33m044b045[m Merge branch 'database'
[32m|[m [1;34m|[m[1;33m\[m [1;33m\[m
[32m|[m [1;34m|[m [1;33m|[m[1;33m/[m
[32m|[m [1;34m|[m * [33mda5b8fc[m S04P12A401-78 [+] Add DB 통합 레시피 진 전까지
* [1;34m|[m [1;35m|[m [33m59cda86[m Revert "S04P12A401-91 [+] 비밀번호 찾기 및 재설정 페이지 목업"
* [1;34m|[m [1;35m|[m [33m13be98b[m S04P12A401-91 [+] 비밀번호 찾기 및 재설정 페이지 목업
[1;34m|[m[1;34m/[m [1;35m/[m
* [1;35m|[m [33m3c1a1a2[m S04P12A401-51 [+] 회원가입 페이지 목업 마무리
* [1;35m|[m [33m090ab44[m S04P12A401-52 [+] 로그인 모달창 목업 마무리
* [1;35m|[m [33m93e0cee[m S04P12A401-75 [+] 마이페이지 목업 마무리 - ver1.2
* [1;35m|[m [33m2fc94bf[m Merge branch 'architecture' into 'master'
[1;36m|[m[31m\[m [1;35m\[m
[1;36m|[m * [1;35m|[m [33m943e12d[m S04P12A401-74 [+] README수정
* [31m|[m [1;35m|[m [33mbb5db67[m Merge branch 'architecture' into 'master'
[32m|[m[31m\[m [31m\[m [1;35m\[m
[32m|[m [31m|[m[31m/[m [1;35m/[m
[32m|[m * [1;35m|[m [33m2432692[m S04P12A401-74 [+] README수정
* [33m|[m [1;35m|[m [33mb3bd44e[m Merge branch 'architecture' into 'master'
[34m|[m[33m\[m [33m\[m [1;35m\[m
[34m|[m [33m|[m[33m/[m [1;35m/[m
[34m|[m * [1;35m|[m [33me7836c0[m S04P12A401-74 [+] README수정
[34m|[m * [1;35m|[m [33m90654dd[m S04P12A401-74 [+] README수정
* [35m|[m [1;35m|[m [33mfd105cc[m Merge branch 'architecture' into 'master'
[36m|[m[35m\[m [35m\[m [1;35m\[m
[36m|[m [35m|[m[35m/[m [1;35m/[m
[36m|[m * [1;35m|[m [33m9caca14[m S04P12A401-74 [+] README수정
* [1;31m|[m [1;35m|[m [33m9bcbc55[m Merge branch 'architecture' into 'master'
[1;32m|[m[1;31m\[m [1;31m\[m [1;35m\[m
[1;32m|[m [1;31m|[m[1;31m/[m [1;35m/[m
[1;32m|[m * [1;35m|[m [33m277a4c3[m S04P12A401-58 [+] 칵테일 추천 페이지 검수
* [1;33m|[m [1;35m|[m [33mb6f120c[m Merge branch 'architecture'
[1;35m|[m[1;33m\[m [1;33m\[m [1;35m\[m
[1;35m|[m [1;33m|[m[1;33m/[m [1;35m/[m
[1;35m|[m [1;33m|[m [1;35m/[m
[1;35m|[m [1;33m|[m[1;35m/[m
[1;35m|[m[1;35m/[m[1;33m|[m
[1;35m|[m * [33m93f111a[m S04P12A401-45 [+] 0120 회의록 업로드
[1;35m|[m * [33m46619b0[m S04P12A401-56 [+] 사용자 레시피 페이지 검수
[1;35m|[m * [33m6f1fdb8[m S04P12A401-55 [+] 검색결과 페이지 검수
[1;35m|[m * [33m05c5d16[m S04P12A401-53 [+] 메인페이지 검수
[1;35m|[m * [33maa78d7a[m S04P12A401-61 [+] 자유게시판 추가하여 Header 디자인 수정
* [1;35m|[m [33maf9d5c9[m Merge branch 'database' of https://lab.ssafy.com/s04-webmobile1-sub2/s04p12a401 into database
[1;36m|[m[31m\[m [1;35m\[m
[1;36m|[m * [1;35m|[m [33m01af244[m S04P12A401-71 [+] Add recipe, tag, article_tag, ingredient, article_ingredient, abookmark, fbookmark
[1;36m|[m * [1;35m|[m [33m6e1905d[m S04P12A401-70 [+] Add user, admin, follow, article, forum,fimg
* [31m|[m [1;35m|[m [33mbfc1a63[m Merge branch 'master' of https://lab.ssafy.com/s04-webmobile1-sub2/s04p12a401 into database
[32m|[m[1;35m\[m [31m\[m [1;35m\[m
[32m|[m [1;35m|[m [31m|[m[1;35m/[m
[32m|[m [1;35m|[m[1;35m/[m[31m|[m
[32m|[m * [31m|[m [33m732fd87[m S04P12A401-31 [+] 메인페이지 목업 수정 - ver1.1
[32m|[m * [31m|[m [33m3b8e0be[m S04P12A401-32 [+] 마이페이지 목업 수정 - ver1.1
[32m|[m * [31m|[m [33m362ae83[m Revert "Revert "S04P12A401 [+] 마이페이지 목업 수정 - ver1.1""
[32m|[m * [31m|[m [33m954fa8d[m Revert "S04P12A401 [+] 마이페이지 목업 수정 - ver1.1"
[32m|[m * [31m|[m [33m53d7a9d[m S04P12A401 [+] 마이페이지 목업 수정 - ver1.1
[32m|[m * [31m|[m [33m3346222[m S04P12A401-48 [+] 스타일 가이드 제작 - font
[32m|[m * [31m|[m [33m77f1fc3[m S04P12A401-50 [+] 스타일 가이드 제작 - Buttons
[32m|[m * [31m|[m [33m31a6ddc[m S04P12A401-44 [+] 스타일 가이드 제작 - components
[32m|[m * [31m|[m [33mdd2b341[m S04P12A401-34 [+] 스타일 가이드 수정 - color
[32m|[m * [31m|[m [33m9a9de26[m S04P12A401-43 [+] header에 회원가입 버튼 추가
[32m|[m * [31m|[m [33m82081b5[m S04P12A401-10 [+] 칵테일 추천 페이지 목업
[32m|[m * [31m|[m [33m51cca1e[m S04P12A401-41 [+] 0119 회의록 업로드
[32m|[m * [31m|[m [33m3e9bbd0[m S04P12A401-39 [+] 0118 회의록 업로드
[32m|[m * [31m|[m [33m9f387a8[m Merge branch 'architecture'
[32m|[m [34m|[m[35m\[m [31m\[m
[32m|[m [34m|[m * [31m|[m [33m7792e9d[m S04P12A401-29 [+] 레시피 작성 페이지 수정
[32m|[m [34m|[m * [31m|[m [33m72aa81c[m S04P12A401-36 [+] 사용자 레시피 페이지 목업 수정
[32m|[m [34m|[m * [31m|[m [33m9b2ed98[m S04P12A401-30 [+] 사용자 레시피 목업 수정
[32m|[m * [35m|[m [31m|[m [33m3dee0fa[m Merge branch 'database'
[32m|[m [36m|[m[1;31m\[m [35m\[m [31m\[m
[32m|[m * [1;31m\[m [35m\[m [31m\[m [33m8317789[m Merge branch 'database' of https://lab.ssafy.com/s04-webmobile1-sub2/s04p12a401
[32m|[m [1;32m|[m[1;33m\[m [1;31m\[m [35m\[m [31m\[m
* [1;32m|[m [1;33m|[m [1;31m|[m [35m|[m [31m|[m [33mb4fc2aa[m 21_01_20 DB 재설계 토의 내용 & ERD
[31m|[m [1;32m|[m[31m_[m[1;33m|[m[31m_[m[1;31m|[m[31m_[m[35m|[m[31m/[m
[31m|[m[31m/[m[1;32m|[m [1;33m|[m [1;31m|[m [35m|[m
* [1;32m|[m [1;33m|[m [1;31m|[m [35m|[m [33m4820376[m S04P12A401-72 [+] Add alcohol, article_alcohol, cup, article_cup, acomment, fcomment
* [1;32m|[m [1;33m|[m [1;31m|[m [35m|[m [33ma207cd3[m S04P12A401-67 [+] Edit DB data 데킬라, 럼, 브랜디, 논알콜
* [1;32m|[m [1;33m|[m [1;31m|[m [35m|[m [33ma224931[m S04P12A401-68 [+] Edit DB data 보드카, 진
* [1;32m|[m [1;33m|[m [1;31m|[m [35m|[m [33m9f8afa5[m S04P12A401-66 [+] Edit DB data리큐르, 포도주
[1;31m|[m [1;32m|[m[1;31m_[m[1;33m|[m[1;31m/[m [35m/[m
[1;31m|[m[1;31m/[m[1;32m|[m [1;33m|[m [35m|[m
* [1;32m|[m [1;33m|[m [35m|[m [33m61f875a[m S04P12A401-46 [+] Add data search tequila, rum
* [1;32m|[m [1;33m|[m [35m|[m [33m7461706[m S04P12A401-38 [+] Add ERD
* [1;32m|[m [1;33m|[m [35m|[m [33mb56060b[m S04P12A401-49 [+] Add data search vodka, whiskey
* [1;32m|[m [1;33m|[m [35m|[m [33m552c69a[m S04P12A401-35 [+] Add SQL schema 변경
* [1;32m|[m [1;33m|[m [35m|[m [33m43acc64[m Merge branch 'database' of https://lab.ssafy.com/s04-webmobile1-sub2/s04p12a401 into database
[1;34m|[m[1;33m\[m [1;32m\[m [1;33m\[m [35m\[m
[1;34m|[m [1;33m|[m [1;32m|[m[1;33m/[m [35m/[m
[1;34m|[m [1;33m|[m[1;33m/[m[1;32m|[m [35m|[m
[1;34m|[m * [1;32m|[m [35m|[m [33ma94e382[m S04P12A401-47 [+] Add data search beer
[1;34m|[m * [1;32m|[m [35m|[m [33mad21549[m S04P12A401-33 [+] DB 기본 기능 토의 내용 정리
* [1;35m|[m [1;32m|[m [35m|[m [33me6195b1[m Merge branch 'database' of https://lab.ssafy.com/s04-webmobile1-sub2/s04p12a401 into database
[1;36m|[m[1;35m\[m [1;35m\[m [1;32m\[m [35m\[m
[1;36m|[m [1;35m|[m[1;35m/[m [1;32m/[m [35m/[m
[1;36m|[m * [1;32m|[m [35m|[m [33m277eec2[m Delete 21_01_19_DB_1.0.3_토의내용_.pdf
[1;36m|[m * [1;32m|[m [35m|[m [33mb1dffb0[m S04P12A401-35 [+] Edit SQL schema 변경
* [31m|[m [1;32m|[m [35m|[m [33m8d678ca[m Merge branch 'master' of https://lab.ssafy.com/s04-webmobile1-sub2/s04p12a401 into database
[31m|[m[1;32m\[m [31m\[m [1;32m\[m [35m\[m
[31m|[m [1;32m|[m[31m/[m [1;32m/[m [35m/[m
[31m|[m[31m/[m[1;32m|[m [1;32m/[m [35m/[m
[31m|[m [1;32m|[m[1;32m/[m [35m/[m
[31m|[m * [35m|[m [33m0d443be[m Merge branch 'architecture'
[31m|[m [34m|[m[35m\[m [35m\[m
[31m|[m [34m|[m [35m|[m[35m/[m
[31m|[m [34m|[m * [33m6bce42a[m S04P12A401-13 [+] 마이페이지 목업
[31m|[m [34m|[m * [33m0195625[m S04P12A401-12 [+] 메인페이지 목업
[31m|[m * [35m|[m [33m9349e34[m Merge branch 'architecture'
[31m|[m [36m|[m[35m\[m [35m\[m
[31m|[m [36m|[m [35m|[m[35m/[m
[31m|[m [36m|[m * [33m4c2d8a0[m S04P12A401-11 [+] 레시피 상세 페이지 목업
[31m|[m [36m|[m * [33mef81cfb[m S04P12A401-27 [+] nav - Header/Footer 목업
[31m|[m * [1;31m|[m [33m628d906[m S04P12A401-16 [+] 스타일 가이드 제작 - Grid, Color
[31m|[m * [1;31m|[m [33m9ce8940[m S04P12A401-29 [+] 레시피 작성 페이지 목업
[31m|[m * [1;31m|[m [33m227b676[m S04P12A401-15 [+] 사용자 레시피 페이지 목업
[31m|[m * [1;31m|[m [33m889663f[m S04P12A401-14 [+] 검색 결과 페이지 목업
[31m|[m * [1;31m|[m [33m742922f[m Merge branch 'database' into 'master'
[31m|[m [1;32m|[m[1;33m\[m [1;31m\[m
[31m|[m [1;32m|[m * [1;31m|[m [33m559f6e2[m Database
[31m|[m [1;32m|[m[1;32m/[m [1;31m/[m
* [1;32m|[m [1;31m|[m [33m4a70600[m S04P12A401-23 [+] Add SQL file & ERD - comment
* [1;32m|[m [1;31m|[m [33mfc66b78[m S04P12A401-23 [+] Add SQL file & ERD - article_alcohol
* [1;32m|[m [1;31m|[m [33med20485[m S04P12A401-23 [+] Add SQL file & ERD - alcohol
* [1;32m|[m [1;31m|[m [33m1092211[m S04P12A401-23 [+] Add SQL file & ERD - article_ingredient
* [1;32m|[m [1;31m|[m [33mc5398fd[m S04P12A401-1 [+] Add db article_ingredient, alcohol, article_alcohol, comment
* [1;32m|[m [1;31m|[m [33m2074dba[m S04P12A401-6 [+] Add sql file & ERD - tag, article_tag, ingredient, bookmark
* [1;32m|[m [1;31m|[m [33m3b2ab1c[m S04P12A401-21 [+] Add db tag, article_tag, ingredient, bookmark
* [1;32m|[m [1;31m|[m [33m6a50cf0[m S04P12A401-22 [+] Add SQL file & ERD - user, article, recipe
* [1;32m|[m [1;31m|[m [33md6f4976[m S04P12A401-20 [+] Add db user, article, recipe
[1;32m|[m[1;32m/[m [1;31m/[m
* [1;31m|[m [33m8924ca5[m Merge branch 'architecture'
[1;34m|[m[1;31m\[m [1;31m\[m
[1;34m|[m [1;31m|[m[1;31m/[m
[1;34m|[m * [33m45d01be[m 210118
* [1;35m|[m [33mc0cc2ec[m Merge branch 'architecture' into 'master'
[1;36m|[m[1;35m\[m [1;35m\[m
[1;36m|[m [1;35m|[m[1;35m/[m
[1;36m|[m * [33m726afd5[m init
[1;36m|[m[1;36m/[m
* [33m6a08d79[m Add new directory
* [33ma3a349c[m Add new directory
* [33mecd182b[m Add README.md