diff --git a/Configuration.md b/Configuration.md index 4568b19..f0a4cc0 100644 --- a/Configuration.md +++ b/Configuration.md @@ -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) @@ -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. diff --git a/Instructor-Guide--Assignments--Marking--Grading-View.md b/Instructor-Guide--Assignments--Marking--Grading-View.md index fdd997b..1dcb02f 100644 --- a/Instructor-Guide--Assignments--Marking--Grading-View.md +++ b/Instructor-Guide--Assignments--Marking--Grading-View.md @@ -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 diff --git a/images/bulk_print.png b/images/bulk_print.png new file mode 100644 index 0000000..237e79c Binary files /dev/null and b/images/bulk_print.png differ diff --git a/images/print.png b/images/print.png index d23ee7a..8b79eeb 100644 Binary files a/images/print.png and b/images/print.png differ