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: ee897fd417f3
Choose a base ref
...
head repository: MarkUsProject/Markus
compare: 32d421d94ed3
Choose a head ref
  • 9 commits
  • 16 files changed
  • 3 contributors

Commits on Jun 11, 2012

  1. Fixed adding criterion for assignments under the 'flexible' marking s…

    …cheme. The functionality to add, delete, get the sum of marks, and flash messages for flexible criterion did not work.
    Daryn Lam committed Jun 11, 2012
    Copy the full SHA
    c7310e6 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2012

  1. Review board fixes

    Daryn Lam committed Jun 28, 2012
    Copy the full SHA
    0d48bd4 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'master' into issue745

    Daryn Lam committed Jun 28, 2012
    Copy the full SHA
    af630ef View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2012

  1. Copy the full SHA
    4b678a6 View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2012

  1. Copy the full SHA
    f99fc82 View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2012

  1. Fix issue with header

    mikeing2001 committed Nov 4, 2012
    Copy the full SHA
    caf7e8c View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2012

  1. Copy the full SHA
    63efe70 View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2012

  1. Merge branch 'master' into issue-745

    Conflicts:
    	app/views/flexible_criteria/_criterion_editor.html.erb
    	app/views/flexible_criteria/_new_flexible_criterion.html.erb
    mikeing2001 committed Nov 14, 2012
    Copy the full SHA
    3a9aa4c View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2012

  1. Merge pull request #911 from mikeing2001/issue-745

    Fix flexible criteria
    jerboaa committed Nov 20, 2012
    Copy the full SHA
    32d421d View commit details
    Browse the repository at this point in the history