[prev in list] [next in list] [prev in thread] [next in thread] 

List:       markus-dev
Subject:    [MarkUs-dev] [MarkUsProject/Markus] 3c2c12: Merge remote-tracking branch 'MarkUsProject/master...
From:       GitHub <noreply () github ! com>
Date:       2016-09-25 15:54:31
Message-ID: 57e7f3371ca78_237e3febabe9d140437e5 () hookshot-fe4-cp1-prd ! iad ! github ! net ! mail
[Download RAW message or body]

Branch: refs/heads/master
  Home:   https://github.com/MarkUsProject/Markus
  Commit: 3c2c124e4de304796faea3f9b7786a8e47281e3b
      https://github.com/MarkUsProject/Markus/commit/3c2c124e4de304796faea3f9b7786a8e47281e3b
  Author: MBAustin <austin.matthew.b@gmail.com>
  Date:   2016-09-24 (Sat, 24 Sep 2016)

  Changed paths:
    M app/controllers/results_controller.rb
    M lib/tasks/marks.rake
    M test/functional/api/submission_downloads_controller_test.rb

  Log Message:
  -----------
  Merge remote-tracking branch 'MarkUsProject/master' into issue-#2599


  Commit: 8fc7396b31fa4cd22c0f815e61870382d91014cb
      https://github.com/MarkUsProject/Markus/commit/8fc7396b31fa4cd22c0f815e61870382d91014cb
  Author: MBAustin <austin.matthew.b@gmail.com>
  Date:   2016-09-24 (Sat, 24 Sep 2016)

  Changed paths:
    M app/views/graders/_graders_action_column.js.jsx.erb

  Log Message:
  -----------
  Fixed lack of "link" cursor on grader assignment icons

Wrapping each icon in a div allows all 3 to be <input>, instead of the
first being <input> and the next 2 being <img>


  Commit: 81cdb4ae3278b5d8eb2ea02b4f07bba833e8f6dd
      https://github.com/MarkUsProject/Markus/commit/81cdb4ae3278b5d8eb2ea02b4f07bba833e8f6dd
  Author: MBAustin <austin.matthew.b@gmail.com>
  Date:   2016-09-24 (Sat, 24 Sep 2016)

  Changed paths:
    M app/views/criteria/_criterion.html.erb
    M app/views/criteria/update.js.erb

  Log Message:
  -----------
  Merge remote-tracking branch 'MarkUsProject/master' into issue-#2599


  Commit: aa5c41b25a49dff70c3d627daaa811de767b9a30
      https://github.com/MarkUsProject/Markus/commit/aa5c41b25a49dff70c3d627daaa811de767b9a30
  Author: MBAustin <austin.matthew.b@gmail.com>
  Date:   2016-09-24 (Sat, 24 Sep 2016)

  Changed paths:
    M app/views/graders/_graders_action_column.js.jsx.erb

  Log Message:
  -----------
  Fixed button alt text


  Commit: e6a940b71f65fc3aa4cac4a3efc3a35bf636ec1a
      https://github.com/MarkUsProject/Markus/commit/e6a940b71f65fc3aa4cac4a3efc3a35bf636ec1a
  Author: Karen Reid <reid@cs.toronto.edu>
  Date:   2016-09-25 (Sun, 25 Sep 2016)

  Log Message:
  -----------
  Merge pull request #2738 from MBAustin/issue-#2599

Issue #2599


Compare: https://github.com/MarkUsProject/Markus/compare/37e74b2f4cfc...e6a940b71f65

_______________________________________________
Markus-dev mailing list
Markus-dev@markusproject.org
http://markusproject.org/cgi-bin/mailman/listinfo/markus-dev


[prev in list] [next in list] [prev in thread] [next in thread]