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: QuentinBisson/training-java
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: QuentinBisson/training-java
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: angular-rest
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 13 commits
  • 138 files changed
  • 1 contributor

Commits on Jul 28, 2017

  1. [FEATURE] Ajout de services REST pour les ordinateurs et les sociétés

    @QuentinBisson
    QuentinBisson committed Jul 28, 2017
    Configuration menu
    Copy the full SHA
    8eb8b9d View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2017

  1. [FEATURE] Mise en place socle Angular

    @QuentinBisson
    QuentinBisson committed Jul 31, 2017
    Configuration menu
    Copy the full SHA
    cf99d0a View commit details
    Browse the repository at this point in the history

  2. [FEATURE] Ajout du socle Angular non versionné

    @QuentinBisson
    QuentinBisson committed Jul 31, 2017
    Configuration menu
    Copy the full SHA
    4a54570 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into angular-rest 

    # Conflicts:
#	src/main/resources/applicationContext.xml
    @QuentinBisson
    QuentinBisson committed Jul 31, 2017
    Configuration menu
    Copy the full SHA
    d52fc50 View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2017

  1. [FEATURE] Début Angular

    @QuentinBisson
    QuentinBisson committed Aug 4, 2017
    Configuration menu
    Copy the full SHA
    badaefe View commit details
    Browse the repository at this point in the history

  2. [FEATURE] Merge avec Spring MVC

    @QuentinBisson
    QuentinBisson committed Aug 4, 2017
    Configuration menu
    Copy the full SHA
    9a1acab View commit details
    Browse the repository at this point in the history

  3. [FEATURE] Merge avec Spring MVC et annotations

    @QuentinBisson
    QuentinBisson committed Aug 4, 2017
    Configuration menu
    Copy the full SHA
    2dd5715 View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2017

  1. [FEATURE] Ajout hibernate avec QueryDSL + Multimodules

    @QuentinBisson
    QuentinBisson committed Aug 8, 2017
    Configuration menu
    Copy the full SHA
    c8f3482 View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2017

  1. [FEATURE] Ajout du oauth2 + jwt

    @QuentinBisson
    QuentinBisson committed Aug 10, 2017
    Configuration menu
    Copy the full SHA
    329a025 View commit details
    Browse the repository at this point in the history

  2. [REALEASE] V8.0.0

    @QuentinBisson
    QuentinBisson committed Aug 10, 2017
    Configuration menu
    Copy the full SHA
    bd0c343 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into angular-rest

    @QuentinBisson
    QuentinBisson committed Aug 10, 2017
    Configuration menu
    Copy the full SHA
    6a136f2 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'hibernate&multimodule' into angular-rest 

    # Conflicts:
#	pom.xml
#	service/src/main/java/fr/ebiz/computerdatabase/service/impl/CompanyServiceImpl.java
#	service/src/test/java/fr/ebiz/computerdatabase/service/utils/CompanyServiceTest.java
#	service/src/test/java/fr/ebiz/computerdatabase/service/utils/ComputerServiceTest.java
#	src/main/java/fr/ebiz/computerdatabase/persistence/dao/impl/ComputerDaoImpl.java
#	webapp/src/main/java/fr/ebiz/computerdatabase/config/WebConfiguration.java
#	webapp/src/main/java/fr/ebiz/computerdatabase/web/DashboardController.java
    @QuentinBisson
    QuentinBisson committed Aug 10, 2017
    Configuration menu
    Copy the full SHA
    106c6bf View commit details
    Browse the repository at this point in the history

  5. Merge branch 'hibernate&multimodule' into angular-rest 

    # Conflicts:
#	pom.xml
#	service/src/main/java/fr/ebiz/computerdatabase/service/impl/CompanyServiceImpl.java
#	service/src/test/java/fr/ebiz/computerdatabase/service/utils/CompanyServiceTest.java
#	service/src/test/java/fr/ebiz/computerdatabase/service/utils/ComputerServiceTest.java
#	src/main/java/fr/ebiz/computerdatabase/persistence/dao/impl/ComputerDaoImpl.java
#	webapp/src/main/java/fr/ebiz/computerdatabase/config/WebConfiguration.java
#	webapp/src/main/java/fr/ebiz/computerdatabase/web/DashboardController.java
    @QuentinBisson
    QuentinBisson committed Aug 10, 2017
    Configuration menu
    Copy the full SHA
    a38dc2e View commit details
    Browse the repository at this point in the history
Loading