[prev in list] [next in list] [prev in thread] [next in thread]
List: markus-dev
Subject: [MarkUs-dev] [MarkUsProject/Markus] 9f1624: Added peer review tab javascript files and other c...
From: GitHub <noreply () github ! com>
Date: 2016-06-20 19:42:16
Message-ID: 5768471850f6c_70d3fbe285b72c02808a7 () hookshot-fe5-cp1-prd ! iad ! github ! net ! mail
[Download RAW message or body]
Branch: refs/heads/master
Home: https://github.com/MarkUsProject/Markus
Commit: 9f1624e3ac9917a4998b761e6e2d381a75b7edc5
https://github.com/MarkUsProject/Markus/commit/9f1624e3ac9917a4998b761e6e2d381a75b7edc5
Author: Chris Koehler <christopher.koehler@mail.utoronto.ca>
Date: 2016-05-26 (Thu, 26 May 2016)
Changed paths:
A app/assets/stylesheets/peer_reviews.scss
M app/controllers/peer_reviews_controller.rb
M app/views/layouts/_sub_menu.html.erb
A app/views/peer_reviews/_peer_review_action_column.js.jsx.erb
A app/views/peer_reviews/_peer_review_manager.js.jsx.erb
A app/views/peer_reviews/_peer_review_table.js.jsx.erb
A app/views/peer_reviews/index.html.erb
M config/locales/en.yml
M config/routes.rb
Log Message:
-----------
Added peer review tab javascript files and other changes
Commit: 45549660bcb6f6af260d9c4134b8197f995f197e
https://github.com/MarkUsProject/Markus/commit/45549660bcb6f6af260d9c4134b8197f995f197e
Author: Chris Koehler <christopher.koehler@mail.utoronto.ca>
Date: 2016-06-01 (Wed, 01 Jun 2016)
Changed paths:
M app/assets/javascripts/Grader/file_selector.js
A app/assets/javascripts/Results/index.js
M app/assets/stylesheets/grader.scss
M app/controllers/job_messages_controller.rb
M app/controllers/peer_reviews_controller.rb
M app/controllers/submissions_controller.rb
M app/helpers/results_helper.rb
M app/helpers/submissions_helper.rb
A app/jobs/submissions_job.rb
M app/models/assignment.rb
M app/models/grace_period_submission_rule.rb
M app/models/job_messenger.rb
M app/models/submission_collector.rb
M app/views/assignments/_form.html.erb
A app/views/assignments/_peer_review_form.html.erb
M app/views/assignments/edit.html.erb
M app/views/job_messages/_job_poller.js.erb
M app/views/peer_reviews/index.html.erb
M app/views/results/_result_summary.html.erb
A app/views/results/common/_download_file_selector.html.erb
R app/views/results/common/_file_selector.html.erb
A app/views/results/common/_file_selector_dropdown.html.erb
M app/views/results/edit.html.erb
M app/views/results/marker/_marker_panes.html.erb
M app/views/results/student/_student_panes.html.erb
M app/views/results/view_marks.html.erb
M app/views/submissions/_submissions_table.js.jsx.erb
M app/views/submissions/browse.html.erb
A app/views/submissions/collect_all_submissions.js.erb
M config/locales/en.yml
M config/locales/fr.yml
M config/locales/pt.yml
M config/routes.rb
M spec/controllers/submissions_controller_spec.rb
R spec/helpers/submissions_helper_spec.rb
M spec/models/assignment_spec.rb
R spec/models/submission_collector_spec.rb
M spec/routing/routes_spec.rb
M test/unit/grouping_test.rb
R test/unit/submission_collector_test.rb
Log Message:
-----------
Merged in master and started migrating peer review tab data
Commit: 9a5f6f293e584dc9f93044de5a2c3af5c82ed9b2
https://github.com/MarkUsProject/Markus/commit/9a5f6f293e584dc9f93044de5a2c3af5c82ed9b2
Author: Chris Koehler <christopher.koehler@mail.utoronto.ca>
Date: 2016-06-02 (Thu, 02 Jun 2016)
Changed paths:
A app/assets/javascripts/PeerReviews/index.js
M app/controllers/groups_controller.rb
M app/controllers/peer_reviews_controller.rb
M app/views/peer_reviews/_peer_review_action_column.js.jsx.erb
M app/views/peer_reviews/_peer_review_manager.js.jsx.erb
M app/views/peer_reviews/_peer_review_table.js.jsx.erb
A app/views/peer_reviews/_peer_reviews_new_manager.js.jsx.erb
M app/views/peer_reviews/index.html.erb
M config/locales/en.yml
Log Message:
-----------
Changed to temporary PR view with group-to-group info
Commit: 400ed8d5a6d37abb035912745ff21938f6aaaeaf
https://github.com/MarkUsProject/Markus/commit/400ed8d5a6d37abb035912745ff21938f6aaaeaf
Author: Chris Koehler <christopher.koehler@mail.utoronto.ca>
Date: 2016-06-02 (Thu, 02 Jun 2016)
Changed paths:
R app/views/peer_reviews/_peer_review_action_column.js.jsx.erb
R app/views/peer_reviews/_peer_review_manager.js.jsx.erb
R app/views/peer_reviews/_peer_review_table.js.jsx.erb
M app/views/peer_reviews/_peer_reviews_new_manager.js.jsx.erb
Log Message:
-----------
Removed old jsx files, updated new jsx file with random dice image
Commit: 31acbd307b061cada67cfea12e46ab8e984a57d2
https://github.com/MarkUsProject/Markus/commit/31acbd307b061cada67cfea12e46ab8e984a57d2
Author: Chris Koehler <christopher.koehler@mail.utoronto.ca>
Date: 2016-06-02 (Thu, 02 Jun 2016)
Changed paths:
M app/views/peer_reviews/index.html.erb
Log Message:
-----------
Removed dead code, added in elements that were previously removed
Commit: 47e66a257f7e2363507ca877d70cd277670c24b8
https://github.com/MarkUsProject/Markus/commit/47e66a257f7e2363507ca877d70cd277670c24b8
Author: Chris Koehler <christopher.koehler@mail.utoronto.ca>
Date: 2016-06-02 (Thu, 02 Jun 2016)
Changed paths:
M app/views/peer_reviews/_peer_reviews_new_manager.js.jsx.erb
M config/locales/en.yml
M config/locales/fr.yml
M config/locales/pt.yml
Log Message:
-----------
Removed requested elements, updated locales
Commit: c1ed94b41f2dd3d09cf2c3c5830f63a5605b2baf
https://github.com/MarkUsProject/Markus/commit/c1ed94b41f2dd3d09cf2c3c5830f63a5605b2baf
Author: Chris Koehler <christopher.koehler@mail.utoronto.ca>
Date: 2016-06-03 (Fri, 03 Jun 2016)
Changed paths:
M app/assets/stylesheets/peer_reviews.scss
M app/views/peer_reviews/_peer_reviews_new_manager.js.jsx.erb
M config/locales/en.yml
Log Message:
-----------
Further updates to the peer review tab
Commit: b492e43a61fe4a2166951366f40f285d7aa3de3d
https://github.com/MarkUsProject/Markus/commit/b492e43a61fe4a2166951366f40f285d7aa3de3d
Author: Chris Koehler <christopher.koehler@mail.utoronto.ca>
Date: 2016-06-03 (Fri, 03 Jun 2016)
Changed paths:
M app/assets/stylesheets/peer_reviews.scss
Log Message:
-----------
Changed stylesheet to pad the bottom of the checkbox
Commit: d894c40dcf6f06c47b3fa39258195b25e1d0c43c
https://github.com/MarkUsProject/Markus/commit/d894c40dcf6f06c47b3fa39258195b25e1d0c43c
Author: Chris Koehler <christopher.koehler@mail.utoronto.ca>
Date: 2016-06-02 (Thu, 02 Jun 2016)
Changed paths:
M app/controllers/peer_reviews_controller.rb
M config/routes.rb
Log Message:
-----------
Removed routes issues and unused method for controller
Commit: b994a428ea1fa401a5758507ee42fed8af568be4
https://github.com/MarkUsProject/Markus/commit/b994a428ea1fa401a5758507ee42fed8af568be4
Author: Chris Koehler <christopher.koehler@mail.utoronto.ca>
Date: 2016-06-03 (Fri, 03 Jun 2016)
Changed paths:
M app/assets/stylesheets/peer_reviews.scss
M app/controllers/peer_reviews_controller.rb
M app/helpers/groups_helper.rb
M app/models/peer_review.rb
M app/views/peer_reviews/_peer_reviews_new_manager.js.jsx.erb
M config/routes.rb
Log Message:
-----------
Changed to using the groups from the proper assignments
Commit: 3de7b11fd86f13213f585c853640b716296a1d88
https://github.com/MarkUsProject/Markus/commit/3de7b11fd86f13213f585c853640b716296a1d88
Author: Chris Koehler <christopher.koehler@mail.utoronto.ca>
Date: 2016-06-03 (Fri, 03 Jun 2016)
Changed paths:
M app/models/peer_review.rb
Log Message:
-----------
Removing something that should be in another branch
Commit: e5ebd40a31547fce8099889875ce13abedec32b5
https://github.com/MarkUsProject/Markus/commit/e5ebd40a31547fce8099889875ce13abedec32b5
Author: Chris Koehler <christopher.koehler@mail.utoronto.ca>
Date: 2016-06-03 (Fri, 03 Jun 2016)
Changed paths:
M app/assets/javascripts/PeerReviews/index.js
M app/controllers/groups_controller.rb
M app/views/peer_reviews/_peer_reviews_new_manager.js.jsx.erb
M app/views/peer_reviews/index.html.erb
Log Message:
-----------
Fixed outstanding changes, removed useless comments, fixed translation
Commit: 915611f042a4586aafaff93631d7a41c9a571000
https://github.com/MarkUsProject/Markus/commit/915611f042a4586aafaff93631d7a41c9a571000
Author: Chris Koehler <christopher.koehler@mail.utoronto.ca>
Date: 2016-06-03 (Fri, 03 Jun 2016)
Changed paths:
M app/views/peer_reviews/index.html.erb
Log Message:
-----------
Fixed colon indenting error, removed I18n pointless prefixes
Commit: 3c04de0020e2ceaee033f7cb9a9a357137a6d4ea
https://github.com/MarkUsProject/Markus/commit/3c04de0020e2ceaee033f7cb9a9a357137a6d4ea
Author: Chris Koehler <christopher.koehler@mail.utoronto.ca>
Date: 2016-06-03 (Fri, 03 Jun 2016)
Changed paths:
M app/views/peer_reviews/_peer_reviews_new_manager.js.jsx.erb
Log Message:
-----------
Further modifications for code clarity
Commit: 03617fa6c6f94317eac6b0c1f1aff62dbeae2ff9
https://github.com/MarkUsProject/Markus/commit/03617fa6c6f94317eac6b0c1f1aff62dbeae2ff9
Author: Chris Koehler <christopher.koehler@mail.utoronto.ca>
Date: 2016-06-03 (Fri, 03 Jun 2016)
Changed paths:
M app/views/peer_reviews/_peer_reviews_new_manager.js.jsx.erb
Log Message:
-----------
More additions, commented out code to be replaced (potentially inefficient)
Commit: 4d20e129cda54b083f0c0ca93c763cfd10b6363b
https://github.com/MarkUsProject/Markus/commit/4d20e129cda54b083f0c0ca93c763cfd10b6363b
Author: Chris Koehler <christopher.koehler@mail.utoronto.ca>
Date: 2016-06-06 (Mon, 06 Jun 2016)
Changed paths:
M app/controllers/peer_reviews_controller.rb
M app/views/peer_reviews/_peer_reviews_new_manager.js.jsx.erb
M config/routes.rb
Log Message:
-----------
Checkbox code operational
Commit: 9422f53bb7d011634d3cd98a82429237f5a88ba3
https://github.com/MarkUsProject/Markus/commit/9422f53bb7d011634d3cd98a82429237f5a88ba3
Author: Chris Koehler <christopher.koehler@mail.utoronto.ca>
Date: 2016-06-07 (Tue, 07 Jun 2016)
Changed paths:
M app/controllers/peer_reviews_controller.rb
M app/views/peer_reviews/_peer_reviews_new_manager.js.jsx.erb
Log Message:
-----------
Assignment can be done, reviewers listed on the right table
Commit: 5583d060491dae9f39735765b58355bf981ce8df
https://github.com/MarkUsProject/Markus/commit/5583d060491dae9f39735765b58355bf981ce8df
Author: Chris Koehler <christopher.koehler@mail.utoronto.ca>
Date: 2016-06-07 (Tue, 07 Jun 2016)
Changed paths:
M app/views/peer_reviews/_peer_reviews_new_manager.js.jsx.erb
Log Message:
-----------
Code refactoring and cleanup
Commit: c7034837a33292d89c619ff352537543240bacc2
https://github.com/MarkUsProject/Markus/commit/c7034837a33292d89c619ff352537543240bacc2
Author: Chris Koehler <christopher.koehler@mail.utoronto.ca>
Date: 2016-06-07 (Tue, 07 Jun 2016)
Changed paths:
M app/controllers/peer_reviews_controller.rb
M app/views/peer_reviews/_peer_reviews_new_manager.js.jsx.erb
Log Message:
-----------
Num reviews now works, some minor refactoring
Commit: 98cba66e65385e2164f5ee1e243d8fd9e391c29e
https://github.com/MarkUsProject/Markus/commit/98cba66e65385e2164f5ee1e243d8fd9e391c29e
Author: Chris Koehler <christopher.koehler@mail.utoronto.ca>
Date: 2016-06-07 (Tue, 07 Jun 2016)
Changed paths:
M app/assets/stylesheets/peer_reviews.scss
Log Message:
-----------
Stylesheet upgrade
Commit: 1374e611e77b15de2577b37c795f3d15d6f2a308
https://github.com/MarkUsProject/Markus/commit/1374e611e77b15de2577b37c795f3d15d6f2a308
Author: Chris Koehler <christopher.koehler@mail.utoronto.ca>
Date: 2016-06-08 (Wed, 08 Jun 2016)
Changed paths:
M app/controllers/peer_reviews_controller.rb
M app/views/peer_reviews/_peer_reviews_new_manager.js.jsx.erb
Log Message:
-----------
Can now delete peer reviews from the right table
Commit: a6b8585d843aa571455f9f3e75d5f27b73a933bc
https://github.com/MarkUsProject/Markus/commit/a6b8585d843aa571455f9f3e75d5f27b73a933bc
Author: Chris Koehler <christopher.koehler@mail.utoronto.ca>
Date: 2016-06-08 (Wed, 08 Jun 2016)
Changed paths:
M app/controllers/peer_reviews_controller.rb
Log Message:
-----------
Removed comment that is not needed
Commit: 2fbc69f1fad3a48e60539ed5437068e47acb2ed3
https://github.com/MarkUsProject/Markus/commit/2fbc69f1fad3a48e60539ed5437068e47acb2ed3
Author: Chris Koehler <christopher.koehler@mail.utoronto.ca>
Date: 2016-06-09 (Thu, 09 Jun 2016)
Changed paths:
M app/assets/stylesheets/peer_reviews.scss
M app/views/peer_reviews/_peer_reviews_new_manager.js.jsx.erb
M app/views/peer_reviews/index.html.erb
M config/locales/en.yml
M config/locales/fr.yml
M config/locales/pt.yml
Log Message:
-----------
Fixed styling, did language conversion
Commit: 04fc5f240320ffb3ee4226b54653e7ab420b6aab
https://github.com/MarkUsProject/Markus/commit/04fc5f240320ffb3ee4226b54653e7ab420b6aab
Author: Chris Koehler <christopher.koehler@mail.utoronto.ca>
Date: 2016-06-09 (Thu, 09 Jun 2016)
Changed paths:
M app/views/peer_reviews/_peer_reviews_new_manager.js.jsx.erb
M app/views/peer_reviews/index.html.erb
Log Message:
-----------
Fixed broken translations
Commit: f72ba7bda2f67b7af7fe36d423abce9621d35b0d
https://github.com/MarkUsProject/Markus/commit/f72ba7bda2f67b7af7fe36d423abce9621d35b0d
Author: Chris Koehler <christopher.koehler@mail.utoronto.ca>
Date: 2016-06-09 (Thu, 09 Jun 2016)
Changed paths:
M .travis.yml
A app/assets/images/icons/empty.png
M app/assets/stylesheets/common/_markus.scss
M app/assets/stylesheets/flexible_criteria.scss
M app/assets/stylesheets/rubrics.scss
M app/controllers/automated_tests_controller.rb
M app/controllers/flexible_criteria_controller.rb
M app/controllers/results_controller.rb
M app/controllers/rubrics_controller.rb
M app/models/assignment.rb
M app/models/flexible_criterion.rb
M app/models/peer_review.rb
M app/models/result.rb
M app/models/rubric_criterion.rb
M app/models/test_script.rb
M app/models/test_script_result.rb
M app/models/test_support_file.rb
M app/views/flexible_criteria/_criterion_editor.html.erb
M app/views/flexible_criteria/_flexible_criteria_manager_help.html.erb
M app/views/flexible_criteria/_flexible_criteria_pane.html.erb
M app/views/flexible_criteria/_flexible_criterion.html.erb
M app/views/flexible_criteria/index.html.erb
M app/views/flexible_criteria/update.js.erb
M app/views/rubrics/_criterion_editor.html.erb
M app/views/rubrics/_rubric_criteria_pane.html.erb
M app/views/rubrics/_rubric_criterion.html.erb
M app/views/rubrics/_rubric_manager_help.html.erb
M app/views/rubrics/update.js.erb
M config/initializers/bullet.rb
M config/locales/en.yml
M config/locales/fr.yml
M config/locales/pt.yml
M lib/repo/test/git_repository_test.rb
M spec/factories/flexible_criteria.rb
M spec/factories/rubric_criteria.rb
M spec/models/assignment_spec.rb
M test/blueprints/blueprints.rb
M test/blueprints/helper.rb
M test/functional/admins_controller_test.rb
M test/functional/annotation_categories_controller_test.rb
M test/functional/annotations_controller_test.rb
M test/functional/api/assignments_controller_test.rb
M test/functional/api/groups_controller_test.rb
M test/functional/api/submission_downloads_controller_test.rb
M test/functional/api/test_results_controller_test.rb
M test/functional/api/users_controller_test.rb
M test/functional/assignments_controller_test.rb
M test/functional/automated_tests_controller_test.rb
M test/functional/grade_entry_forms_controller_test.rb
M test/functional/graders_controller_test.rb
M test/functional/groups_controller_csv_upload_test.rb
M test/functional/groups_controller_test.rb
M test/functional/main_controller_test.rb
M test/functional/marks_graders_controller_test.rb
M test/functional/notes_controller_test.rb
M test/functional/results_controller_test.rb
M test/functional/role_switching_test.rb
M test/functional/rubrics_controller_test.rb
M test/functional/sections_controller_test.rb
M test/functional/students_controller_test.rb
M test/functional/tas_controller_test.rb
M test/unit/assignment_test.rb
M test/unit/flexible_criterion_test.rb
M test/unit/grace_period_submission_rule_test.rb
M test/unit/grade_entry_form_test.rb
M test/unit/grade_entry_item_test.rb
M test/unit/grouping_test.rb
M test/unit/helpers/automated_tests_helper_test.rb
M test/unit/markus_logger_test.rb
M test/unit/membership_test.rb
M test/unit/no_late_submission_rule_test.rb
M test/unit/note_test.rb
M test/unit/penalty_decay_period_submission_rule_test.rb
M test/unit/penalty_period_submission_rule_test.rb
M test/unit/rubric_criteria_test.rb
M test/unit/section_test.rb
M test/unit/student_membership_test.rb
M test/unit/student_test.rb
M test/unit/submission_file_test.rb
M test/unit/submission_helper_test.rb
M test/unit/submission_rule_test.rb
M test/unit/ta_test.rb
M test/unit/test_script_result_test.rb
M test/unit/test_script_test.rb
M test/unit/test_support_file_test.rb
M test/unit/text_annotation_test.rb
Log Message:
-----------
Merge branch 'master' into peer_review_tab
Commit: ea832cc9158a75aa29b0a542cda7a07c79b3a481
https://github.com/MarkUsProject/Markus/commit/ea832cc9158a75aa29b0a542cda7a07c79b3a481
Author: Chris Koehler <christopher.koehler@mail.utoronto.ca>
Date: 2016-06-10 (Fri, 10 Jun 2016)
Changed paths:
M app/controllers/peer_reviews_controller.rb
M app/views/peer_reviews/_peer_reviews_new_manager.js.jsx.erb
M app/views/peer_reviews/index.html.erb
M config/locales/en.yml
M config/locales/fr.yml
M config/locales/pt.yml
Log Message:
-----------
Changes for upgrades
Commit: e4ca38b000a937d0477ee5fa8eb0b85cf136b6f2
https://github.com/MarkUsProject/Markus/commit/e4ca38b000a937d0477ee5fa8eb0b85cf136b6f2
Author: Chris Koehler <christopher.koehler@mail.utoronto.ca>
Date: 2016-06-13 (Mon, 13 Jun 2016)
Changed paths:
M app/models/peer_review.rb
M config/locales/en.yml
M config/locales/fr.yml
M config/locales/pt.yml
Log Message:
-----------
Added validation to prevent student self assignment
Commit: 74df25f959bbedbe8de1025777c2b403241fee06
https://github.com/MarkUsProject/Markus/commit/74df25f959bbedbe8de1025777c2b403241fee06
Author: Chris Koehler <christopher.koehler@mail.utoronto.ca>
Date: 2016-06-13 (Mon, 13 Jun 2016)
Changed paths:
M app/controllers/peer_reviews_controller.rb
M app/views/peer_reviews/_peer_reviews_new_manager.js.jsx.erb
Log Message:
-----------
Fixed states not getting reset, added failsafe to controller
Commit: 4c112a4a664ed4d3f75ed6e85c9c4a4dedff4ea3
https://github.com/MarkUsProject/Markus/commit/4c112a4a664ed4d3f75ed6e85c9c4a4dedff4ea3
Author: Chris Koehler <christopher.koehler@mail.utoronto.ca>
Date: 2016-06-13 (Mon, 13 Jun 2016)
Changed paths:
M app/models/peer_review.rb
Log Message:
-----------
Added guarding if block so specs work properly
Commit: 5726df345e4a9948de233db80a2d1e1832162dc1
https://github.com/MarkUsProject/Markus/commit/5726df345e4a9948de233db80a2d1e1832162dc1
Author: Chris Koehler <christopher.koehler@mail.utoronto.ca>
Date: 2016-06-13 (Mon, 13 Jun 2016)
Changed paths:
M app/helpers/summaries_helper.rb
M app/models/assignment.rb
M app/views/assignments/_list_manage.html.erb
M db/seeds.rb
A lib/tasks/peer_review.rake
M lib/tasks/rubric.rake
Log Message:
-----------
Merge branch 'master' into peer_review_tab
Commit: 7ef73649da2598b2c07dce75c3c650a4e1911a1a
https://github.com/MarkUsProject/Markus/commit/7ef73649da2598b2c07dce75c3c650a4e1911a1a
Author: Chris Koehler <christopher.koehler@mail.utoronto.ca>
Date: 2016-06-14 (Tue, 14 Jun 2016)
Changed paths:
M app/controllers/peer_reviews_controller.rb
M app/views/peer_reviews/index.html.erb
M config/locales/en.yml
M config/locales/fr.yml
M config/locales/pt.yml
M config/routes.rb
Log Message:
-----------
Download/upload operational for peer reviews
Commit: 7c85630c05ad3cf7c14255a880b1b151ad726917
https://github.com/MarkUsProject/Markus/commit/7c85630c05ad3cf7c14255a880b1b151ad726917
Author: Chris Koehler <christopher.koehler@mail.utoronto.ca>
Date: 2016-06-15 (Wed, 15 Jun 2016)
Changed paths:
M app/views/peer_reviews/_peer_reviews_new_manager.js.jsx.erb
Log Message:
-----------
Code clarity upgrade (comment addition, bracket addition, etc)
Commit: 7cbbf096eca6345dd6e139ad70a7437babb98911
https://github.com/MarkUsProject/Markus/commit/7cbbf096eca6345dd6e139ad70a7437babb98911
Author: Chris Koehler <christopher.koehler@mail.utoronto.ca>
Date: 2016-06-15 (Wed, 15 Jun 2016)
Changed paths:
M app/controllers/peer_reviews_controller.rb
A app/helpers/peer_review_helper.rb
Log Message:
-----------
Refactor: Moved peer review helper methods into a helper class
Commit: 60a35593453af78ffb0918be450f0984431433d7
https://github.com/MarkUsProject/Markus/commit/60a35593453af78ffb0918be450f0984431433d7
Author: Chris Koehler <christopher.koehler@mail.utoronto.ca>
Date: 2016-06-16 (Thu, 16 Jun 2016)
Changed paths:
M app/controllers/peer_reviews_controller.rb
A app/helpers/peer_review_random_assigner.rb
M app/models/assignment.rb
Log Message:
-----------
Added random selection algorithm core (almost complete)
Commit: bba2659b6024350543e0aa76415d7523af2b3f1b
https://github.com/MarkUsProject/Markus/commit/bba2659b6024350543e0aa76415d7523af2b3f1b
Author: Chris Koehler <christopher.koehler@mail.utoronto.ca>
Date: 2016-06-17 (Fri, 17 Jun 2016)
Changed paths:
M app/helpers/peer_review_random_assigner.rb
Log Message:
-----------
Finished randomizer for the peer reviewer
Commit: 20d315162e03ef18765cfce3b0a6fbd4ff3043fd
https://github.com/MarkUsProject/Markus/commit/20d315162e03ef18765cfce3b0a6fbd4ff3043fd
Author: Chris Koehler <christopher.koehler@mail.utoronto.ca>
Date: 2016-06-17 (Fri, 17 Jun 2016)
Changed paths:
M app/controllers/api/assignments_controller.rb
M app/controllers/assignments_controller.rb
M app/controllers/peer_reviews_controller.rb
M app/helpers/peer_review_random_assigner.rb
M app/models/assignment.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
A db/migrate/20160617194400_add_number_of_peer_reviews_per_group.rb
M db/schema.rb
M spec/controllers/assignments_controller_spec.rb
M spec/factories/assignments.rb
M test/blueprints/blueprints.rb
Log Message:
-----------
Added number of reviews parameter for peer review assignment
Commit: 4c1551ef2169410d293068fd7f9b428003310101
https://github.com/MarkUsProject/Markus/commit/4c1551ef2169410d293068fd7f9b428003310101
Author: Chris Koehler <christopher.koehler@mail.utoronto.ca>
Date: 2016-06-17 (Fri, 17 Jun 2016)
Changed paths:
M app/controllers/api/groups_controller.rb
M app/controllers/flexible_criteria_controller.rb
M app/controllers/rubrics_controller.rb
M app/controllers/summaries_controller.rb
M app/helpers/course_summaries_helper.rb
M app/helpers/summaries_helper.rb
M app/models/assignment.rb
M app/models/flexible_criterion.rb
M app/models/rubric_criterion.rb
M app/views/automated_tests/_test_script_upload.html.erb
M lib/tasks/marks.rake
M lib/tasks/remarks.rake
M lib/tasks/results.rake
M lib/tasks/simulator.rake
M spec/controllers/flexible_criteria_controller_spec.rb
M spec/controllers/rubrics_controller_spec.rb
M spec/models/assignment_spec.rb
M test/functional/rubrics_controller_test.rb
M test/unit/assignment_test.rb
Log Message:
-----------
Merge branch 'master' into peer_review_tab
Commit: 03dce2a0114d9f82fa16d71ed1464615b9f74276
https://github.com/MarkUsProject/Markus/commit/03dce2a0114d9f82fa16d71ed1464615b9f74276
Author: Chris Koehler <christopher.koehler@mail.utoronto.ca>
Date: 2016-06-20 (Mon, 20 Jun 2016)
Changed paths:
M app/controllers/api/assignments_controller.rb
M app/controllers/assignments_controller.rb
M app/controllers/peer_reviews_controller.rb
M app/helpers/peer_review_random_assigner.rb
M app/models/assignment.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
R db/migrate/20160617194400_add_number_of_peer_reviews_per_group.rb
M db/schema.rb
M spec/controllers/assignments_controller_spec.rb
M spec/factories/assignments.rb
M test/blueprints/blueprints.rb
Log Message:
-----------
Revert "Added number of reviews parameter for peer review assignment"
This reverts commit 20d315162e03ef18765cfce3b0a6fbd4ff3043fd.
Commit: 2ab1226516c33dd1e0f0f0352157df1fc7e1d71b
https://github.com/MarkUsProject/Markus/commit/2ab1226516c33dd1e0f0f0352157df1fc7e1d71b
Author: Chris Koehler <christopher.koehler@mail.utoronto.ca>
Date: 2016-06-20 (Mon, 20 Jun 2016)
Changed paths:
M app/helpers/peer_review_random_assigner.rb
Log Message:
-----------
Revert "Finished randomizer for the peer reviewer"
This reverts commit bba2659b6024350543e0aa76415d7523af2b3f1b.
Commit: d6a3c209196600c320fc978c1032170dfca5629b
https://github.com/MarkUsProject/Markus/commit/d6a3c209196600c320fc978c1032170dfca5629b
Author: Chris Koehler <christopher.koehler@mail.utoronto.ca>
Date: 2016-06-20 (Mon, 20 Jun 2016)
Changed paths:
M app/controllers/peer_reviews_controller.rb
R app/helpers/peer_review_random_assigner.rb
M app/models/assignment.rb
Log Message:
-----------
Revert "Added random selection algorithm core (almost complete)"
This reverts commit 60a35593453af78ffb0918be450f0984431433d7.
Commit: 0fd7b8977e8d47804d063e675d9e868d55bcabd6
https://github.com/MarkUsProject/Markus/commit/0fd7b8977e8d47804d063e675d9e868d55bcabd6
Author: Chris Koehler <christopher.koehler@mail.utoronto.ca>
Date: 2016-06-20 (Mon, 20 Jun 2016)
Changed paths:
M app/assets/javascripts/Grader/marking.js
M app/assets/stylesheets/grader.scss
M app/models/submission.rb
M app/views/results/common/_flexible_criterion.html.erb
M app/views/results/common/_rubric_criterion.html.erb
M app/views/results/edit.html.erb
M app/views/results/marker/_annotation_summary.html.erb
M app/views/results/marker/_boot.js.erb
M app/views/results/marker/_marker_flexible_criterion_li.html.erb
M app/views/results/marker/_marker_panes.html.erb
M app/views/results/marker/_marker_rubric_criterion_li.html.erb
M app/views/results/marker/_marker_summary.html.erb
M app/views/results/student/_student_flexible_criterion_li.html.erb
M app/views/results/student/_student_rubric_criterion_li.html.erb
M app/views/results/student/_student_summary.html.erb
A db/migrate/20160610202949_add_unique_constraint_to_peer_reviews.rb
M db/schema.rb
Log Message:
-----------
Merge branch 'master' into peer_review_tab
Commit: a9d5c45a36cb9473aa89a711ad4d064fd3b9ffc0
https://github.com/MarkUsProject/Markus/commit/a9d5c45a36cb9473aa89a711ad4d064fd3b9ffc0
Author: Chris Koehler <christopher.koehler@mail.utoronto.ca>
Date: 2016-06-20 (Mon, 20 Jun 2016)
Changed paths:
M app/controllers/peer_reviews_controller.rb
Log Message:
-----------
Added create! version so errors aren't silently swallowed by rails
Commit: 441e389ed5e936339f5edbcca0cb0548bd3c4067
https://github.com/MarkUsProject/Markus/commit/441e389ed5e936339f5edbcca0cb0548bd3c4067
Author: david-yz-liu <liudavid@cs.toronto.edu>
Date: 2016-06-20 (Mon, 20 Jun 2016)
Changed paths:
A app/assets/javascripts/PeerReviews/index.js
A app/assets/stylesheets/peer_reviews.scss
M app/controllers/peer_reviews_controller.rb
M app/helpers/groups_helper.rb
A app/helpers/peer_review_helper.rb
M app/models/peer_review.rb
M app/views/layouts/_sub_menu.html.erb
A app/views/peer_reviews/_peer_reviews_new_manager.js.jsx.erb
M app/views/peer_reviews/index.html.erb
M config/locales/en.yml
M config/locales/fr.yml
M config/locales/pt.yml
M config/routes.rb
Log Message:
-----------
Merge branch 'peer_review_tab' of https://www.github.com/WChrisK/Markus
Compare: https://github.com/MarkUsProject/Markus/compare/708bc79e5f8f...441e389ed5e9
_______________________________________________
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