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: MarkUsProject/Markus
base: 0ff5039f0969
Choose a base ref
...
head repository: MarkUsProject/Markus
compare: 37fb1ce813bf
Choose a head ref
  • 8 commits
  • 2 files changed
  • 2 contributors

Commits on Nov 16, 2012

  1. Merge branch 'master' of git://github.com/MarkUsProject/Markus

    @mikeing2001
    mikeing2001 committed Nov 16, 2012
    Copy the full SHA
    226469e View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2012

  1. Merge branch 'master' of git://github.com/MarkUsProject/Markus

    @mikeing2001
    mikeing2001 committed Nov 21, 2012
    Copy the full SHA
    fdd7586 View commit details
    Browse the repository at this point in the history

Commits on Nov 25, 2012

  1. Merge branch 'master' of git://github.com/MarkUsProject/Markus

    @mikeing2001
    mikeing2001 committed Nov 25, 2012
    Copy the full SHA
    27a9772 View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2012

  1. Merge branch 'master' of git://github.com/MarkUsProject/Markus

    @mikeing2001
    mikeing2001 committed Nov 28, 2012
    Copy the full SHA
    88717f0 View commit details
    Browse the repository at this point in the history

  2. Fix for issue 904 as well an unrelated test case

    @mikeing2001
    mikeing2001 committed Nov 28, 2012
    Copy the full SHA
    0274179 View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2012

  1. Merge branch 'master' of git://github.com/MarkUsProject/Markus

    @mikeing2001
    mikeing2001 committed Dec 1, 2012
    Copy the full SHA
    54a0798 View commit details
    Browse the repository at this point in the history

Commits on Dec 3, 2012

  1. Merge branch 'master' into issue-904 

    Conflicts:
	app/views/results/common/_submission_selector.html.erb
    @mikeing2001
    mikeing2001 committed Dec 3, 2012
    Copy the full SHA
    bea2441 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #940 from mikeing2001/issue-904 

    Old marks not showing for remark request using postgresql
    @jerboaa
    jerboaa committed Dec 3, 2012
    Copy the full SHA
    37fb1ce View commit details
    Browse the repository at this point in the history