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

중간과정 #19

Open
wants to merge 51 commits into
base: main
Choose a base branch
from
Open

중간과정 #19

wants to merge 51 commits into from

Commits on Aug 9, 2022

  1. Create pull_request_template.md

    @yoouyoou
    yoouyoou authored Aug 9, 2022
    Configuration menu
    Copy the full SHA
    54b9594 View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2022

  1. layout: 채팅화면,말풍선 파일 생성 및 구현

    @yoouyoou
    yoouyoou committed Aug 10, 2022
    Configuration menu
    Copy the full SHA
    cd7b888 View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2022

  1. layout: 말풍선 및 팝업창 뷰구현

    @yoouyoou
    yoouyoou committed Aug 15, 2022
    Configuration menu
    Copy the full SHA
    06fcf0e View commit details
    Browse the repository at this point in the history

  2. layout: themes파일 Appcompat으로 변경

    @yoouyoou
    yoouyoou committed Aug 15, 2022
    Configuration menu
    Copy the full SHA
    daac32c View commit details
    Browse the repository at this point in the history

  3. layout: 채팅프래그먼트 리사이클러뷰 추

    @yoouyoou
    yoouyoou committed Aug 15, 2022
    Configuration menu
    Copy the full SHA
    1b90304 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2022

  1. layout: mbti 맞추기 화면 구현

    @yoouyoou
    yoouyoou committed Aug 17, 2022
    Configuration menu
    Copy the full SHA
    35f4c8e View commit details
    Browse the repository at this point in the history

  2. layout: mbit 맞추기 화면 수정

    @yoouyoou
    yoouyoou committed Aug 17, 2022
    Configuration menu
    Copy the full SHA
    5d6974b View commit details
    Browse the repository at this point in the history

  3. layout: 채팅화면 리사이클러뷰 생성

    @yoouyoou
    yoouyoou committed Aug 17, 2022
    Configuration menu
    Copy the full SHA
    f33b958 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #3 from UMC-Hackathon/feature/chat-view 

    채팅화면 구현
    @yoouyoou
    yoouyoou authored Aug 17, 2022
    Configuration menu
    Copy the full SHA
    ef8eafe View commit details
    Browse the repository at this point in the history

  5. 로그인 화면 구현 완료

    @cherrynana320
    cherrynana320 committed Aug 17, 2022
    Configuration menu
    Copy the full SHA
    e8fe74b View commit details
    Browse the repository at this point in the history

  6. Merge branch 'develop' into feature/login-view

    @cherrynana320
    cherrynana320 authored Aug 17, 2022
    Configuration menu
    Copy the full SHA
    3f23ece View commit details
    Browse the repository at this point in the history

  7. Merge pull request #6 from UMC-Hackathon/feature/login-view 

    로그인 화면 구현 완료
    @cherrynana320
    cherrynana320 authored Aug 17, 2022
    Configuration menu
    Copy the full SHA
    4bb9f06 View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2022

  1. 마이페이지 코드 추가(어진코드)

    @yoouyoou
    yoouyoou committed Aug 18, 2022
    Configuration menu
    Copy the full SHA
    e9428a6 View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2022

  1. 어진코드 추가

    @yoouyoou
    yoouyoou committed Aug 19, 2022
    Configuration menu
    Copy the full SHA
    f3a995c View commit details
    Browse the repository at this point in the history

  2. Merge pull request #8 from UMC-Hackathon/feature/eojin 

    Feature/eojin
    @yoouyoou
    yoouyoou authored Aug 19, 2022
    Configuration menu
    Copy the full SHA
    986cac2 View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2022

  1. feat: 웹소켓 okhttp3이용

    @yoouyoou
    yoouyoou committed Aug 20, 2022
    Configuration menu
    Copy the full SHA
    1e5f4d8 View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2022

  1. feat: 웹소켓 stomp라이브러리 이

    @yoouyoou
    yoouyoou committed Aug 21, 2022
    Configuration menu
    Copy the full SHA
    cb1b6aa View commit details
    Browse the repository at this point in the history

  2. feat: 채팅관련 레트로핏 파일 생

    @yoouyoou
    yoouyoou committed Aug 21, 2022
    Configuration menu
    Copy the full SHA
    5630915 View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2022

  1. data

    @eojinny
    eojinny committed Aug 22, 2022
    Configuration menu
    Copy the full SHA
    466b685 View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2022

  1. Merge pull request #10 from UMC-Hackathon/feature/data 

    data
    @eojinny
    eojinny authored Aug 23, 2022
    Configuration menu
    Copy the full SHA
    687b780 View commit details
    Browse the repository at this point in the history

  2. feat: 채팅리스트 불러오기

    @yoouyoou
    yoouyoou committed Aug 23, 2022
    Configuration menu
    Copy the full SHA
    eb8811c View commit details
    Browse the repository at this point in the history

  3. 데이터 연결

    @eojinny
    eojinny committed Aug 23, 2022
    Configuration menu
    Copy the full SHA
    415ccec View commit details
    Browse the repository at this point in the history

  4. Merge pull request #12 from UMC-Hackathon/feature/data 

    tree 츄가
    @eojinny
    eojinny authored Aug 23, 2022
    Configuration menu
    Copy the full SHA
    30ad9d1 View commit details
    Browse the repository at this point in the history

  5. eun

    @moongpom
    moongpom committed Aug 23, 2022
    Configuration menu
    Copy the full SHA
    66fcf01 View commit details
    Browse the repository at this point in the history

  6. message/tree R

    @moongpom
    moongpom committed Aug 23, 2022
    Configuration menu
    Copy the full SHA
    9460236 View commit details
    Browse the repository at this point in the history

  7. 메세지랑 트리 가져옴 

    Eun
    @moongpom
    moongpom authored Aug 23, 2022
    Configuration menu
    Copy the full SHA
    4c05a52 View commit details
    Browse the repository at this point in the history

  8. 카카로 로그인 로그 추가

    @moongpom
    moongpom committed Aug 23, 2022
    Configuration menu
    Copy the full SHA
    e840833 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #14 from UMC-Hackathon/eun 

    카카로 로그인 로그 추가
    @moongpom
    moongpom authored Aug 23, 2022
    Configuration menu
    Copy the full SHA
    6b41589 View commit details
    Browse the repository at this point in the history

  10. build.gradle잘못올림

    @moongpom
    moongpom committed Aug 23, 2022
    Configuration menu
    Copy the full SHA
    03fc4a0 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #15 from UMC-Hackathon/eun 

    build.gradle잘못올림
    @moongpom
    moongpom authored Aug 23, 2022
    Configuration menu
    Copy the full SHA
    0a4d1df View commit details
    Browse the repository at this point in the history

  12. 버전 및 오류 수정

    @moongpom
    moongpom committed Aug 23, 2022
    Configuration menu
    Copy the full SHA
    f4ba9d9 View commit details
    Browse the repository at this point in the history

  13. 버전 및 오류 수정 

    버전 및 오류 수정
    @moongpom
    moongpom authored Aug 23, 2022
    Configuration menu
    Copy the full SHA
    bb7d2f2 View commit details
    Browse the repository at this point in the history

  14. 버전 TreeService.kt 코드 추가

    @moongpom
    moongpom committed Aug 23, 2022
    Configuration menu
    Copy the full SHA
    bd45eaa View commit details
    Browse the repository at this point in the history

  15. Merge pull request #17 from UMC-Hackathon/eun 

    버전 TreeService.kt 코드 추가
    @moongpom
    moongpom authored Aug 23, 2022
    Configuration menu
    Copy the full SHA
    06e4938 View commit details
    Browse the repository at this point in the history

  16. Update LoginActivity.kt

    @eojinny
    eojinny authored Aug 23, 2022
    Configuration menu
    Copy the full SHA
    68ee07f View commit details
    Browse the repository at this point in the history

  17. 버전카톡친구

    @moongpom
    moongpom committed Aug 23, 2022
    Configuration menu
    Copy the full SHA
    6cb2de4 View commit details
    Browse the repository at this point in the history

  18. Merge branch 'develop' of https://github.com/UMC-Hackathon/MBTree_And… 

    …roid into eun
    @moongpom
    moongpom committed Aug 23, 2022
    Configuration menu
    Copy the full SHA
    8c52404 View commit details
    Browse the repository at this point in the history

  19. Add files via upload

    @eojinny
    eojinny authored Aug 23, 2022
    Configuration menu
    Copy the full SHA
    d96260f View commit details
    Browse the repository at this point in the history

  20. Add files via upload

    @eojinny
    eojinny authored Aug 23, 2022
    Configuration menu
    Copy the full SHA
    e49bc09 View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2022

  1. ㅊcherry

    @moongpom
    moongpom committed Aug 24, 2022
    Configuration menu
    Copy the full SHA
    5ad0355 View commit details
    Browse the repository at this point in the history

  2. ãcherry 충돌 합침

    @moongpom
    moongpom committed Aug 24, 2022
    Configuration menu
    Copy the full SHA
    882b99c View commit details
    Browse the repository at this point in the history

  3. Merge pull request #20 from UMC-Hackathon/euncherry 

    Euncherry
    @moongpom
    moongpom authored Aug 24, 2022
    Configuration menu
    Copy the full SHA
    6358331 View commit details
    Browse the repository at this point in the history

  4. d

    @moongpom
    moongpom committed Aug 24, 2022
    Configuration menu
    Copy the full SHA
    ac39954 View commit details
    Browse the repository at this point in the history

  5. 충돌 수정

    @moongpom
    moongpom committed Aug 24, 2022
    Configuration menu
    Copy the full SHA
    f82eea2 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #21 from UMC-Hackathon/eun 

    Eun
    @moongpom
    moongpom authored Aug 24, 2022
    Configuration menu
    Copy the full SHA
    d7cc4ca View commit details
    Browse the repository at this point in the history

  7. feat: 실시간 채팅 구현

    @yoouyoou
    yoouyoou committed Aug 24, 2022
    Configuration menu
    Copy the full SHA
    802ef6b View commit details
    Browse the repository at this point in the history

  8. feat: 채팅 퀴즈 불러오기

    @yoouyoou
    yoouyoou committed Aug 24, 2022
    Configuration menu
    Copy the full SHA
    7268135 View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2022

  1. merge 충돌 해결

    @yoouyoou
    yoouyoou committed Aug 25, 2022
    Configuration menu
    Copy the full SHA
    afe4a82 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #23 from UMC-Hackathon/feature/websocket 

    채팅 관련 기능
    @yoouyoou
    yoouyoou authored Aug 25, 2022
    Configuration menu
    Copy the full SHA
    c671368 View commit details
    Browse the repository at this point in the history

  3. setting: ignore파일 수정

    @yoouyoou
    yoouyoou committed Aug 25, 2022
    Configuration menu
    Copy the full SHA
    c4e62b2 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #25 from UMC-Hackathon/feature/websocket 

    setting: ignore파일 수정
    @yoouyoou
    yoouyoou authored Aug 25, 2022
    Configuration menu
    Copy the full SHA
    ffa147c View commit details
    Browse the repository at this point in the history