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

List:       markus-dev
Subject:    [MarkUsProject/Markus] 733838: FIX for issue 1027 - updated code base to use appr...
From:       GitHub <noreply () github ! com>
Date:       2013-03-31 15:13:31
Message-ID: 5158529bdefda_13efe8c13c97c9 () hookshot-fe1-pe1-prd ! aws ! github ! net ! mail
[Download RAW message or body]

----==_mimepart_5158529bd7fde_13efe8c13c95eb
Date: Sun, 31 Mar 2013 08:13:31 -0700
Mime-Version: 1.0
Content-Type: text/plain;
 charset=UTF-8
Content-Transfer-Encoding: 7bit
Content-ID: <5158529bdb678_13efe8c13c9678@hookshot-fe1-pe1-prd.aws.github.net.mail>

  Branch: refs/heads/master
  Home:   https://github.com/MarkUsProject/Markus
  Commit: 73383833d642f29341e495b109b076b043dfcdf6
      https://github.com/MarkUsProject/Markus/commit/73383833d642f29341e495b109b076b043dfcdf6
  Author: Alysha <alyshakwok@gmail.com>
  Date:   2013-03-25 (Mon, 25 Mar 2013)

  Changed paths:
    M app/controllers/assignments_controller.rb
    M app/controllers/results_controller.rb
    M app/controllers/submissions_controller.rb
    M app/models/assignment.rb
    M app/models/grouping.rb
    M app/models/rubric_criterion.rb
    M app/views/results/common/_file_selector.html.erb
    M app/views/submissions/submissions_table_row/_table_row.html.erb
    M app/views/submissions/update_converted_pdfs.rjs
    M lib/benchmarking/submission_files/assignments_controller.rb
    M lib/benchmarking/submission_files/results_controller.rb
    M lib/benchmarking/submission_files/submissions_controller.rb
    M lib/tasks/demo.rake
    M lib/tasks/results.rake
    M lib/tasks/simulator.rake
    M test/functional/assignments_controller_test.rb
    M test/functional/results_controller_test.rb
    M test/unit/assignment_test.rb
    M test/unit/grace_period_submission_rule_test.rb
    M test/unit/no_late_submission_rule_test.rb
    M test/unit/penalty_decay_period_submission_rule_test.rb
    M test/unit/penalty_period_submission_rule_test.rb
    M test/unit/submission_test.rb

  Log Message:
  -----------
  FIX for issue 1027 - updated code base to use appropriate result (remark or \
original)


  Commit: 59f3656239705200d9307432c015c015af4f613e
      https://github.com/MarkUsProject/Markus/commit/59f3656239705200d9307432c015c015af4f613e
  Author: Alysha <alyshakwok@gmail.com>
  Date:   2013-03-27 (Wed, 27 Mar 2013)

  Changed paths:
    M app/views/submissions/submissions_table_row/_table_row.html.erb

  Log Message:
  -----------
  Update methods that get results for file dealing with the icons on the grade table \
to use the appropriate helper method


  Commit: 3e625b6bdc1144fb0cfad0d2f52d3beb17f4c23b
      https://github.com/MarkUsProject/Markus/commit/3e625b6bdc1144fb0cfad0d2f52d3beb17f4c23b
  Author: Benjamin Vialle <github@vialle.io>
  Date:   2013-03-31 (Sun, 31 Mar 2013)

  Changed paths:
    M app/controllers/assignments_controller.rb
    M app/controllers/results_controller.rb
    M app/controllers/submissions_controller.rb
    M app/models/assignment.rb
    M app/models/grouping.rb
    M app/models/rubric_criterion.rb
    M app/views/results/common/_file_selector.html.erb
    M app/views/submissions/submissions_table_row/_table_row.html.erb
    M app/views/submissions/update_converted_pdfs.rjs
    M lib/benchmarking/submission_files/assignments_controller.rb
    M lib/benchmarking/submission_files/results_controller.rb
    M lib/benchmarking/submission_files/submissions_controller.rb
    M lib/tasks/demo.rake
    M lib/tasks/results.rake
    M lib/tasks/simulator.rake
    M test/functional/assignments_controller_test.rb
    M test/functional/results_controller_test.rb
    M test/unit/assignment_test.rb
    M test/unit/grace_period_submission_rule_test.rb
    M test/unit/no_late_submission_rule_test.rb
    M test/unit/penalty_decay_period_submission_rule_test.rb
    M test/unit/penalty_period_submission_rule_test.rb
    M test/unit/submission_test.rb

  Log Message:
  -----------
  Merge pull request #1058 from akwok18/issue-1027

Updated code base to use appropriate result.
Closes #1027 -


Compare: https://github.com/MarkUsProject/Markus/compare/f60a6b9fbeaf...3e625b6bdc11

----==_mimepart_5158529bd7fde_13efe8c13c95eb--


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