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

Feature/11 read #17

Merged
merged 21 commits into from
Feb 26, 2022
Merged

Feature/11 read #17

merged 21 commits into from
Feb 26, 2022

Conversation

CYJhub
Copy link
Collaborator

@CYJhub CYJhub commented Feb 26, 2022

글 조회 기능 개발완료했습니다

JSHWJ and others added 21 commits February 24, 2022 19:46
@JSHWJ
사진 기능 없음 / crypto 추가함
95cf6c5
@JSHWJ
pig 이미지 수정
4f210b1
@JSHWJ
merge
e5efe30
@JSHWJ
conflict해결
e0dc63e
@CYJhub
commit_1
99f173f
@ChooSeoyeon
삭제 기능 초안
2fa8ed6
@ChooSeoyeon
Merge branch 'develop' into feature/13_delete
d8239b9
@JSHWJ
이미지변경, 컬렉션 information, 타이머 기능
2140380
@JSHWJ
conflict 함
447020a
@ChooSeoyeon
영어 변수 한글로 수정
71ee22e
@ChooSeoyeon
Merge remote-tracking branch 'origin/feature/9_write' into feature/13…
dcb0809 
…_delete
@CYJhub
commit_2
d262fd8
@CYJhub
Merge branch 'feature/11_read' into feature/9_write
a2d586d
@ChooSeoyeon
delete 기능 upgrade
14adfdb
@CYJhub
Merge remote-tracking branch 'origin/feature/13_delete' into feature/…
c822fbd 
…9_write
@ChooSeoyeon
삭제와 타이머 기능 구현, 파일 정리
4a80692
@CYJhub
commit_3
42841d2
@CYJhub
commit_4
52bd62d
@CYJhub
Merge branch 'feature/9_write' into feature/13_delete
2e51d23
@CYJhub
commit_5
6731c3f
@CYJhub
commit_fin
bc3171f
@CYJhub CYJhub linked an issue Feb 26, 2022 that may be closed by this pull request
[개발] 글 조회 기능 #11
Open
@CYJhub CYJhub self-assigned this Feb 26, 2022
@CYJhub CYJhub added the feature 기능 구현 label Feb 26, 2022
Lai-khan
Lai-khan approved these changes Feb 26, 2022
View reviewed changes
Copy link
Member

@Lai-khan Lai-khan left a comment

Choose a reason for hiding this comment

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

별다른 리뷰사항은 안보이네요.
머지하셔도 좋습니다. 하지만 현재 모든 PR에 서로의 작업사항이 섞여있기 때문에 머지과정에서 불필요한 충돌이 발생할 수 있으니 서로 순서를 잘 정해서 머지하는 것이 좋겠습니다.

@CYJhub
Copy link
Collaborator Author

CYJhub commented Feb 26, 2022

넵 그렇게 하도록 하겠습니다.

@ChooSeoyeon
Copy link
Contributor

확인했습니다.

ChooSeoyeon
ChooSeoyeon approved these changes Feb 26, 2022
View reviewed changes
Copy link
Contributor

@ChooSeoyeon ChooSeoyeon left a comment

Choose a reason for hiding this comment

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

확인했습니다.

@CYJhub CYJhub merged commit c171698 into develop Feb 26, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ChooSeoyeon ChooSeoyeon ChooSeoyeon approved these changes

@Lai-khan Lai-khan Lai-khan approved these changes

Assignees

@CYJhub CYJhub

Labels
feature 기능 구현
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[개발] 글 조회 기능
4 participants
@CYJhub @ChooSeoyeon @Lai-khan @JSHWJ