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: 647ff6b65937
Choose a base ref
...
head repository: MarkUsProject/Markus
compare: bc3d6fb4f0ba
Choose a head ref
  • 17 commits
  • 8 files changed
  • 4 contributors

Commits on Mar 1, 2012

  1. added a javaskript file that provides functions to warn a user if he/…

    …she tries to navigate away whilst creating/editing an assignment
    seanbud committed Mar 1, 2012
    Copy the full SHA
    cc68205 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    e7cdb3e View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2012

  1. extracted navigation warning code to a newly added file '/view/shared…

    …/_navigation_warning.js.erb'. Fixed warnings to work properly on Google Chrome.
    seanbud committed Mar 5, 2012
    Copy the full SHA
    a9ccc39 View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2012

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

Commits on Mar 11, 2012

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

Commits on Mar 18, 2012

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

Commits on Jun 23, 2012

  1. Fix for issue 769, fix routing issue with grading assignment caused b…

    …y upgrading to rails 3.0
    mikeing2001 committed Jun 23, 2012
    Copy the full SHA
    4d8d3d2 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2012

  1. Closes #772: From/to date not properly displayed.

    On the assignments properties page the delta chain did not display the
    correct date. The problem was a simple logic error while using the
    ternary operator.
    jerboaa committed Jun 25, 2012
    Copy the full SHA
    806fe9b View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2012

  1. Merge pull request #774 from jerboaa/issue_772

    Closes #772: From/to date not properly displayed.
    benjaminvialle committed Jun 26, 2012
    Copy the full SHA
    bc13233 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    c755013 View commit details
    Browse the repository at this point in the history
  3. Merge branch 'master' into issue_651

    Conflicts:
    	app/views/assignments/_form.html.erb
    jerboaa committed Jun 26, 2012
    Copy the full SHA
    f93b7e4 View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    5cfdcdd View commit details
    Browse the repository at this point in the history
  5. Copy the full SHA
    351b3a3 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2012

  1. Merge pull request #776 from mikeing2001/issue-769

    Fix for issue 769, fix routing issue with grading assignment caused by upgrading to rails 3.0.
    Closes #769
    benjaminvialle committed Jun 27, 2012
    Copy the full SHA
    fdcbe19 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    8ed9ff2 View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    e28de2a View commit details
    Browse the repository at this point in the history
  4. Merge pull request #779 from benjaminvialle/ruby19

    Ruby19
    jerboaa committed Jun 27, 2012
    Copy the full SHA
    bc3d6fb View commit details
    Browse the repository at this point in the history