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

List:       markus-dev
Subject:    [MarkUs-dev] [MarkUsProject/Markus] 18ec38: Fixed include field problem and hash set default g...
From:       GitHub <noreply () github ! com>
Date:       2016-08-17 13:30:28
Message-ID: 57b466f46226d_5f9f3fb191ced13c1032a4 () hookshot-fe5-cp1-prd ! iad ! github ! net ! mail
[Download RAW message or body]

Branch: refs/heads/master
  Home:   https://github.com/MarkUsProject/Markus
  Commit: 18ec381f9001f7c4977206bad40d86cc22c6db45
      https://github.com/MarkUsProject/Markus/commit/18ec381f9001f7c4977206bad40d86cc22c6db45
  Author: Chris Koehler <christopher.koehler@mail.utoronto.ca>
  Date:   2016-08-12 (Fri, 12 Aug 2016)

  Changed paths:
    M app/helpers/random_assign_helper.rb

  Log Message:
  -----------
  Fixed include field problem and hash set default generator


  Commit: a5a7199d16d517a604f7766fbb043e5c1b4cdda5
      https://github.com/MarkUsProject/Markus/commit/a5a7199d16d517a604f7766fbb043e5c1b4cdda5
  Author: Chris Koehler <christopher.koehler@mail.utoronto.ca>
  Date:   2016-08-15 (Mon, 15 Aug 2016)

  Changed paths:
    M app/assets/javascripts/create_assignment.js
    M app/controllers/api/assignments_controller.rb
    M app/controllers/assignments_controller.rb
    M app/controllers/automated_tests_controller.rb
    M app/controllers/peer_reviews_controller.rb
    M app/helpers/automated_tests_helper.rb
    M app/helpers/criteria_helper.rb
    M app/helpers/submissions_helper.rb
    M app/models/assignment.rb
    M app/models/flexible_criterion.rb
    M app/models/grouping.rb
    M app/models/peer_review.rb
    M app/models/result.rb
    M app/models/submission.rb
    M app/views/assignments/_form.html.erb
    M app/views/assignments/_peer_review_form.html.erb
    M app/views/automated_tests/_test_script_upload.html.erb
    M app/views/results/common/_marks_summary_table.html.erb
    M app/views/results/marker/_marker_rubric_criterion_li.html.erb
    M app/views/results/student/_student_rubric_criterion_li.html.erb
    M config/application.rb
    M config/initializers/02_i18n.rb
    M config/locales/en.yml
    A config/locales/es.yml
    M config/locales/fr.yml
    M config/locales/pt.yml
    M config/routes.rb
    A db/migrate/20160809145347_remove_marking_scheme_type_from_assignment.rb
    A db/migrate/20160810184655_add_peer_review_id_to_results.rb
    M db/schema.rb
    M lib/tasks/assignments.rake
    M lib/tasks/demo.rake
    M lib/tasks/marks.rake
    M lib/tasks/populate.rake
    M lib/tasks/remarks.rake
    M lib/tasks/results.rake
    M lib/tasks/rubric.rake
    M lib/tasks/simulator.rake
    M spec/controllers/assignments_controller_spec.rb
    M spec/controllers/criteria_controller_spec.rb
    M spec/factories/assignments.rb
    A spec/factories/checkbox_criteria.rb
    M spec/factories/flexible_criteria.rb
    M spec/factories/rubric_criteria.rb
    A spec/fixtures/files/criteria/download_yml_output.yaml
    A spec/fixtures/files/criteria/upload_yml_mixed.yaml
    M spec/models/assignment_spec.rb
    M spec/models/flexible_criterion_spec.rb
    M spec/models/rubric_criterion_spec.rb
    M spec/support/criterion.rb
    M test/blueprints/blueprints.rb
    M test/functional/api/assignments_controller_test.rb
    M test/functional/assignments_controller_test.rb
    M test/functional/graders_controller_test.rb
    M test/functional/results_controller_test.rb
    M test/unit/assignment_test.rb
    M test/unit/flexible_criterion_test.rb
    M test/unit/helpers/ensure_config_helper_test.rb
    M test/unit/rubric_criteria_test.rb

  Log Message:
  -----------
  Merge branch 'master' into pr_assign_fix


  Commit: e05f2633eb1b7f63f38020b632dd5432b278d67b
      https://github.com/MarkUsProject/Markus/commit/e05f2633eb1b7f63f38020b632dd5432b278d67b
  Author: Chris Koehler <christopher.koehler@mail.utoronto.ca>
  Date:   2016-08-15 (Mon, 15 Aug 2016)

  Changed paths:
    M app/helpers/random_assign_helper.rb

  Log Message:
  -----------
  Fixed hash assignment, added shuffling


  Commit: 839e9a21f2609878a75177a0dc97451764632da6
      https://github.com/MarkUsProject/Markus/commit/839e9a21f2609878a75177a0dc97451764632da6
  Author: Chris Koehler <christopher.koehler@mail.utoronto.ca>
  Date:   2016-08-15 (Mon, 15 Aug 2016)

  Changed paths:
    M app/helpers/random_assign_helper.rb

  Log Message:
  -----------
  Fixed a comment typo


  Commit: 5af974e70b2b0eddafec168e513b721508220c43
      https://github.com/MarkUsProject/Markus/commit/5af974e70b2b0eddafec168e513b721508220c43
  Author: david-yz-liu <david@cs.toronto.edu>
  Date:   2016-08-17 (Wed, 17 Aug 2016)

  Changed paths:
    M app/helpers/random_assign_helper.rb

  Log Message:
  -----------
  Merge branch 'pr_assign_fix' of https://github.com/WChrisK/Markus


Compare: https://github.com/MarkUsProject/Markus/compare/ebaf8f9a3038...5af974e70b2b

_______________________________________________
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]