Skip to content

Commit

Permalink
Merge pull request #214 from donny-wong/v2.4.10
Browse files Browse the repository at this point in the history
V2.4.10
  • Loading branch information
donny-wong authored May 10, 2024
2 parents 4697c65 + e0e51d1 commit 5ed32b3
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 2 deletions.
7 changes: 7 additions & 0 deletions Configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ queues:
redis:
url: # url of a running redis database
validate_file: # (See "User Authentication Options" below)
remote_validate_file: # (See "User Authentication Options" below)
validate_ip: # (See "User Authentication Options" below)
validate_custom_status_message: # (See "User Authentication Options" below)
validate_user_not_allowed_message: # (See "User Authentication Options" below)
Expand Down Expand Up @@ -220,6 +221,12 @@ validate_custom_status_message:
local_auth_login_name: shibboleth
```

Additionally, MarkUs can be set to restrict remote logins based on username and/or IP when using remote authentication.

**To enable restricted remote authentication, set the following setting:**

- `remote_validate_file:` an absolute path to a script that expects input from stdin (user name, password (blank), and IP address; separated by "\n") and returns 0 if the user is authenticated and any other positive integer otherwise.

### Logout redirect

The `logout_redirect` setting determines where the user will be redirected when they logout of MarkUs. It can be one of `DEFAULT`, `NONE`, or a URL.
Expand Down
8 changes: 6 additions & 2 deletions Instructor-Guide--Assignments--Marking--Grading-View.md
Original file line number Diff line number Diff line change
Expand Up @@ -110,13 +110,17 @@ MarkUs also allows you to print a submission with the print button.
This will print all PDF files that have been submitted as a single PDF file, along with a cover page which provides information about the students in a group,
the mark received on each criterion, a list of all annotations on the submission, and any overall comment that has been left during grading.

You can also bulk print from the submissions table.

![Bulk Print Button](images/bulk_print.png)

![Printed Assignment Cover Page](images/printed-assignment-cover-page.png)

In the output pdf, the location of each annotation will also be marked.
For PDF files, the location of each annotation will be marked in the output.

![Printed Assignment Annotation](images/printed-assignment-annotation.png)

> :spiral_notepad: **NOTE**: Only PDF files are supported for printing. If a submission contains files of other types, they will not be printed.
> :spiral_notepad: **NOTE**: `.pdf` and `.ipynb` are the only file formats supported for printing. If a submission contains files of other types, they will not be printed.
## Annotations

Expand Down
Binary file added images/bulk_print.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified images/print.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 5ed32b3

Please sign in to comment.