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

List:       markus-dev
Subject:    [MarkUs-dev] [MarkUsProject/Markus] fd4da7: Merge branch 'master' into assignment-table-fix
From:       GitHub <noreply () github ! com>
Date:       2016-08-20 14:03:26
Message-ID: 57b8632e6e069_587c3fc24ad89130590f () hookshot-fe3-cp1-prd ! iad ! github ! net ! mail
[Download RAW message or body]

Branch: refs/heads/master
  Home:   https://github.com/MarkUsProject/Markus
  Commit: fd4da71dd47e0c5dd721bb95ae42821cd9b753c3
      https://github.com/MarkUsProject/Markus/commit/fd4da71dd47e0c5dd721bb95ae42821cd9b753c3
  Author: Christine Murad <christine.murad@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/criteria_controller.rb
    M app/controllers/peer_reviews_controller.rb
    M app/controllers/results_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/checkbox_criterion.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/rubric_criterion.rb
    M app/models/submission.rb
    M app/views/assignments/_form.html.erb
    M app/views/assignments/_list.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/common/_peer_reviews.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 app/views/results/view_marks.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/criteria_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 assignment-table-fix


  Commit: fb8ae188c4fd88b2acaf6bdda0e744dbb83d2b65
      https://github.com/MarkUsProject/Markus/commit/fb8ae188c4fd88b2acaf6bdda0e744dbb83d2b65
  Author: Christine Murad <christine.murad@mail.utoronto.ca>
  Date:   2016-08-17 (Wed, 17 Aug 2016)

  Changed paths:
    M app/views/layouts/_sub_menu.html.erb

  Log Message:
  -----------
  assignment-table-fix: Hid Peer Review tab is peer review is hidden for students


  Commit: 86328e539b604d84c58b5a89bad2b7f4cf6620f5
      https://github.com/MarkUsProject/Markus/commit/86328e539b604d84c58b5a89bad2b7f4cf6620f5
  Author: Christine Murad <christine.murad@mail.utoronto.ca>
  Date:   2016-08-17 (Wed, 17 Aug 2016)

  Changed paths:
    M app/assets/stylesheets/assignments.scss
    A app/assets/stylesheets/common/_assignment_dropdown.scss
    M app/assets/stylesheets/graders.scss
    M app/assets/stylesheets/groups.scss
    M app/assets/stylesheets/main.scss
    M app/assets/stylesheets/peer_reviews.scss
    M app/assets/stylesheets/results.scss
    M app/assets/stylesheets/submissions.scss
    M app/assets/stylesheets/summaries.scss
    M app/helpers/groups_helper.rb
    M app/helpers/random_assign_helper.rb
    M app/helpers/summaries_helper.rb
    M app/models/peer_review.rb
    M app/views/annotation_categories/index.html.erb
    M app/views/assignments/_form.html.erb
    M app/views/assignments/_list.html.erb
    M app/views/assignments/_peer_review_form.html.erb
    M app/views/assignments/_read.html.erb
    M app/views/assignments/peer_review.html.erb
    M app/views/criteria/index.html.erb
    M app/views/layouts/_sub_menu.html.erb
    M app/views/layouts/_sub_sub_menu.html.erb
    M app/views/shared/_assignments_dropdown_menu.html.erb
    A app/views/shared/_pr_dropdown_menu_li.html.erb
    M app/views/tags/index.html.erb
    M config/locales/en.yml
    M config/locales/es.yml
    M config/locales/fr.yml
    M config/locales/pt.yml
    M lib/tasks/groups.rake
    M lib/tasks/peer_review.rake
    M spec/controllers/peer_reviews_controller_spec.rb

  Log Message:
  -----------
  Merge branch 'master' into assignment-table-fix


  Commit: f54c66ec311198eca51bee16977c1ce729b96769
      https://github.com/MarkUsProject/Markus/commit/f54c66ec311198eca51bee16977c1ce729b96769
  Author: Christine Murad <christine.murad@mail.utoronto.ca>
  Date:   2016-08-17 (Wed, 17 Aug 2016)

  Changed paths:
    M app/views/submissions/browse.html.erb

  Log Message:
  -----------
  assignment-table-fix: Fixed one '_pr' string still remaining


  Commit: 16a5f6f70da6cba0c1976ed3530f322b7e12fdcd
      https://github.com/MarkUsProject/Markus/commit/16a5f6f70da6cba0c1976ed3530f322b7e12fdcd
  Author: David Liu <david@cs.toronto.edu>
  Date:   2016-08-20 (Sat, 20 Aug 2016)

  Changed paths:
    M app/views/layouts/_sub_menu.html.erb
    M app/views/submissions/browse.html.erb

  Log Message:
  -----------
  Merge pull request #2691 from christinem/assignment-table-fix

Assignment Table Styling


Compare: https://github.com/MarkUsProject/Markus/compare/61a974fde3ac...16a5f6f70da6

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