Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: https-github-com-Allaccept12/D-Back
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: https-github-com-Allaccept12/D-Back
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: test--jh
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 19 commits
  • 36 files changed
  • 3 contributors

Commits on Mar 26, 2022

  1. [REFACTOR 프로젝트 구조 수정]

    @keeeeeey
    keeeeeey committed Mar 26, 2022
    Configuration menu
    Copy the full SHA
    aa2076e View commit details
    Browse the repository at this point in the history

  2. [FIX] dev 통합

    @keeeeeey
    keeeeeey committed Mar 26, 2022
    Configuration menu
    Copy the full SHA
    71ee256 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2022

  1. [CHORE] 사용하지 않는 임포트, 주석, 코드 제거

    @keeeeeey
    keeeeeey committed Mar 27, 2022
    Configuration menu
    Copy the full SHA
    e4504d1 View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2022

  1. [FIX] Jwt 토큰 익셉션핸들러 수정

    @keeeeeey
    keeeeeey committed Mar 28, 2022
    Configuration menu
    Copy the full SHA
    a766a22 View commit details
    Browse the repository at this point in the history

  2. [CHORE] dev 통합

    @keeeeeey
    keeeeeey committed Mar 28, 2022
    Configuration menu
    Copy the full SHA
    e9a5f48 View commit details
    Browse the repository at this point in the history

  3. [FIX] dev 통합 후 컨플릭트 해결

    @keeeeeey
    keeeeeey committed Mar 28, 2022
    Configuration menu
    Copy the full SHA
    320e5da View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2022

  1. [FIX] 아트워크 메인페이지 주석 제거

    @keeeeeey
    keeeeeey committed Mar 29, 2022
    Configuration menu
    Copy the full SHA
    5f7de5c View commit details
    Browse the repository at this point in the history

  2. [FIX] dev 통합 후 컨플릭트 해결

    @keeeeeey
    keeeeeey committed Mar 29, 2022
    Configuration menu
    Copy the full SHA
    235ce1a View commit details
    Browse the repository at this point in the history

  3. [FIX] 안쓰는 Pageable 삭제

    @keeeeeey
    keeeeeey committed Mar 29, 2022
    Configuration menu
    Copy the full SHA
    ae2eb02 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2022

  1. [FEAT] 포스트 게시물 삭제 완료

    @RobiiinChoi
    RobiiinChoi committed Apr 4, 2022
    Configuration menu
    Copy the full SHA
    57151c0 View commit details
    Browse the repository at this point in the history

  2. [FIX] 포스트 주석 삭제

    @RobiiinChoi
    RobiiinChoi committed Apr 4, 2022
    Configuration menu
    Copy the full SHA
    2a97afa View commit details
    Browse the repository at this point in the history

  3. Merge pull request #83 from https-github-com-Allaccept12/revert--artw… 

    …ork,--post,--main

[FIX] 포스트쪽 삭제 에러 변경
    @Allaccept12
    Allaccept12 authored Apr 4, 2022
    Configuration menu
    Copy the full SHA
    16305e4 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'kky' of https://github.com/https-github-com-Allaccept12… 

    …/D_Team_Back into revert--artwork,--post,--main

