Skip to content

Commit

Permalink
Merge branch 'release/1.3.1'
Browse files Browse the repository at this point in the history
* release/1.3.1:
  fix(errortypetemplates): Ensured compatibility with Moodle 4.3. Changed default error type template colors for new installations to improve contrast.
  fix(multiple): Fixed a bug that prevented the order of Margic error types from being changed under certain conditions. Deleting error types now triggers a confirm prompt (fixes #12). Removed doubled triggering of the download_margic_entries event. Added a color picker for creating error types and templates. The default value for the feedback notification for the entries can now be set (fixes #8). You can now prevent the displaying of timestamps for entries, annotations and feedback (fixes #9). You can now define for each Margic if teachers can overwrite and delete the annotations made by other teachers. If you save feedback or grading the page now jumps to the changed feedback after if is saved. Annotation button now in a different color when annotation mode is activated. Removed the link to index.php in the course navigation (use the course block instead) (fixes #10).
  • Loading branch information
Daniel Nolte committed Oct 22, 2023
2 parents 8554b6c + e6840db commit be34321
Show file tree
Hide file tree
Showing 60 changed files with 836 additions and 532 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ jobs:
strategy:
fail-fast: false
matrix:
php: ['7.3', '7.4', '8.0', '8.1']
moodle-branch: ['MOODLE_39_STABLE', 'MOODLE_310_STABLE', 'MOODLE_311_STABLE', 'MOODLE_400_STABLE', 'MOODLE_401_STABLE', 'MOODLE_402_STABLE']
php: ['7.3', '7.4', '8.0', '8.1', '8.2']
moodle-branch: ['MOODLE_39_STABLE', 'MOODLE_310_STABLE', 'MOODLE_311_STABLE', 'MOODLE_400_STABLE', 'MOODLE_401_STABLE', 'MOODLE_402_STABLE', 'MOODLE_403_STABLE']
database: [pgsql, mariadb]

steps:
Expand Down
18 changes: 18 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,22 @@
## Changelog ##

- [1.3.1]:
- Ensured compatibility with Moodle 4.3.
- Changed code to comply with new moodle coding standards.
- [Bugfix]: Changed default error type template colors for new installations to improve contrast.

- [1.3.0]:
- [Bugfix]: Fixed a bug that prevented the order of Margic error types (that were subsequently added to an instance from an error type template) from being changed under certain conditions.
- [Bugfix]: Deleting error types now triggers a confirm prompt.
- [Bugfix]: Removed doubled triggering of the download_margic_entries event.
- [Feature]: Added a color picker for creating error types and templates.
- [Improvement]: The default value for the feedback notification for the entries can now be set. Administrators can set the default value in the admin settings. This is then taken as the default value when a new margic is created, but can be changed there by teachers for the entire margic. Of course, teachers can deviate from the default value for each grading in the actual grading form. If the admin does not change the default value, it remains true as it was until now.
- [Improvement]: You can now prevent the displaying of timestamps for entries, annotations and feedback. There are now three new capabilities: "viewotherusersentrytimes" determines whether a user sees when an entry made by other users was created. "viewotherusersannotationtimes" determines whether a user can see when annotations were created by other users. "viewotherusersfeedbacktimes" determines whether a user can see when other teachers have given feedback on an entry. All three capabilities are activated for all users by default, but you can now withdraw these permission for individual roles (e.g. if you do not want the participants to see the times at which the teachers create their annotations or when they give feedback).
- [Improvement]: You can now define for each Margic if teachers can overwrite and delete the annotations made by other teachers.
- [Improvement]: If you save feedback or grading the page now jumps to the changed feedback after if is saved.
- [Improvement]: Annotation button now in a different color when annotation mode is activated.
- [Change]: Removed the link to index.php in the course navigation (use the course block instead).

- [1.2.9]:
- Ensured compatibility with Moodle 4.2.
- [Layout]: Minor layout fixes because of the new versions of the bootstrap and fontawesome libraries.
Expand Down
2 changes: 1 addition & 1 deletion amd/build/annotations.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion amd/build/annotations.min.js.map

Large diffs are not rendered by default.

10 changes: 10 additions & 0 deletions amd/build/colorpicker-layout.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions amd/build/colorpicker-layout.min.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion amd/build/highlighting.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion amd/build/highlighting.min.js.map

Large diffs are not rendered by default.

Loading

0 comments on commit be34321

Please sign in to comment.