Skip to content

Commit

Permalink
Merge pull request #217 from donny-wong/v2.5.0
Browse files Browse the repository at this point in the history
V2.5.0
  • Loading branch information
pretendWhale authored Aug 15, 2024
2 parents 5ed32b3 + 3c7fe71 commit ab15bae
Show file tree
Hide file tree
Showing 10 changed files with 146 additions and 325 deletions.
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.5.0
rev: v4.6.0
hooks:
- id: end-of-file-fixer
- id: trailing-whitespace
- repo: https://github.com/igorshubovych/markdownlint-cli
rev: v0.37.0
rev: v0.41.0
hooks:
- id: markdownlint
args: ["--fix"]
Expand Down
6 changes: 6 additions & 0 deletions Configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -277,3 +277,9 @@ If you wish to use Learning Tools Interoperability (LTI) with Markus, you'll nee

You must also create a private key for generating Javascript Web Tokens to sign LTI requests.
A private key can be automatically created with the `markus:lti_key` rake task.

If you wish to filter course creation requests from LTI deployments, add the following keys:

- `lti.course_filter_file` must be the absolute path to a Ruby file that defines a method `LtiConfig::allowed_to_create_course?(lti_deployment)`, which takes an `LtiDeployment` model instance and returns `true` or `false`.
- `lti.unpermitted_new_course_message` must be a message to display if an LTI deployment is rejected by the filter. The message must be a string with interpolation key `%{course_name}`, which will be bound to the `title` field in the launch claim `https://purl.imsglobal.org/spec/lti/claim/context`.
- Example: `"You are not permitted to create a new MarkUs course for %{course_name}. Please contact your system administrator."`
185 changes: 103 additions & 82 deletions Developer-Guide--Set-Up-With-Docker.md

Large diffs are not rendered by default.

237 changes: 0 additions & 237 deletions Developer-Guide--Setting-up-Git.md

This file was deleted.

2 changes: 1 addition & 1 deletion Instructor-Guide--Assignments--Automated-Testing.md
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ You may customize this feature using the following settings:

- **Tokens available on** This allows you to set the date and time of when you would like the students to begin testing. If you wish for the students to begin testing immediately simply set this field to the current date and time.

> :spiral_notepad: **NOTE:** Students will be allowed to start tests up until the assignment deadline INCLUDING all extensions.
- **Tokens available until** This allows you to set the date and time of when you would like to disable testing. If you wish for the tests to run up until the assignment due date simply leave this field blank.

- **Tokens regenerate after** This allows you to set the time it takes for tokens to regenerate. Once a token has been used, it will be unavailable until X hours have passed, at which point the students may use that token to perform another test. If you wish for tokens not to regenerate, select the "Tokens do not regenerate" checkbox.

Expand Down
4 changes: 4 additions & 0 deletions Instructor-Guide--Assignments--Starter-Files.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,3 +82,7 @@ This is useful when using either of the "random" rules to see how the files were
Students will be able to download the starter files according to the starter file rules you have set on this page. If you would like to download an example of these starter files, click the "Download starter files example" link (in the "Starter File Assignment Rules" section).

Note that if the rules that you have chosen involve randomly assigning files, each time you click the link you may get different files.

## Starter File Visibility for Graders

Note that all graders of an assignment will have read-only access to the "Starter Files" tab under "Settings" on the assignment page, where they can view starter file groups and the rules the instructor sets on how to assign them. Furthermore, they will be able to download starter file mappings and example starter files. However, they cannot modify starter files or how they are assigned, unless they are authorized to do so.
10 changes: 7 additions & 3 deletions Learning-Tools-Interoperability.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,16 @@ Canvas course and your MarkUs course must be made.
Click 'Launch MarkUs' in your Canvas course. If you are not logged in to MarkUs,
you will be prompted to do so. Once you are logged in, you will be presented with
a list of MarkUs courses for which you are an instructor. Select the course that matches your Canvas
course and submit the form. If your course does not appear in the list,
you may click 'Create New Course', which will create a new
course based on the Canvas course information with you as an instructor.
course and submit the form.

![MarkUs Link Canvas Course](images/lti-link-course.png)

If your course does not appear in the list,
you may click 'Create New Course', to request a new
course based on the Canvas course information with you as an instructor.

*Warning*: your system administrator may restrict which Canvas courses can trigger the creation of a new course on MarkUs.

#### Creating a Grade Book entry for a MarkUs Assignment

Once a course association has been established, each assignment will
Expand Down
23 changes: 23 additions & 0 deletions RESTful-API.md
Original file line number Diff line number Diff line change
Expand Up @@ -657,6 +657,15 @@ NOTE: the "AdminRole" type can only be used by AdminUser users
- has_peer_review (boolean)
- starter_file_type (one of "simple", "sections", "shuffle", "group")

### DELETE /api/courses/:course_id/assignments/:id

- description: Delete the assignment corresponding to the given course and assignment id's, if it has no groups.
- required parameters:
- id (integer)
- course_id (integer)

NOTE: this is only available to authorised instructors (or admins)

### GET /api/courses/:course_id/assignments/:id/test_files

- description: Download a zip file containing all autotesting test files for this assignment
Expand Down Expand Up @@ -1206,3 +1215,17 @@ NOTE: the folder_path string can include a nested path if the folder to be remov

- description: Delete the section uniquely identified by the given course and section id's.
- NOTE: The section must be non-empty (must not have any students).

### PUT /api/courses/:course_id/sections/:id

- description: Update the section uniquely identified by the given course and section id's.
- required parameters:
- name (string)

### GET /api/courses/:course_id/sections

- description: Get all sections for this course

### GET /api/courses/:course_id/sections/:id

- description: Get the section uniquely identified by the given course and section id's.
Binary file removed images/automated-testing-student-run.png
Binary file not shown.
Binary file added images/automted-testing-student-run.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit ab15bae

Please sign in to comment.