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.

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

Upload/Main Merge #100 test 배포 #101

Merged
merged 311 commits into from
Mar 2, 2023
Merged

Upload/Main Merge #100 test 배포 #101

merged 311 commits into from
Mar 2, 2023

Conversation

haruharuganda
Copy link
Collaborator

Upload/Main Merge #100 test 배포

haruharuganda and others added 30 commits February 16, 2023 11:24
design #23 바텀네비게이션바 CSS 1차
Fix / tailwind 재설정
Feat/login & Singup Singup 1차CSS 기능 #5
Feat #32 초대받은 스케줄리스트 GET 구현
Dev- Detail page GET 기능구현, Schedule Add axios instance 적용
…-pwa into dev/signup

# Conflicts:
#	src/components/Schedule/ScheduleAdd.jsx
#	src/components/Schedule/ScheduleDetail.jsx
#	src/components/Schedule/ScheduleDetailParticipants.jsx
#	src/components/layout/TopNavBar.jsx
#	src/redux/modules/ScheduleSlice.jsx
Feat/schedule invitation 기능 구현 완료
AngelaChaejung and others added 24 commits March 2, 2023 09:34
Design 개발중 페이지 표시 제작
Feat/Router #92 Router 정리 및 Index파일 생성
Design / 개발중 페이지 CSS 변경
Feat/Norification - DB연결 후 코드 수정
Feat/Router #92 Router 로그인시 main진입 오류 수정
Fix #32 스케줄 초대카드 시간 계산 코드 변경
Feat/Router #92 Router 로그인시 main진입 오류 수정 2차
Design/schedule add datepicker input사이즈 조절
@haruharuganda haruharuganda self-assigned this Mar 2, 2023
@AngelaChaejung AngelaChaejung merged commit ee0450d into main Mar 2, 2023
Copy link
Collaborator

@dong-fa dong-fa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

기도메타

@AngelaChaejung
Copy link
Collaborator

100번만에 main머지라.. 축하합니다

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants