8000 Comparing master...solution-2016 · AndroidCourseMaterial/PhotoMessage · GitHub
[go: up one dir, main page]
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: AndroidCourseMaterial/PhotoMessage
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: AndroidCourseMaterial/PhotoMessage
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: solution-2016
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 9 commits
  • 4 files changed
  • 1 contributor

Commits on Jan 30, 2016

  1. Done camera launch

    @mboutell
    mboutell committed Jan 30, 2016
    Configuration menu
    Copy the full SHA
    d8789a5 View commit details
    Browse the repository at this point in the history

  2. Gallery done

    @mboutell
    mboutell committed Jan 30, 2016
    Configuration menu
    Copy the full SHA
    016c230 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'refs/remotes/origin/master' into soluti… 

    …on-2016

# Conflicts:

#	PhotoMessage/app/src/main/java/edu/rosehulman/photomessage/MainActivity.java
    @mboutell
    mboutell committed Jan 30, 2016
    Configuration menu
    Copy the full SHA
    7a253d7 View commit details
    Browse the repository at this point in the history

  4. Fix scaling issues in display

    @mboutell
    mboutell committed Jan 30, 2016
    Configuration menu
    Copy the full SHA
    9410911 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'refs/remotes/origin/master' into soluti… 

    …on-2016

# Conflicts:

#	PhotoMessage/app/src/main/java/edu/rosehulman/photomessage/DisplayLabeledPhotoActivity.java
    @mboutell
    mboutell committed Jan 30, 2016
    Configuration menu
    Copy the full SHA
    681e7e0 View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2016

  1. Add notification

    @mboutell
    mboutell committed Feb 1, 2016
    Configuration menu
    Copy the full SHA
    dd9dd9e View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'refs/remotes/origin/master' into soluti… 

    …on-2016
    @mboutell
    mboutell committed Feb 1, 2016
    Configuration menu
    Copy the full SHA
    04a20fa View commit details
    Browse the repository at this point in the history

  3. Finish notifications

    @mboutell
    mboutell committed Feb 1, 2016
    Configuration menu
    Copy the full SHA
    ff1ca3d View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2016

  1. Fix typo

    @mboutell
    mboutell committed Feb 18, 2016
    Configuration menu
    Copy the full SHA
    951060b View commit details
    Browse the repository at this point in the history
Loading
0