[prev in list] [next in list] [prev in thread] [next in thread]
List: markus-dev
Subject: [MarkUs-dev] [MarkUsProject/Markus] c6d917: assignment-marking-scheme-type: Ground work for de...
From: GitHub <noreply () github ! com>
Date: 2016-08-12 23:46:28
Message-ID: 57ae5fd4d3d66_68143fd6d78711381682b () hookshot-fe3-cp1-prd ! iad ! github ! net ! mail
[Download RAW message or body]
Branch: refs/heads/master
Home: https://github.com/MarkUsProject/Markus
Commit: c6d9179e9e28e0813bdcc9d648bd145314502caa
https://github.com/MarkUsProject/Markus/commit/c6d9179e9e28e0813bdcc9d648bd145314502caa
Author: Christian Garcia <christian.garciasalguero@mail.utoronto.ca>
Date: 2016-08-08 (Mon, 08 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/models/assignment.rb
M app/models/flexible_criterion.rb
M app/views/assignments/_form.html.erb
M app/views/assignments/_peer_review_form.html.erb
M config/locales/en.yml
M config/locales/fr.yml
M config/locales/pt.yml
M lib/tasks/assignments.rake
M lib/tasks/demo.rake
M lib/tasks/populate.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
M spec/factories/flexible_criteria.rb
M spec/factories/rubric_criteria.rb
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/rubric_criteria_test.rb
Log Message:
-----------
assignment-marking-scheme-type: Ground work for deleting marking_scheme_type for \
assignments.
Commit: 51ba8de5e348872d63b4dd8232fddcc16a7173cf
https://github.com/MarkUsProject/Markus/commit/51ba8de5e348872d63b4dd8232fddcc16a7173cf
Author: Christian Garcia <christian.garciasalguero@mail.utoronto.ca>
Date: 2016-08-08 (Mon, 08 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/models/assignment.rb
M app/models/flexible_criterion.rb
M app/views/assignments/_form.html.erb
M app/views/assignments/_peer_review_form.html.erb
M config/locales/en.yml
M config/locales/fr.yml
M config/locales/pt.yml
M lib/tasks/assignments.rake
M lib/tasks/demo.rake
M lib/tasks/populate.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
M spec/factories/flexible_criteria.rb
M spec/factories/rubric_criteria.rb
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/rubric_criteria_test.rb
Log Message:
-----------
assignment-marking-scheme-type: Ground work for deleting marking_scheme_type for \
assignments.
Commit: d0b3a0945adccbb6ba28818db2073f265ed72284
https://github.com/MarkUsProject/Markus/commit/d0b3a0945adccbb6ba28818db2073f265ed72284
Author: Christian Garcia <christian.garciasalguero@mail.utoronto.ca>
Date: 2016-08-09 (Tue, 09 Aug 2016)
Changed paths:
M app/controllers/automated_tests_controller.rb
M app/helpers/automated_tests_helper.rb
M app/views/automated_tests/_test_script_upload.html.erb
Log Message:
-----------
Deleted call to criterion_class in automated_tests_helper.
Commit: 8254ac83e14fcfc613193693b7f3087c58991107
https://github.com/MarkUsProject/Markus/commit/8254ac83e14fcfc613193693b7f3087c58991107
Author: Christian Garcia <christian.garciasalguero@mail.utoronto.ca>
Date: 2016-08-09 (Tue, 09 Aug 2016)
Changed paths:
A db/migrate/20160809145347_remove_marking_scheme_type_from_assignment.rb
M db/schema.rb
M lib/tasks/rubric.rake
Log Message:
-----------
assignment-marking-scheme-type: Deleted marking_scheme_type column from assignments \
table and changed seeding to seed assignments with all types of criteria.
Commit: e46afff66d56355faf9a5ef6e22b786b5bced053
https://github.com/MarkUsProject/Markus/commit/e46afff66d56355faf9a5ef6e22b786b5bced053
Author: Christian Garcia <christian.garciasalguero@mail.utoronto.ca>
Date: 2016-08-09 (Tue, 09 Aug 2016)
Changed paths:
M app/views/assignments/peer_review.html.erb
M config/locales/en.yml
Log Message:
-----------
Merge branch 'master' of git://github.com/MarkUsProject/Markus into \
assignment-marking-scheme-type In order to push changes from \
assignment-marking-scheme-type.
Commit: dfa9cea53660721e8ee070da13aa9c8aca561274
https://github.com/MarkUsProject/Markus/commit/dfa9cea53660721e8ee070da13aa9c8aca561274
Author: Christian Garcia <christian.garciasalguero@mail.utoronto.ca>
Date: 2016-08-09 (Tue, 09 Aug 2016)
Log Message:
-----------
Merge branch 'assignment-marking-scheme-type' of github.com:GitGeminiano/Markus \
into assignment-marking-scheme-type
Commit: 5f0ec050fbb6c22391a385b6742ede04f85a1f7a
https://github.com/MarkUsProject/Markus/commit/5f0ec050fbb6c22391a385b6742ede04f85a1f7a
Author: Christian Garcia <christian.garciasalguero@mail.utoronto.ca>
Date: 2016-08-09 (Tue, 09 Aug 2016)
Changed paths:
M app/controllers/automated_tests_controller.rb
M app/helpers/automated_tests_helper.rb
M app/views/automated_tests/_test_script_upload.html.erb
Log Message:
-----------
assignment-marking-scheme: Changed criterion_id_type parameter to criterion_id.
Commit: f908494e22818ec82d200353e757a8302e1b8d81
https://github.com/MarkUsProject/Markus/commit/f908494e22818ec82d200353e757a8302e1b8d81
Author: david-yz-liu <david@cs.toronto.edu>
Date: 2016-08-12 (Fri, 12 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/helpers/automated_tests_helper.rb
M app/models/assignment.rb
M app/models/flexible_criterion.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 config/locales/en.yml
M config/locales/fr.yml
M config/locales/pt.yml
A db/migrate/20160809145347_remove_marking_scheme_type_from_assignment.rb
M db/schema.rb
M lib/tasks/assignments.rake
M lib/tasks/demo.rake
M lib/tasks/populate.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
M spec/factories/flexible_criteria.rb
M spec/factories/rubric_criteria.rb
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/rubric_criteria_test.rb
Log Message:
-----------
Merge branch 'assignment-marking-scheme-type' of \
https://github.com/GitGeminiano/Markus
Commit: 7d6a728894d2ccdf92d8bc30e5ba6080b6808d51
https://github.com/MarkUsProject/Markus/commit/7d6a728894d2ccdf92d8bc30e5ba6080b6808d51
Author: david-yz-liu <david@cs.toronto.edu>
Date: 2016-08-12 (Fri, 12 Aug 2016)
Changed paths:
M app/helpers/automated_tests_helper.rb
M app/views/automated_tests/_test_script_upload.html.erb
Log Message:
-----------
Some fixes for #2686
Compare: https://github.com/MarkUsProject/Markus/compare/e34f9d9346c7...7d6a728894d2
_______________________________________________
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]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic