'[MarkUs-dev] [MarkUsProject/Markus] b03fca: just getting setting all permissions working with ...'

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

List:       markus-dev
Subject:    [MarkUs-dev] [MarkUsProject/Markus] b03fca: just getting setting all permissions working with ...
From:       GitHub <noreply () github ! com>
Date:       2016-08-26 14:46:12
Message-ID: 57c0563489981_228d3ffca798513c775d1 () hookshot-fe4-cp1-prd ! iad ! github ! net ! mail
[Download RAW message or body]

Branch: refs/heads/master
  Home:   https://github.com/MarkUsProject/Markus
  Commit: b03fca3a60ec59b6eb0e6d878715b47f1ad72d48
      https://github.com/MarkUsProject/Markus/commit/b03fca3a60ec59b6eb0e6d878715b47f1ad72d48
  Author: reid <reid@reid.snacks>
  Date:   2016-08-01 (Mon, 01 Aug 2016)

  Changed paths:
    M app/controllers/groups_controller.rb
    M app/jobs/create_individual_groups_for_all_students_job.rb
    M lib/repo/git_repository.rb

  Log Message:
  -----------
  just getting setting all permissions working with git.  Next step is refactoring so \
that it works with both git and svn.

  Commit: 5c2798632535337040a7e27a28fea89e0e170d49
      https://github.com/MarkUsProject/Markus/commit/5c2798632535337040a7e27a28fea89e0e170d49
  Author: reid <reid@reid.snacks>
  Date:   2016-08-22 (Mon, 22 Aug 2016)

  Changed paths:
    M app/controllers/groups_controller.rb
    M app/jobs/create_individual_groups_for_all_students_job.rb
    M app/jobs/submissions_job.rb
    M app/models/assignment.rb
    M app/models/group.rb
    M app/models/user.rb
    M doc/markus-contributors.txt
    M lib/repo/git_repository.rb
    M lib/repo/repository.rb
    M lib/repo/subversion_repository.rb
    M lib/tasks/groups.rake

  Log Message:
  -----------
  Adding permissions update for git repos, and refactoring some of the repository \
code to be more uniform

  Commit: 58a95cda6f93fe01d020cd674f2ac36ce032cccf
      https://github.com/MarkUsProject/Markus/commit/58a95cda6f93fe01d020cd674f2ac36ce032cccf
  Author: reid <reid@reid.snacks>
  Date:   2016-08-22 (Mon, 22 Aug 2016)

  Changed paths:
    M app/assets/javascripts/Grader/marking.js
    M app/assets/javascripts/ReactComponents/table_sorts.js
    M app/assets/javascripts/Rubrics/index.js
    M app/assets/javascripts/SourceCodeGlower/AnnotationTextDisplayer.js
    M app/assets/javascripts/create_assignment.js
    M app/assets/stylesheets/annotation_categories.scss
    M app/assets/stylesheets/assignments.scss
    A app/assets/stylesheets/common/_assignment_dropdown.scss
    M app/assets/stylesheets/common/_markus.scss
    A app/assets/stylesheets/criteria.scss
    R app/assets/stylesheets/flexible_criteria.scss
    M app/assets/stylesheets/grader.scss
    M app/assets/stylesheets/graders.scss
    M app/assets/stylesheets/groups.scss
    M app/assets/stylesheets/main.scss
    M app/assets/stylesheets/marking_schemes.scss
    M app/assets/stylesheets/peer_reviews.scss
    M app/assets/stylesheets/results.scss
    R app/assets/stylesheets/rubric_criteria.scss
    M app/assets/stylesheets/submissions.scss
    M app/assets/stylesheets/summaries.scss
    M app/assets/stylesheets/tags.scss
    M app/controllers/annotation_categories_controller.rb
    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/flexible_criteria_controller.rb
    M app/controllers/graders_controller.rb
    M app/controllers/peer_reviews_controller.rb
    M app/controllers/results_controller.rb
    M app/controllers/rubric_criteria_controller.rb
    M app/controllers/submissions_controller.rb
    M app/helpers/automated_tests_helper.rb
    A app/helpers/criteria_helper.rb
    M app/helpers/graders_helper.rb
    M app/helpers/groups_helper.rb
    M app/helpers/peer_review_helper.rb
    M app/helpers/random_assign_helper.rb
    M app/helpers/results_helper.rb
    M app/helpers/submissions_helper.rb
    M app/helpers/summaries_helper.rb
    M app/jobs/submissions_job.rb
    M app/models/assignment.rb
    A app/models/checkbox_criterion.rb
    M app/models/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/annotation_categories/index.html.erb
    A app/views/assignments/_assignment_date.html.erb
    M app/views/assignments/_assignment_summary.html.erb
    M app/views/assignments/_form.html.erb
    M app/views/assignments/_list.html.erb
    M app/views/assignments/_list_manage.html.erb
    M app/views/assignments/_peer_review_form.html.erb
    M app/views/assignments/_peer_submissions_table.js.jsx.erb
    M app/views/assignments/_read.html.erb
    M app/views/assignments/edit.html.erb
    M app/views/assignments/peer_review.html.erb
    M app/views/automated_tests/_form.html.erb
    M app/views/automated_tests/_test_script_upload.html.erb
    A app/views/checkbox_criteria/_criterion_editor.html.erb
    A app/views/criteria/_boot.js.erb
    M app/views/criteria/_criteria_pane.html.erb
    M app/views/criteria/_criterion.html.erb
    M app/views/criteria/_manager_help.html.erb
    M app/views/criteria/_new_criterion.html.erb
    A app/views/criteria/index.html.erb
    M app/views/criteria/new.js.erb
    R app/views/flexible_criteria/_boot.js.erb
    M app/views/flexible_criteria/_criterion_editor.html.erb
    R app/views/flexible_criteria/index.html.erb
    M app/views/graders/_graders_manager.js.jsx.erb
    M app/views/layouts/_menu.html.erb
    M app/views/layouts/_sub_menu.html.erb
    M app/views/layouts/_sub_sub_menu.html.erb
    M app/views/main/_dashboard_list.html.erb
    M app/views/peer_reviews/_peer_reviews_new_manager.js.jsx.erb
    M app/views/results/_result_summary.html.erb
    M app/views/results/common/_annotations.js.erb
    A app/views/results/common/_checkbox_criterion.html.erb
    M app/views/results/common/_download_file_selector.html.erb
    M app/views/results/common/_file_selector_dropdown.html.erb
    M app/views/results/common/_flexible_criterion.html.erb
    R app/views/results/common/_flexible_marks_summary_table.html.erb
    M app/views/results/common/_image_codeviewer.html.erb
    A app/views/results/common/_marks_summary_table.html.erb
    M app/views/results/common/_pdf_codeviewer.html.erb
    A app/views/results/common/_peer_reviews.html.erb
    R app/views/results/common/_rubric_marks_summary_table.html.erb
    M app/views/results/common/_submission_selector.html.erb
    M app/views/results/edit.html.erb
    M app/views/results/marker/_boot.js.erb
    M app/views/results/marker/_extra_marks_table.html.erb
    A app/views/results/marker/_marker_checkbox_criterion_li.html.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
    A app/views/results/student/_student_checkbox_criterion_li.html.erb
    M app/views/results/student/_student_flexible_criterion_li.html.erb
    M app/views/results/student/_student_panes.html.erb
    M app/views/results/student/_student_rubric_criterion_li.html.erb
    M app/views/results/student/_student_summary.html.erb
    M app/views/results/student/no_result.html.erb
    M app/views/results/view_marks.html.erb
    R app/views/rubric_criteria/_boot.js.erb
    M app/views/rubric_criteria/_criterion_editor.html.erb
    R app/views/rubric_criteria/index.html.erb
    M app/views/shared/_assignments_dropdown_menu.html.erb
    A app/views/shared/_pr_dropdown_menu_li.html.erb
    M app/views/submissions/_submissions_table.js.jsx.erb
    M app/views/submissions/browse.html.erb
    M app/views/summaries/_summaries_table.js.jsx.erb
    M app/views/tags/index.html.erb
    M automated-tests-files/test_runner/sample_files/python_sample/py_suite_1.py
    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/20160727173308_create_checkbox_criteria.rb
    A db/migrate/20160727181814_add_checkbox_criteria_count_to_assignments.rb
    A db/migrate/20160809145347_remove_marking_scheme_type_from_assignment.rb
    A db/migrate/20160810184655_add_peer_review_id_to_results.rb
    A db/migrate/20160820143836_change_peer_review_id_in_results.rb
    M db/schema.rb
    M lib/tasks/assignments.rake
    M lib/tasks/demo.rake
    M lib/tasks/groups.rake
    M lib/tasks/marks.rake
    M lib/tasks/peer_review.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 lib/tools/markusapi.py
    M spec/controllers/annotation_categories_controller_spec.rb
    M spec/controllers/assignments_controller_spec.rb
    M spec/controllers/criteria_controller_spec.rb
    R spec/controllers/flexible_criteria_controller_spec.rb
    M spec/controllers/peer_reviews_controller_spec.rb
    R spec/controllers/rubric_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
    R spec/fixtures/files/flexible_incomplete.csv
    R spec/fixtures/files/flexible_partial.csv
    R spec/fixtures/files/flexible_upload.csv
    R spec/fixtures/files/malformed.csv
    R spec/fixtures/files/pdf_with_csv_extension.csv
    M spec/models/assignment_spec.rb
    M spec/models/flexible_criterion_spec.rb
    M spec/models/result_spec.rb
    M spec/models/rubric_criterion_spec.rb
    M spec/routing/routes_spec.rb
    M spec/support/criterion.rb
    M test/blueprints/blueprints.rb
    R test/fixtures/files/rubric_incomplete.csv
    R test/fixtures/files/test_rubric_criteria_ISO-8859-1.csv
    R test/fixtures/files/test_rubric_criteria_UTF-8.csv
    M test/functional/api/assignments_controller_test.rb
    M test/functional/assignments_controller_test.rb
    A test/functional/criteria_controller_test.rb
    M test/functional/graders_controller_test.rb
    M test/functional/results_controller_test.rb
    R test/functional/rubric_criteria_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' of https://github.com/MarkUsProject/Markus into issue-2674

  Commit: a8cb1a390c80fa92b31335b1fb4577752ad67977
      https://github.com/MarkUsProject/Markus/commit/a8cb1a390c80fa92b31335b1fb4577752ad67977
  Author: reid <reid@dhcp0-124.red.sandbox>
  Date:   2016-08-23 (Tue, 23 Aug 2016)

  Changed paths:
    M app/helpers/repository_helper.rb

  Log Message:
  -----------
  fixing case of Repository.get_class having wrong parameters

  Commit: c23228f9add97568fdf0322a75fdf6b61a3f3d42
      https://github.com/MarkUsProject/Markus/commit/c23228f9add97568fdf0322a75fdf6b61a3f3d42
  Author: reid <reid@reid.snacks>
  Date:   2016-08-23 (Tue, 23 Aug 2016)

  Changed paths:
    M app/models/assignment.rb
    M app/models/group.rb
    M app/models/user.rb
    M lib/repo/repository.rb
    M lib/repo/test/git_repository_test.rb
    M lib/repo/test/memory_repository_test.rb
    M spec/factories/git_repositories.rb
    M spec/models/group_spec.rb
    M spec/support/helpers.rb
    M test/test_helper.rb
    M test/unit/admin_test.rb
    M test/unit/ta_test.rb

  Log Message:
  -----------
  cleaning up commented out code and fixing up tests.

  Commit: 687951879bd05a6e89d09088c1fd795969c8f7bc
      https://github.com/MarkUsProject/Markus/commit/687951879bd05a6e89d09088c1fd795969c8f7bc
  Author: David Liu <david@cs.toronto.edu>
  Date:   2016-08-24 (Wed, 24 Aug 2016)

  Changed paths:
    M app/jobs/create_individual_groups_for_all_students_job.rb
    M app/models/assignment.rb
    M app/models/group.rb
    M app/models/grouping.rb
    M app/models/user.rb
    M lib/repo/repository.rb
    M lib/tasks/groups.rake

  Log Message:
  -----------
  Remove unnecessary code and do bulk update permissions for seeding

  Commit: 03fe11d03aad7f9e3b8e4f3dac7fb6ed5d33f29d
      https://github.com/MarkUsProject/Markus/commit/03fe11d03aad7f9e3b8e4f3dac7fb6ed5d33f29d
  Author: Karen Reid <reid@cs.toronto.edu>
  Date:   2016-08-25 (Thu, 25 Aug 2016)

  Changed paths:
    M app/jobs/create_individual_groups_for_all_students_job.rb
    M app/models/assignment.rb
    M app/models/group.rb
    M app/models/grouping.rb
    M app/models/user.rb
    M lib/repo/repository.rb
    M lib/tasks/groups.rake

  Log Message:
  -----------
  Merge pull request #2 from david-yz-liu/issue-2674

