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: rufans/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.
  • 19 commits
  • 40 files changed
  • 3 contributors

Commits on May 13, 2016

  1. Add description

    @JavaWebinar
    JavaWebinar committed May 13, 2016
    Configuration menu
    Copy the full SHA
    d8cd374 View commit details
    Browse the repository at this point in the history

Commits on May 18, 2016

  1. Update README.md

    @JavaOPs
    JavaOPs committed May 18, 2016
    Configuration menu
    Copy the full SHA
    32ffd17 View commit details
    Browse the repository at this point in the history

Commits on May 19, 2016

  1. Update cv.md

    @JavaOPs
    JavaOPs committed May 19, 2016
    Configuration menu
    Copy the full SHA
    f5a5fef View commit details
    Browse the repository at this point in the history

  2. Update cv.md

    @JavaOPs
    JavaOPs committed May 19, 2016
    Configuration menu
    Copy the full SHA
    740690f View commit details
    Browse the repository at this point in the history

Commits on May 27, 2016

  1. Added "Prepare to HW0" patch

    @rufans
    rufans committed May 27, 2016
    Configuration menu
    Copy the full SHA
    f6508d2 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2016

  1. Changed packaging to war

    @rufans
    rufans committed Jun 7, 2016
    Configuration menu
    Copy the full SHA
    541ba4e View commit details
    Browse the repository at this point in the history

  2. Changed packaging to war 

    Added servlet and jsp/html
    @rufans
    rufans committed Jun 7, 2016
    Configuration menu
    Copy the full SHA
    a30106f View commit details
    Browse the repository at this point in the history

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

    # Conflicts:
#	src/main/webapp/WEB-INF/web.xml
    @rufans
    rufans committed Jun 7, 2016
    Configuration menu
    Copy the full SHA
    0ecb480 View commit details
    Browse the repository at this point in the history

  4. Changed forward to redirect

    @rufans
    rufans committed Jun 7, 2016
    Configuration menu
    Copy the full SHA
    1cc6216 View commit details
    Browse the repository at this point in the history

  5. applied pach 1_5

    @rufans
    rufans committed Jun 7, 2016
    Configuration menu
    Copy the full SHA
    7d1a40c View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2016

  1. added logging for project

    @rufans
    rufans committed Jun 8, 2016
    Configuration menu
    Copy the full SHA
    e965b78 View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2016

  1. added patch 1_1_stream

    @rufans
    rufans committed Jun 9, 2016
    Configuration menu
    Copy the full SHA
    e40d699 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2016

  1. added patch 1_1_byCycle

    @rufans
    rufans committed Jun 26, 2016
    Configuration menu
    Copy the full SHA
    d7e3c72 View commit details
    Browse the repository at this point in the history

  2. added patch 2_1 - viewing meal list to jsp

    @rufans
    rufans committed Jun 26, 2016
    Configuration menu
    Copy the full SHA
    65bd161 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2016

  1. added 2-HW1-optional patch (CRUD)

    @rufans
    rufans committed Jun 28, 2016
    Configuration menu
    Copy the full SHA
    d7c0458 View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2016

  1. applied 3-app-layers patch

    @rufans
    rufans committed Jul 1, 2016
    Configuration menu
    Copy the full SHA
    d9fcc5b View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2016

  1. applied 4-add-spring-context.patch

    @rufans
    rufans committed Jul 7, 2016
    Configuration menu
    Copy the full SHA
    8353452 View commit details
    Browse the repository at this point in the history

  2. applied 5-add-dependency-injection.patch

    @rufans
    rufans committed Jul 7, 2016
    Configuration menu
    Copy the full SHA
    0975b33 View commit details
    Browse the repository at this point in the history

  3. applied 6-add-annotation-processing.patch

    @rufans
    rufans committed Jul 7, 2016
    Configuration menu
    Copy the full SHA
    aac8bce View commit details
    Browse the repository at this point in the history
Loading