Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

merge develop to main #93

Merged
merged 49 commits into from
Jan 7, 2024
Merged

merge develop to main #93

merged 49 commits into from
Jan 7, 2024

Conversation

ManHyuk
Copy link
Collaborator

@ManHyuk ManHyuk commented Jan 7, 2024

πŸ“’ Issue

🎯 μ–΄λ–€ μž‘μ—…μ„ ν–ˆλŠ”μ§€

πŸ“œ μžμ„Έν•œ μ„€λͺ…

🌍 영ν–₯λ²”μœ„ (λͺ¨λ“ˆ)

Resolves: # See also: #

ManHyuk added 30 commits December 31, 2023 16:19
@ManHyuk
refact(#70): edit username column name
e5558d2
@ManHyuk
feat(#70): add naver social login
c4ffabc
@ManHyuk
fix(#70): fix compile error
24bdc51
@ManHyuk
feat(#70): add kakao social login
9314f3d
@ManHyuk
feat(#70): add provder id
5e8babf
@ManHyuk
refact: 개발망 운영망 λΆ„κΈ°
c8ea469
@ManHyuk
refact: κΈ°μ‘΄ yml μΆ”κ°€
709589e
@ManHyuk
refact: edit docker file path
332cd4a
@ManHyuk
refact: edit live-ci-cd path
8c27152
@ManHyuk
refact: edit dockerfile expose port
0ba578d
@ManHyuk
chore: edit dockerfile expose port
7c4bb67
@ManHyuk
chore(#70): edit testcode
21bf088
@ManHyuk
Merge pull request #71 from depromeet/feature/#70
0d879f3 
넀이버 둜그인 μΆ”κ°€
@ManHyuk
chore(#70): edit temp
9b5117e
@ManHyuk
chore(#70): add temp code
2a1c7d0
@ManHyuk
Merge pull request #79 from depromeet/feature/#70
2105b6e 
Feature/#70
@ManHyuk
chore: add tempcode
76029d3
@ManHyuk
Merge pull request #80 from depromeet/feature/#70
3f41fed 
chore: add tempcode
@ManHyuk
temp code
3db806c
@ManHyuk
Merge pull request #81 from depromeet/feature/#70
1c5a96b 
temp code
@ManHyuk
chore(#70): edit redirect
beaf797
@ManHyuk
Merge pull request #82 from depromeet/feature/#70
20666f9 
chore(#70): edit redirect
@ManHyuk
temp : edit log level
1a8ef03
@ManHyuk
edit redirect url
1737d7d
@ManHyuk
Merge pull request #83 from depromeet/feature/#70
c9409f2 
Feature/#70
@ManHyuk
chore(#70): edit fe redirect url
eb15ab3
@ManHyuk
Merge pull request #84 from depromeet/feature/#70
9e8ee6f 
chore(#70): edit fe redirect url
@ManHyuk
feat(#70): edit kakao , naver client id secret url
6c95299
@ManHyuk
Merge pull request #85 from depromeet/feature/#70
b5a5ac4 
feat(#70): edit kakao , naver client id secret url
@ManHyuk
feat(#70): provider id μ‚­μ œ
f7f1ccd
ManHyuk added 19 commits January 7, 2024 03:50
@ManHyuk
Merge pull request #86 from depromeet/feature/#70
8ddf036 
feat(#70): provider id μ‚­μ œ
@ManHyuk
chore(#70): edit kakao
aa91e56
@ManHyuk
Merge pull request #87 from depromeet/feature/#70
1173c50 
chore(#70): edit kakao
@ManHyuk
chore(#70): add dev profile server port 8888
c3129e4
@ManHyuk
Merge pull request #88 from depromeet/feature/#70
8a93751 
chore(#70): add dev profile server port 8888
@ManHyuk
feat(#70): delete server port
822d8ec
@ManHyuk
Merge pull request #89 from depromeet/feature/#70
7884451 
feat(#70): delete server port
@ManHyuk
feat(#70): 포트 λͺ…μ‹œμ μœΌλ‘œ μž‘μ„± , λ‘œκΉ…λ ˆλ²¨ μˆ˜μ •
bbb9d1f
@ManHyuk
Merge pull request #90 from depromeet/feature/#70
deb1f2e 
feat(#70): 포트 λͺ…μ‹œμ μœΌλ‘œ μž‘μ„± ,  λ‘œκΉ…λ ˆλ²¨ μˆ˜μ •
@ManHyuk
Merge pull request #78 from depromeet/refact/infra
a79e643 
refact: 개발망 운영망 λΆ„κΈ°
@ManHyuk
chore: edit dockerfile path
99e2067
@ManHyuk
chore: edit dockerfile path
a2a61e1
@ManHyuk
chore: edit ssh script
a3532c1
@ManHyuk
chore: κΈ°μ‘΄ api cicd 주석
736d1dc
@ManHyuk
chore: edit log-api loglevel debug to info
6fbddf4
@ManHyuk
chore: edit dev-api log leve info -> debug
fa819e6
@ManHyuk
Merge pull request #91 from depromeet/refact/infra
04bdbb6 
chore: edit dev-api log leve info -> debug
@ManHyuk
chore: cicid master -> main
1c0bd4d
@ManHyuk
Merge pull request #92 from depromeet/refact/infra
5780181 
chore: cicid master -> main
@ManHyuk ManHyuk self-assigned this Jan 7, 2024
@ManHyuk ManHyuk merged commit 26e9992 into main Jan 7, 2024
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@egg528 egg528 Awaiting requested review from egg528 egg528 is a code owner

@binary-ho binary-ho Awaiting requested review from binary-ho binary-ho is a code owner

Assignees

@ManHyuk ManHyuk

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@ManHyuk