[prev in list] [next in list] [prev in thread] [next in thread]
List: markus-dev
Subject: [MarkUs-dev] [MarkUsProject/Markus] 30d07c: Added star icons and modified style for the rubric...
From: GitHub <noreply () github ! com>
Date: 2016-06-09 19:02:11
Message-ID: 5759bd337de8a_30803fd3b21752bc769c () hookshot-fe3-cp1-prd ! iad ! github ! net ! mail
[Download RAW message or body]
Branch: refs/heads/master
Home: https://github.com/MarkUsProject/Markus
Commit: 30d07c535a8bb5283cfa01685c085dc3dbefcd15
https://github.com/MarkUsProject/Markus/commit/30d07c535a8bb5283cfa01685c085dc3dbefcd15
Author: Christian Garcia <christian.garciasalguero@mail.utoronto.ca>
Date: 2016-05-18 (Wed, 18 May 2016)
Changed paths:
M app/assets/stylesheets/common/_markus.scss
M app/views/rubrics/_rubric_criteria_pane.html.erb
M app/views/rubrics/_rubric_criterion.html.erb
Log Message:
-----------
Added star icons and modified style for the rubric management table
Commit: b6d912c3446cafd137f2f59d966e99a1f3d66861
https://github.com/MarkUsProject/Markus/commit/b6d912c3446cafd137f2f59d966e99a1f3d66861
Author: Christian Garcia <christian.garciasalguero@mail.utoronto.ca>
Date: 2016-05-18 (Wed, 18 May 2016)
Changed paths:
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 config/locales/en.yml
Log Message:
-----------
Added help text for visibility
Commit: bba3b348d32dacf91009448b803e253d00033b9e
https://github.com/MarkUsProject/Markus/commit/bba3b348d32dacf91009448b803e253d00033b9e
Author: Christian Garcia <christian.garciasalguero@mail.utoronto.ca>
Date: 2016-05-18 (Wed, 18 May 2016)
Changed paths:
M app/assets/stylesheets/common/_markus.scss
M app/controllers/rubrics_controller.rb
M app/views/rubrics/_criterion_editor.html.erb
M app/views/rubrics/_rubric_criterion.html.erb
M app/views/rubrics/_rubric_manager_help.html.erb
M config/locales/en.yml
Log Message:
-----------
Changed icons and added editing functionality for the criterion visibility
Commit: 6f52ab00a77b9fe22f2a427e6ed387930661c451
https://github.com/MarkUsProject/Markus/commit/6f52ab00a77b9fe22f2a427e6ed387930661c451
Author: Christian Garcia <christian.garciasalguero@mail.utoronto.ca>
Date: 2016-05-19 (Thu, 19 May 2016)
Changed paths:
A app/assets/images/icons/empty.png
M app/assets/stylesheets/common/_markus.scss
M app/models/rubric_criterion.rb
M app/views/rubrics/_criterion_editor.html.erb
M app/views/rubrics/_rubric_criterion.html.erb
M app/views/rubrics/update.js.erb
M config/locales/en.yml
Log Message:
-----------
Changed css and html formatting, added validation and update
Commit: 71f11bf01b80b00bae9203ea10bae894501089ac
https://github.com/MarkUsProject/Markus/commit/71f11bf01b80b00bae9203ea10bae894501089ac
Author: Christian Garcia <christian.garciasalguero@mail.utoronto.ca>
Date: 2016-05-19 (Thu, 19 May 2016)
Changed paths:
M Gemfile
M app/controllers/annotation_categories_controller.rb
M app/controllers/api/assignments_controller.rb
M app/controllers/application_controller.rb
M app/controllers/assignments_controller.rb
M app/controllers/main_controller.rb
A app/controllers/peer_reviews_controller.rb
M app/controllers/submissions_controller.rb
M app/helpers/submissions_helper.rb
M app/models/assignment.rb
M app/models/grouping.rb
A app/models/peer_review.rb
M app/models/result.rb
M app/views/assignments/_form.html.erb
M app/views/submissions/_react_file_manager_boot_table.js.jsx.erb
M app/views/submissions/_repo_files_table.js.jsx.erb
M app/views/submissions/browse.html.erb
M config/locales/en.yml
M config/locales/fr.yml
M config/locales/pt.yml
M config/routes.rb
A db/migrate/20160510173147_create_peer_reviews.rb
A db/migrate/20160511224541_add_peer_review_assignment_to_assignments.rb
A db/migrate/20160517142117_add_columns_criterion.rb
A db/migrate/20160518004516_add_peer_review_to_assignments.rb
M db/schema.rb
M lib/repo/memory_repository.rb
M spec/controllers/annotation_categories_controller_spec.rb
M spec/controllers/assignments_controller_spec.rb
M spec/controllers/submissions_controller_spec.rb
A spec/factories/peer_review.rb
M spec/models/assignment_spec.rb
A spec/models/peer_review_spec.rb
M spec/models/result_spec.rb
A spec/models/submission_spec.rb
A spec/models/user_spec.rb
M test/blueprints/blueprints.rb
R test/unit/result_test.rb
R test/unit/submission_test.rb
R test/unit/user_test.rb
Log Message:
-----------
Merge branch 'master' of git://github.com/MarkUsProject/Markus into marking-scheme-design
Commit: c57bd997d680c9f8374bce63e326979ca426d0d6
https://github.com/MarkUsProject/Markus/commit/c57bd997d680c9f8374bce63e326979ca426d0d6
Author: Christian Garcia <christian.garciasalguero@mail.utoronto.ca>
Date: 2016-05-19 (Thu, 19 May 2016)
Changed paths:
M app/views/flexible_criteria/_criterion_editor.html.erb
M app/views/flexible_criteria/_flexible_criterion.html.erb
M app/views/flexible_criteria/index.html.erb
Log Message:
-----------
Fixed existing linking errors for flexible criteria
Commit: 919c1ec1bdb878a4537a9e5ee7d0b29ee95e1ece
https://github.com/MarkUsProject/Markus/commit/919c1ec1bdb878a4537a9e5ee7d0b29ee95e1ece
Author: Christian Garcia <christian.garciasalguero@mail.utoronto.ca>
Date: 2016-05-20 (Fri, 20 May 2016)
Changed paths:
M app/assets/stylesheets/common/_markus.scss
M app/assets/stylesheets/flexible_criteria.scss
M app/assets/stylesheets/rubrics.scss
M app/controllers/flexible_criteria_controller.rb
M app/models/flexible_criterion.rb
M app/models/rubric_criterion.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/update.js.erb
M app/views/rubrics/_criterion_editor.html.erb
M app/views/rubrics/update.js.erb
M config/locales/en.yml
M config/locales/fr.yml
M config/locales/pt.yml
Log Message:
-----------
Replicated changes for flexible criteria, created messages in all languages and changed css style
Commit: 94513a1055ebcc2c5b0b3c82d4b6a0e01652600e
https://github.com/MarkUsProject/Markus/commit/94513a1055ebcc2c5b0b3c82d4b6a0e01652600e
Author: Christian Garcia <christian.garciasalguero@mail.utoronto.ca>
Date: 2016-05-25 (Wed, 25 May 2016)
Changed paths:
M app/controllers/graders_controller.rb
M app/models/assignment.rb
M app/models/result.rb
M spec/factories/flexible_criteria.rb
M spec/factories/rubric_criteria.rb
M spec/models/assignment_spec.rb
M spec/models/result_spec.rb
Log Message:
-----------
Changed criteria visibility, mark calculation and added tests for them
Commit: daadaf480f202b234dee58c4a59006076814aefd
https://github.com/MarkUsProject/Markus/commit/daadaf480f202b234dee58c4a59006076814aefd
Author: Christian Garcia <christian.garciasalguero@mail.utoronto.ca>
Date: 2016-05-25 (Wed, 25 May 2016)
Changed paths:
M .gitignore
M Gemfile.lock
M db/schema.rb
Log Message:
-----------
Merge branch 'master' of git://github.com/MarkUsProject/Markus into marking-scheme-design
Changed criteria visibility, mark calculation and added tests for them.
Commit: f2689f33574530ec7067d4b4f8bd48e0c1508047
https://github.com/MarkUsProject/Markus/commit/f2689f33574530ec7067d4b4f8bd48e0c1508047
Author: Christian Garcia <christian.garciasalguero@mail.utoronto.ca>
Date: 2016-05-31 (Tue, 31 May 2016)
Changed paths:
M app/controllers/graders_controller.rb
M app/controllers/results_controller.rb
M app/models/assignment.rb
M app/models/result.rb
M app/views/flexible_criteria/_flexible_criterion.html.erb
M app/views/rubrics/_criterion_editor.html.erb
M app/views/rubrics/_rubric_criterion.html.erb
M spec/models/assignment_spec.rb
M spec/models/result_spec.rb
M test/blueprints/blueprints.rb
M test/functional/results_controller_test.rb
Log Message:
-----------
Reviewed based on comments
Commit: c6cdb9b7b2cabd582374728ece95f3fc1cc0bd3b
https://github.com/MarkUsProject/Markus/commit/c6cdb9b7b2cabd582374728ece95f3fc1cc0bd3b
Author: Christian Garcia <christian.garciasalguero@mail.utoronto.ca>
Date: 2016-05-31 (Tue, 31 May 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
A 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:
-----------
Merge branch 'master' of git://github.com/MarkUsProject/Markus into marking-scheme-design
Reviewed based on comments
Commit: fea4d0be2bad70e0af608f410b799148c39ad8ae
https://github.com/MarkUsProject/Markus/commit/fea4d0be2bad70e0af608f410b799148c39ad8ae
Author: Christian Garcia <christian.garciasalguero@mail.utoronto.ca>
Date: 2016-06-03 (Fri, 03 Jun 2016)
Changed paths:
M app/models/result.rb
M app/models/rubric_criterion.rb
M app/views/flexible_criteria/_criterion_editor.html.erb
M test/functional/results_controller_test.rb
Log Message:
-----------
Changed check_for_nil_marks to fix mark as complete button
Commit: af054d3434489fdbce5b9c239add09d0ead0ff75
https://github.com/MarkUsProject/Markus/commit/af054d3434489fdbce5b9c239add09d0ead0ff75
Author: Christian Garcia <christian.garciasalguero@mail.utoronto.ca>
Date: 2016-06-06 (Mon, 06 Jun 2016)
Changed paths:
M app/models/result.rb
Log Message:
-----------
Added check for the mark as complete button and changed subtotal
Commit: 3c511bc4f5b9e0f45551d404fba158790c165b81
https://github.com/MarkUsProject/Markus/commit/3c511bc4f5b9e0f45551d404fba158790c165b81
Author: david-yz-liu <liudavid@cs.toronto.edu>
Date: 2016-06-09 (Thu, 09 Jun 2016)
Changed paths:
M app/models/assignment.rb
M app/models/flexible_criterion.rb
M app/models/result.rb
M app/models/rubric_criterion.rb
M app/views/rubrics/_criterion_editor.html.erb
Log Message:
-----------
Some minor fixes to #2597
Commit: be677c4191aaffa3d98e78da37ea4fff3cfcd26b
https://github.com/MarkUsProject/Markus/commit/be677c4191aaffa3d98e78da37ea4fff3cfcd26b
Author: david-yz-liu <liudavid@cs.toronto.edu>
Date: 2016-06-09 (Thu, 09 Jun 2016)
Changed paths:
M .travis.yml
Log Message:
-----------
Merge branch 'master' of github.com:MarkUsProject/Markus
Compare: https://github.com/MarkUsProject/Markus/compare/9e9649031530...be677c4191aa
_______________________________________________
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