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: bc3d6fb4f0ba
Choose a base ref
...
head repository: MarkUsProject/Markus
compare: a898d50fe110
Choose a head ref
  • 5 commits
  • 19 files changed
  • 2 contributors

Commits on Jun 28, 2012

  1. Fix annotations controller test error.

    The code switched meanwhile to use :x1, :x2, :y1, :y2 over :coords as
    parameters.
    jerboaa committed Jun 28, 2012
    Copy the full SHA
    3556634 View commit details
    Browse the repository at this point in the history
  2. Fix require's (add File.expand_path() calls).

    Use File.expand_path() everywhere so as to be able to run one test file
    with:
    
    $ ruby path/to/test_file.rb
    jerboaa committed Jun 28, 2012
    Copy the full SHA
    24c7801 View commit details
    Browse the repository at this point in the history
  3. Fix pagination of marks spreadsheet.

    A couple of test errors were thrown and an exception showed up when the
    "Grades" tab was selected for a marks spreadsheet. As it turnes out, the
    problem was that the lambda took no arguments but was called with two
    arguments. See app/controllers/grade_entry_forms_controller.rb
    line 29. This fix only changes the offending lambda to take two dummy
    arguments. That is needed as the pagination helper routine is also
    called by the submissions table controllers.
    jerboaa committed Jun 28, 2012
    Copy the full SHA
    3ccfa67 View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    881eb29 View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2012

  1. Merge pull request #783 from jerboaa/ruby19

    Fix remaining test failures
    benjaminvialle committed Jun 29, 2012
    Copy the full SHA
    a898d50 View commit details
    Browse the repository at this point in the history