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

Main branch update from Dev branch #523

Merged
merged 38 commits into from
May 28, 2024
Merged

Main branch update from Dev branch #523

merged 38 commits into from
May 28, 2024

Conversation

kmc7468
Copy link
Member

@kmc7468 kmc7468 commented May 28, 2024

Summary

Main branch update from Dev branch

chlehdwon and others added 30 commits February 12, 2024 17:12
@chlehdwon
Fix: change commitPayment and commitSettlement
1e1a83f
@chlehdwon
Merge branch 'dev' of https://github.com/sparcs-kaist/taxi-back into #…
35ff930 
…449-chat-validation
@chlehdwon
Refactor: validate by zod
1bd982f
@chlehdwon
Refactor: change settlement and payment
295366c
@chlehdwon
Add chatPaymentSettlementUpdater.js
880aa3b
@chlehdwon
Fix: paymentHandler to commitPaymentHandler
2c06b1f
@chlehdwon
Fix: rooms.js comment
b31b7b2
@chlehdwon
Remove: comment in chatPaymentSettlementUpdater.js
d1a04f5
@chlehdwon
Fix: test/rooms.js
d433687
@chlehdwon
Merge branch 'dev' into #449-chat-validation
f870b72
@happycastle114
Add: Update Logic Change
ce501cf
@happycastle114
Add: Logger
c696d7c
@chlehdwon
Merge branch 'dev' into #449-chat-validation
1f43d7a
@happycastle114
Add: kaist info update
e172852
@happycastle114
Fix: Change all field
65c50ef
@chlehdwon
Add: check whether user participated in rooms with send-required
e3a4ad6
@chlehdwon
Fix: remove async in checkIsSendRequired
1ba4833
@TaehyeonPark
Add: isBanned, getBanned api implementation
dc99335
@TaehyeonPark
Add: swagger docs
0e63ae7
@TaehyeonPark
Fix: swagger docs
9001413
@happycastle114
Add: More logs
28be0f0
@chlehdwon
Merge pull request #518 from sparcs-kaist/#517-block-not-paid-user
ea0e957 
#517 미정산 시 방 생성/참여 차단
@kmc7468
Merge pull request #515 from sparcs-kaist/514-랜덤-이메일-업데이트
ca94c72 
#514 랜덤 이메일 업데이트
@TaehyeonPark
Refactor: code convention and resolve comments
75b5314
@TaehyeonPark
Merge branch 'dev' into #516-blockedlist
384b8d0
@TaehyeonPark
Refactor: resolve comments
fc365c4
@TaehyeonPark
Merge branch '#516-blockedlist' of https://github.com/sparcs-kaist/ta…
2a2f3ab 
…xi-back into #516-blockedlist
@TaehyeonPark
Refactor: resolve comments
2bd12af
@TaehyeonPark
Fix: wrong comment
323c09a
@TaehyeonPark
Merge pull request #519 from sparcs-kaist/#516-blockedlist
2cbdc29 
#516 blockedlist
kmc7468 and others added 8 commits May 28, 2024 22:46
@kmc7468 kmc7468 self-assigned this May 28, 2024
@kmc7468 kmc7468 merged commit df7771e into main May 28, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@kmc7468 kmc7468

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@kmc7468 @chlehdwon @happycastle114 @TaehyeonPark