Remove unnecessary code and do bulk update permissions for seeding

  Commit: 3614dda3767451d35ea34a984755576e9f71a12b
      https://github.com/MarkUsProject/Markus/commit/3614dda3767451d35ea34a984755576e9f71a12b
  Author: reid <reid@dhcp0-124.red.sandbox>
  Date:   2016-08-25 (Thu, 25 Aug 2016)

  Changed paths:
    M app/jobs/create_individual_groups_for_all_students_job.rb
    M app/models/assignment.rb
    M app/models/group.rb
    M app/models/grouping.rb
    M app/models/user.rb
    M lib/repo/repository.rb
    M lib/tasks/groups.rake

  Log Message:
  -----------
  merging

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

  Changed paths:
    M app/controllers/groups_controller.rb
    M app/helpers/repository_helper.rb
    M app/jobs/create_individual_groups_for_all_students_job.rb
    M app/jobs/submissions_job.rb
    M app/models/assignment.rb
    M app/models/group.rb
    M app/models/grouping.rb
    M app/models/user.rb
    M doc/markus-contributors.txt
    M lib/repo/git_repository.rb
    M lib/repo/repository.rb
    M lib/repo/subversion_repository.rb
    M lib/repo/test/git_repository_test.rb
    M lib/repo/test/memory_repository_test.rb
    M lib/tasks/groups.rake
    M spec/factories/git_repositories.rb
    M spec/models/group_spec.rb
    M spec/support/helpers.rb
    M test/test_helper.rb
    M test/unit/admin_test.rb
    M test/unit/ta_test.rb

  Log Message:
  -----------
  Merge pull request #2714 from reidka/issue-2674

Fixes #2674

Compare: https://github.com/MarkUsProject/Markus/compare/0093a019480b...d76fc44fb15f

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