Skip to content

Commit

Permalink
Merge branch 'release/1.2.9'
Browse files Browse the repository at this point in the history
* release/1.2.9:
  feat(icon): Minor change to old plugin icon
  fix(edit): Small fix for moodle coding style
  fix(edit): Fix for recent changes in the edit form
  feat(version): Incremented version and updated changelog
  feat(icon): Added monologo version of the activity icon for current Moodle versions.
  fix(printview): Small adjustment to the print view of the overview page: Removing unnecessary margin at the top of the page. Also the background colors of the annotations are now always printed in all browsers.
  fix(edit): Now hiding the edit and delete annotation buttons for annotations shown on edit.php. Also minor code changes for new php version.
  fix(view): When editing an existing entry where the date can be set manually, the current date is now pre-filled. Also, the date set for the edited version must be newer than the date of the original entry.
  fix(js): Cancel button on edit.php now working as intended.
  fix(view): Fixed a bug that the overview page of a margic was not displayed if it has been restored and a teacher who has graded an entry there does not exist anymore.
  fix(events): Removed deprecated legacy function from some events.
  fix(events): Removed deprecated legacy function from some events.
  feat(chore): updated moodle ci workflow for github
  fix(layout): replacing bootstrap class pull-right with float-right for moodle 4.2
  • Loading branch information
Daniel Nolte committed May 7, 2023
2 parents b8c9688 + 20ca44c commit 8554b6c
Show file tree
Hide file tree
Showing 35 changed files with 350 additions and 274 deletions.
12 changes: 6 additions & 6 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']
moodle-branch: ['MOODLE_39_STABLE', 'MOODLE_310_STABLE', 'MOODLE_311_STABLE', 'MOODLE_400_STABLE', 'MOODLE_401_STABLE']
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']
database: [pgsql, mariadb]

steps:
Expand Down Expand Up @@ -93,13 +93,13 @@ jobs:
if: ${{ always() }}
run: moodle-plugin-ci savepoints

- name: Mustache Lint
if: ${{ always() }}
run: moodle-plugin-ci mustache
# - name: Mustache Lint
# if: ${{ always() }}
# run: moodle-plugin-ci mustache

- name: Grunt
if: ${{ always() }}
run: moodle-plugin-ci grunt --max-lint-warnings 0
run: moodle-plugin-ci grunt --max-lint-warnings 1

- name: PHPUnit tests
if: ${{ always() }}
Expand Down
14 changes: 14 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,18 @@
## Changelog ##
- [1.2.9]:
- Ensured compatibility with Moodle 4.2.
- [Layout]: Minor layout fixes because of the new versions of the bootstrap and fontawesome libraries.
- [Icon]: Added monologo version of the activity icon for current Moodle versions.
- [Bugfix]: Minor code changes for new php version.
- [Bugfix]: Removed deprecated legacy function from some events.
- [Bugfix]: Cancel button on edit.php now working as intended.
- [Bugfix]: Now hiding the edit and delete annotation buttons for annotations shown on edit.php.
- [Bugfix]: Fixed a bug that the overview page of a margic was not displayed if it has been restored and a teacher who has graded an entry there does not exist anymore.
- [Bugfix]: When editing an existing entry where the date can be set manually, the current date is now pre-filled. Also, the date set for the edited version must be newer than the date of the original entry.
- [Bugfix]: Small adjustment to the print view of the overview page: Removing unnecessary margin at the top of the page. Also the background colors of the annotations are now always printed in all browsers.

- tl;dr: The update ensures compatibility of the Margic plugin with Moodle 4.2 and contains a few minor fixes for existing bugs. It should be installed when updating your moodle to 4.2, otherwise its recommended but optional.

- [1.2.8]:
- [Bugfix]: Renamed start and end field in table margic_annotations because those names are forbidden in postgreSQL databases.
- [Bugfix]: Fixed wrong default value in line 43 edit.php to prevent an error in moodle installations using postgreSQL databases.
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.

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 8554b6c

Please sign in to comment.