# Conflicts:
#	src/main/java/com/example/dplus/advice/ErrorCode.java
#	src/main/java/com/example/dplus/config/amazons3/AmazonConfig.java
#	src/main/java/com/example/dplus/controller/account/AccountMyPageController.java
#	src/main/java/com/example/dplus/dto/response/ArtWorkResponseDto.java
#	src/main/java/com/example/dplus/jwt/AuthenticationEntryPointHandler.java
#	src/main/java/com/example/dplus/repository/account/AccountRepositoryCustom.java
#	src/main/java/com/example/dplus/repository/account/AccountRepositoryImpl.java
#	src/main/java/com/example/dplus/repository/artwork/ArtWorkRepositoryCustom.java
#	src/main/java/com/example/dplus/repository/artwork/image/ArtWorkImageRepositoryImpl.java
#	src/main/java/com/example/dplus/repository/artwork/image/ArtworkImageRepositoryCustom.java
#	src/main/java/com/example/dplus/service/account/AccountMyPageService.java
#	src/main/java/com/example/dplus/service/account/KakaoAccountService.java
#	src/main/java/com/example/dplus/service/artwork/ArtworkMainServiceImpl.java
#	src/main/java/com/example/dplus/service/post/PostMainPageService.java
#	src/main/java/com/example/dplus/service/post/PostMainPageServiceImpl.java
#	src/main/resources/application.yml
    @RobiiinChoi
    RobiiinChoi committed Apr 4, 2022
    Configuration menu
    Copy the full SHA
    25fe7ca View commit details
    Browse the repository at this point in the history

  5. Merge branch 'dev' of https://github.com/https-github-com-Allaccept12… 

    …/D_Team_Back into revert--artwork,--post,--main
    @RobiiinChoi
    RobiiinChoi committed Apr 4, 2022
    Configuration menu
    Copy the full SHA
    1117a2a View commit details
    Browse the repository at this point in the history

  6. Merge branch 'main' of https://github.com/https-github-com-Allaccept1… 

    …2/D_Team_Back into revert--artwork,--post,--main

# Conflicts:
#	.gitignore
#	src/main/java/com/example/dplus/advice/ErrorCode.java
#	src/main/java/com/example/dplus/controller/account/AccountMyPageController.java
#	src/main/java/com/example/dplus/dto/response/ArtWorkResponseDto.java
#	src/main/java/com/example/dplus/repository/post/answer/PostAnswerRepository.java
#	src/main/java/com/example/dplus/repository/post/comment/PostCommentRepository.java
#	src/main/java/com/example/dplus/repository/post/like/PostAnswerLikesRepository.java
#	src/main/java/com/example/dplus/service/account/AccountMyPageService.java
#	src/main/java/com/example/dplus/service/account/KakaoAccountService.java
#	src/main/java/com/example/dplus/service/artwork/ArtworkMainServiceImpl.java
#	src/main/java/com/example/dplus/service/post/PostMainPageService.java
#	src/main/java/com/example/dplus/service/post/PostMainPageServiceImpl.java
#	src/main/java/com/example/dplus/testdata/DummyDataCreate.java
#	src/main/resources/application.yml
    @RobiiinChoi
    RobiiinChoi committed Apr 4, 2022
    Configuration menu
    Copy the full SHA
    5ebac4f View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2022

  1. [FEAT] testcode 브랜치

    @Allaccept12
    Allaccept12 committed Apr 6, 2022
    Configuration menu
    Copy the full SHA
    2c419b9 View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2022

  1. Merge branch 'testcode-2' of https://github.com/https-github-com-Alla… 

    …ccept12/D_Team_Back into test--jh

# Conflicts:
#	src/main/java/com/example/dplus/controller/post/PostMainController.java
#	src/main/java/com/example/dplus/repository/post/comment/PostCommentRepository.java
#	src/main/java/com/example/dplus/service/TestDataRunner.java
#	src/main/resources/application-real1.yml
#	src/main/resources/application-real2.yml
    @RobiiinChoi
    RobiiinChoi committed Apr 7, 2022
    Configuration menu
    Copy the full SHA
    f6cbc96 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' of https://github.com/https-github-com-Allaccept1… 

    …2/D_Team_Back into test--jh
    @RobiiinChoi
    RobiiinChoi committed Apr 7, 2022
    Configuration menu
    Copy the full SHA
    f522d92 View commit details
    Browse the repository at this point in the history

  3. [FIX] 아트워크 좋아요 에러 수정 시도 #1

    @RobiiinChoi
    RobiiinChoi committed Apr 7, 2022
    Configuration menu
    Copy the full SHA
    953d2d4 View commit details
    Browse the repository at this point in the history
Loading