Skip to content

Commit ab15bae

Browse files
authored
Merge pull request #217 from donny-wong/v2.5.0
V2.5.0
2 parents 5ed32b3 + 3c7fe71 commit ab15bae

10 files changed

+146
-325
lines changed

.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
repos:
22
- repo: https://github.com/pre-commit/pre-commit-hooks
3-
rev: v4.5.0
3+
rev: v4.6.0
44
hooks:
55
- id: end-of-file-fixer
66
- id: trailing-whitespace
77
- repo: https://github.com/igorshubovych/markdownlint-cli
8-
rev: v0.37.0
8+
rev: v0.41.0
99
hooks:
1010
- id: markdownlint
1111
args: ["--fix"]

Configuration.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,3 +277,9 @@ If you wish to use Learning Tools Interoperability (LTI) with Markus, you'll nee
277277

278278
You must also create a private key for generating Javascript Web Tokens to sign LTI requests.
279279
A private key can be automatically created with the `markus:lti_key` rake task.
280+
281+
If you wish to filter course creation requests from LTI deployments, add the following keys:
282+
283+
- `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`.
284+
- `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`.
285+
- Example: `"You are not permitted to create a new MarkUs course for %{course_name}. Please contact your system administrator."`

Developer-Guide--Set-Up-With-Docker.md

Lines changed: 103 additions & 82 deletions
Large diffs are not rendered by default.

Developer-Guide--Setting-up-Git.md

Lines changed: 0 additions & 237 deletions
This file was deleted.

Instructor-Guide--Assignments--Automated-Testing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ You may customize this feature using the following settings:
250250
251251
- **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.
252252

253-
> :spiral_notepad: **NOTE:** Students will be allowed to start tests up until the assignment deadline INCLUDING all extensions.
253+
- **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.
254254

255255
- **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.
256256

Instructor-Guide--Assignments--Starter-Files.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,3 +82,7 @@ This is useful when using either of the "random" rules to see how the files were
8282
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).
8383

8484
Note that if the rules that you have chosen involve randomly assigning files, each time you click the link you may get different files.
85+
86+
## Starter File Visibility for Graders
87+
88+
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.

Learning-Tools-Interoperability.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,16 @@ Canvas course and your MarkUs course must be made.
5858
Click 'Launch MarkUs' in your Canvas course. If you are not logged in to MarkUs,
5959
you will be prompted to do so. Once you are logged in, you will be presented with
6060
a list of MarkUs courses for which you are an instructor. Select the course that matches your Canvas
61-
course and submit the form. If your course does not appear in the list,
62-
you may click 'Create New Course', which will create a new
63-
course based on the Canvas course information with you as an instructor.
61+
course and submit the form.
6462

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

65+
If your course does not appear in the list,
66+
you may click 'Create New Course', to request a new
67+
course based on the Canvas course information with you as an instructor.
68+
69+
*Warning*: your system administrator may restrict which Canvas courses can trigger the creation of a new course on MarkUs.
70+
6771
#### Creating a Grade Book entry for a MarkUs Assignment
6872

6973
Once a course association has been established, each assignment will

RESTful-API.md

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -657,6 +657,15 @@ NOTE: the "AdminRole" type can only be used by AdminUser users
657657
- has_peer_review (boolean)
658658
- starter_file_type (one of "simple", "sections", "shuffle", "group")
659659

660+
### DELETE /api/courses/:course_id/assignments/:id
661+
662+
- description: Delete the assignment corresponding to the given course and assignment id's, if it has no groups.
663+
- required parameters:
664+
- id (integer)
665+
- course_id (integer)
666+
667+
NOTE: this is only available to authorised instructors (or admins)
668+
660669
### GET /api/courses/:course_id/assignments/:id/test_files
661670

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

12071216
- description: Delete the section uniquely identified by the given course and section id's.
12081217
- NOTE: The section must be non-empty (must not have any students).
1218+
1219+
### PUT /api/courses/:course_id/sections/:id
1220+
1221+
- description: Update the section uniquely identified by the given course and section id's.
1222+
- required parameters:
1223+
- name (string)
1224+
1225+
### GET /api/courses/:course_id/sections
1226+
1227+
- description: Get all sections for this course
1228+
1229+
### GET /api/courses/:course_id/sections/:id
1230+
1231+
- description: Get the section uniquely identified by the given course and section id's.
-8.59 KB
Binary file not shown.
47.2 KB
Loading

0 commit comments

Comments
 (0)