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: JavaOPs/topjava
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: NikoMart/topjava
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 17 commits
  • 88 files changed
  • 2 contributors

Commits on Jun 16, 2017

  1. Add info

    @JavaOPs
    JavaOPs committed Jun 16, 2017
    Configuration menu
    Copy the full SHA
    128b1d5 View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2017

  1. Update README.md

    @JavaOPs
    JavaOPs authored Jun 22, 2017
    Configuration menu
    Copy the full SHA
    9e01154 View commit details
    Browse the repository at this point in the history

  2. Update README.md

    @JavaOPs
    JavaOPs authored Jun 22, 2017
    Configuration menu
    Copy the full SHA
    901328e View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2017

  1. Prepare to HW0

    @NikoMart
    NikoMart committed Jul 9, 2017
    Configuration menu
    Copy the full SHA
    aedd76f View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2017

  1. 1 0 fix

    @NikoMart
    NikoMart committed Jul 15, 2017
    Configuration menu
    Copy the full SHA
    22eface View commit details
    Browse the repository at this point in the history

  2. Prepare to HW0

    @NikoMart
    NikoMart committed Jul 15, 2017
    Configuration menu
    Copy the full SHA
    591a16b View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/master'

    @NikoMart
    NikoMart committed Jul 15, 2017
    Configuration menu
    Copy the full SHA
    a7ce709 View commit details
    Browse the repository at this point in the history

  4. HW0 stream

    @NikoMart
    NikoMart committed Jul 15, 2017
    Configuration menu
    Copy the full SHA
    bac0408 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'origin/master' 

    # Conflicts:
#	src/main/java/ru/javawebinar/topjava/model/MealWithExceed.java
#	src/main/java/ru/javawebinar/topjava/util/MealsUtil.java
    @NikoMart
    NikoMart committed Jul 15, 2017
    Configuration menu
    Copy the full SHA
    686a0dd View commit details
    Browse the repository at this point in the history

  6. HW0 stream

    @NikoMart
    NikoMart committed Jul 15, 2017
    Configuration menu
    Copy the full SHA
    465b330 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2017

  1. Prepare to HW2

    @NikoMart
    NikoMart committed Jul 22, 2017
    Configuration menu
    Copy the full SHA
    fdc4321 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2017

  1. Revert "Prepare to HW2" 

    This reverts commit fdc4321
    @NikoMart
    NikoMart committed Jul 24, 2017
    Configuration menu
    Copy the full SHA
    f03695e View commit details
    Browse the repository at this point in the history

  2. Revert "Prepare to HW2" 

    This reverts commit fdc4321
    @NikoMart
    NikoMart committed Jul 24, 2017
    Configuration menu
    Copy the full SHA
    b17c83f View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2017

  1. prepare HW3

    @NikoMart
    NikoMart committed Aug 5, 2017
    Configuration menu
    Copy the full SHA
    3af01ba View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2017

  1. prepare to HW4

    @NikoMart
    NikoMart committed Aug 12, 2017
    Configuration menu
    Copy the full SHA
    ab519f0 View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2017

  1. Prepare to HW5

    @NikoMart
    NikoMart committed Sep 15, 2017
    Configuration menu
    Copy the full SHA
    26ae718 View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2017

  1. Prepare to HW6

    @NikoMart
    NikoMart committed Sep 17, 2017
    Configuration menu
    Copy the full SHA
    73bb7f4 View commit details
    Browse the repository at this point in the history
Loading