Merge develop back into ewi

[berkes]

commit ce48f17
Merge: c8c1dbc 4f42601
Author: Okke Harsta oharsta@zilverline.com
Date: Mon Mar 16 11:41:39 2026 +0100

Merge pull request #306 from edubadges/bugfix/fix-linkedin-url-for-badge-instance-endpoint-in-mobile-api

Add request to context of badge instance serializer

commit 4f42601
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Mon Mar 16 11:02:47 2026 +0100

Add request to context of badge instance serializer

commit c8c1dbc
Merge: 6d2e4be e68b680
Author: Dostkamp 4895210+Iso5786@users.noreply.github.com
Date: Tue Mar 10 14:11:15 2026 +0100

Merge pull request #297 from edubadges/dependabot/pip/markdown-3.8.1

Bump markdown from 2.6.8 to 3.8.1

commit 6d2e4be
Merge: 09edda4 33aafc4
Author: Dostkamp 4895210+Iso5786@users.noreply.github.com
Date: Tue Mar 10 14:11:08 2026 +0100

Merge pull request #275 from edubadges/dependabot/pip/sqlparse-0.5.4

Bump sqlparse from 0.5.0 to 0.5.4

commit 09edda4
Merge: 030cf7d a54281e
Author: Dostkamp 4895210+Iso5786@users.noreply.github.com
Date: Tue Mar 10 14:10:01 2026 +0100

Merge pull request #268 from edubadges/dependabot/pip/cryptography-46.0.5

Bump cryptography from 44.0.1 to 46.0.5

commit 030cf7d
Merge: 3451acb eaea3f5
Author: Dostkamp 4895210+Iso5786@users.noreply.github.com
Date: Tue Mar 10 13:55:14 2026 +0100

Merge pull request #303 from edubadges/dependabot/github_actions/dot-github/workflows/aquasecurity/trivy-action-0.34.0

Bump aquasecurity/trivy-action from 0.33.1 to 0.34.0 in /.github/workflows

commit a54281e
Author: Daniel d.ostkamp@posteo.de
Date: Tue Mar 10 13:49:36 2026 +0100

feat: updated cffi to 2.0.0

commit 3451acb
Author: Dostkamp 4895210+Iso5786@users.noreply.github.com
Date: Tue Mar 10 13:10:09 2026 +0100

Update trivy.yml to upload sarif_file

commit eaea3f5
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue Mar 10 10:34:50 2026 +0000

Bump aquasecurity/trivy-action in /.github/workflows

Bumps [aquasecurity/trivy-action](https://github.com/aquasecurity/trivy-action) from 0.33.1 to 0.34.0.
- [Release notes](https://github.com/aquasecurity/trivy-action/releases)
- [Commits](https://github.com/aquasecurity/trivy-action/compare/0.33.1...0.34.0)

---
updated-dependencies:
- dependency-name: aquasecurity/trivy-action dependency-version: 0.34.0 dependency-type: direct:production ...

Signed-off-by: dependabot[bot] <support@github.com>

commit 3d64854
Merge: d33329a ab3b09b
Author: Dostkamp 4895210+Iso5786@users.noreply.github.com
Date: Tue Mar 10 11:34:37 2026 +0100

Merge pull request #302 from edubadges/feature/wrap-saving-direct-award-in-reminder-management-command-in-try-except-to-avoid-crash

Wrap saving of direct award in try except to avoid crash

commit d33329a
Author: Dostkamp 4895210+Iso5786@users.noreply.github.com
Date: Tue Mar 10 11:34:06 2026 +0100

Create trivy.yml

commit e42bd1b
Merge: 9451634 c0c7815
Author: Dostkamp 4895210+Iso5786@users.noreply.github.com
Date: Tue Mar 10 11:23:25 2026 +0100

Merge pull request #294 from edubadges/dependabot/pip/django-4.2.29

Bump django from 4.2.28 to 4.2.29

commit ab3b09b
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Tue Mar 10 10:46:07 2026 +0100

Wrap saving of direct award in try except to avoid crash

commit 9451634
Merge: 0a71478 3a4db0e
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Tue Mar 10 09:56:14 2026 +0100

Merge pull request #301 from edubadges/feature/pass-direct-award-recipient-names-to-badge-instance-instead-of-validated-name

Pass recipient names to badge instance for direct awards on email

commit 3a4db0e
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Tue Mar 10 09:26:52 2026 +0100

Pass recipient names to badge instance for direct awards on email

commit 0a71478
Merge: d66ea84 6f39340
Author: Okke Harsta oharsta@zilverline.com
Date: Mon Mar 9 15:06:50 2026 +0100

Merge pull request #300 from edubadges/feature/add-retrieve-endpoint-for-mobile-register-devices

Add detail endpoint for retrieving registered devices for mobile api

commit 6f39340
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Mon Mar 9 10:08:44 2026 +0100

Add detail endpoint for retrieving registered devices for mobile api

commit e68b680
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu Mar 5 23:10:36 2026 +0000

Bump markdown from 2.6.8 to 3.8.1

Bumps [markdown](https://github.com/Python-Markdown/markdown) from 2.6.8 to 3.8.1.
- [Release notes](https://github.com/Python-Markdown/markdown/releases)
- [Changelog](https://github.com/Python-Markdown/markdown/blob/master/docs/changelog.md)
- [Commits](https://github.com/Python-Markdown/markdown/commits/3.8.1)

---
updated-dependencies:
- dependency-name: markdown dependency-version: 3.8.1 dependency-type: direct:production ...

Signed-off-by: dependabot[bot] <support@github.com>

commit c0c7815
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed Mar 4 23:11:22 2026 +0000

Bump django from 4.2.28 to 4.2.29

Bumps [django](https://github.com/django/django) from 4.2.28 to 4.2.29.
- [Commits](https://github.com/django/django/compare/4.2.28...4.2.29)

---
updated-dependencies:
- dependency-name: django dependency-version: 4.2.29 dependency-type: direct:production ...

Signed-off-by: dependabot[bot] <support@github.com>

commit d66ea84
Author: Okke Harsta oharsta@zilverline.com
Date: Wed Mar 4 10:42:57 2026 +0100

Fix for AttributeError: 'BadgeClass' object has no attribute 'may_enroll'

commit db29496
Author: Okke Harsta oharsta@zilverline.com
Date: Wed Mar 4 10:32:13 2026 +0100

Bugfix for AttributeError: 'BadgeClass' object has no attribute 'may_enroll'

commit c7a00b7
Merge: 90b5374 b53e3ba
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Thu Feb 26 17:16:16 2026 +0100

Merge pull request #289 from edubadges/bugfix/show-new-fields-as-booleans-in-swagger-interface

Show the enrollment enabled and user may enroll as booleans in swagger

commit b53e3ba
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Thu Feb 26 17:13:20 2026 +0100

Show the enrollment enabled and user may enroll as booleans in swagger

commit 90b5374
Merge: 9080681 df37f93
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Thu Feb 26 16:24:27 2026 +0100

Merge pull request #288 from edubadges/feature/add-enrollment-permission-to-mobile-api

Feature/add enrollment permission to mobile api

commit df37f93
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Thu Feb 26 13:18:44 2026 +0100

Add user may enroll boolean to serializer

commit f5649bb
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Thu Feb 26 13:18:25 2026 +0100

Add self enrollment enabled field to serializer

commit 30117e8
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Thu Feb 26 13:17:17 2026 +0100

Add user_may_enroll method to badgeclass

commit 9080681
Merge: d1953d9 cf236b2
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Tue Feb 24 13:52:24 2026 +0100

Merge pull request #286 from edubadges/feature/refactor-mobile-endpoints-for-terms-agreements

Refactor mobile api endpoints for terms agreements

commit cf236b2
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Tue Feb 24 11:46:10 2026 +0100

Refactor mobile api endpoints for terms agreements

Now there is a dedicated viewset for retrieving, creating
and updating terms agreements with minimal fields

commit d1953d9
Merge: aab54ed df7cbe2
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Thu Feb 19 16:15:22 2026 +0100

Merge pull request #285 from edubadges/feature/allow-login-without-validated-name

Remove redirect to allow login without validated name

commit aab54ed
Merge: 14c8fe3 c762294
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Thu Feb 19 15:01:28 2026 +0100

Merge pull request #283 from edubadges/feature/add-datamigration-to-populate-recipient-name-in-badge-instances

Feature/add datamigration to populate recipient name in badge instances

commit df7cbe2
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Thu Feb 19 15:00:51 2026 +0100

Remove redirect to allow login without validated name

commit 14c8fe3
Merge: f61dbbb 678fb64
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Thu Feb 19 14:51:38 2026 +0100

Merge pull request #282 from edubadges/feature/update-identity-endpoint-for-validated-name-retrieval

Feature/update identity endpoint for validated name retrieval

commit f61dbbb
Merge: c738d64 4d23e77
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Thu Feb 19 14:51:12 2026 +0100

Merge pull request #284 from edubadges/feature/update-csv-example-file-for-email-only

Update sample csv file for bulk upload for email only

commit c762294
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Thu Feb 19 13:35:04 2026 +0100

Add datamigration to populate recipient names for badge instances

commit 678fb64
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Wed Feb 18 09:57:20 2026 +0100

Update badge instance recipient name methods to be more concise

commit 6c1c326
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Wed Feb 18 09:56:34 2026 +0100

Add validated name and recipient name to identity endpoint

commit 4d23e77
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Tue Feb 17 16:56:36 2026 +0100

Update sample csv file for bulk upload for email only

commit c738d64
Merge: 9a18dbd 29bec1d
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Thu Feb 19 13:10:16 2026 +0100

Merge pull request #280 from edubadges/feature/add-recipient-name-to-direct-award-and-badge-instance-models

Feature/add recipient name to direct award and badge instance models

commit 29bec1d
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Thu Feb 19 11:13:00 2026 +0100

Add tests for direct award on email and wrong eppn

commit 8446e1f
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Thu Feb 19 11:12:41 2026 +0100

Fix validation on bundle type

commit 645a630
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Thu Feb 19 11:12:21 2026 +0100

Remove validation for validated name on award and issue

commit cf58c95
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Thu Feb 19 09:13:55 2026 +0100

Add test for direct award creation with recipient name

commit 3974d60
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Tue Feb 17 16:55:49 2026 +0100

Update direct award serializer to allow null for first and last names

commit 4707382
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Tue Feb 17 15:25:13 2026 +0100

Update get recipient name to return recipient name when it exists

commit 8cffe2f
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Tue Feb 17 15:24:41 2026 +0100

Pass recipient name along in the award method to issue

commit 4e4af22
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Tue Feb 17 15:23:24 2026 +0100

Handle recipient names in the serializer for direct awards

commit b811053
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Tue Feb 17 15:22:44 2026 +0100

Add recipient name to direct award and badge instance models

commit 9a18dbd
Merge: dd366a4 e2a1871
Author: Dostkamp 4895210+Iso5786@users.noreply.github.com
Date: Tue Feb 17 13:08:54 2026 +0100

Merge pull request #279 from edubadges/bugfix/fix-push-notifications-break-when-there-is-no-user

Prevent crash when there is no user to send push notification to

commit e2a1871
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Tue Feb 17 11:43:57 2026 +0100

Prevent crash when there is no user to send push notification to

commit dd366a4
Merge: 744b671 2f633b5
Author: Okke Harsta oharsta@zilverline.com
Date: Mon Feb 16 15:48:43 2026 +0100

Merge branch 'master' into develop

commit 744b671
Merge: 772fbbc fd8813e
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Mon Feb 16 10:38:52 2026 +0100

Merge pull request #278 from edubadges/feature/remove-trailing-slash-from-badge-collections-viewset

Remove trailing slashes from badge collections endpoints

commit fd8813e
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Mon Feb 16 10:28:51 2026 +0100

Remove trailing slashes from badge collections endpoints

For consistency

commit 772fbbc
Merge: 28cd36e 05d71a4
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Mon Feb 16 10:11:33 2026 +0100

Merge pull request #277 from edubadges/feature/refactor-firebase-configuration-and-check

Feature/refactor firebase configuration and check

commit 05d71a4
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Mon Feb 16 09:55:44 2026 +0100

Only set google env variable if json file env variable is set

commit 8d38338
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Thu Feb 12 12:51:14 2026 +0100

Make push notification sending fail gracefully

For when the service account json file is missing

commit 49afb8a
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Thu Feb 12 12:49:47 2026 +0100

Replace firebase env variables with json file configuration

commit 33aafc4
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri Feb 13 18:11:29 2026 +0000

Bump sqlparse from 0.5.0 to 0.5.4

Bumps [sqlparse](https://github.com/andialbrecht/sqlparse) from 0.5.0 to 0.5.4.
- [Changelog](https://github.com/andialbrecht/sqlparse/blob/master/CHANGELOG)
- [Commits](https://github.com/andialbrecht/sqlparse/compare/0.5.0...0.5.4)

---
updated-dependencies:
- dependency-name: sqlparse dependency-version: 0.5.4 dependency-type: direct:production ...

Signed-off-by: dependabot[bot] <support@github.com>

commit 28cd36e
Merge: 4b41cca ea4d415
Author: Dostkamp 4895210+Iso5786@users.noreply.github.com
Date: Fri Feb 13 09:15:26 2026 +0100

Merge pull request #274 from edubadges/feature/add-narrative-to-badge-instance-detail-for-mobile-api

Add narrative to badge instance detail endpoint for mobile api

commit 4b41cca
Merge: fb3e7e3 fb13c43
Author: Dostkamp 4895210+Iso5786@users.noreply.github.com
Date: Fri Feb 13 09:14:21 2026 +0100

Merge pull request #272 from edubadges/feature/send-push-notifications-on-badge-received

Feature/send push notifications on badge received

commit ea4d415
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Thu Feb 12 17:23:51 2026 +0100

Add narrative to badge instance detail endpoint for mobile api

commit fb3e7e3
Merge: acff2f2 eeb87b4
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Thu Feb 12 13:27:16 2026 +0100

Merge pull request #269 from edubadges/feature/add-sorting-to-mobile-api-catalog-and-badge-instances

Add sorting to mobile api badge instances and catalog endpoints

commit fb13c43
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Thu Feb 12 11:05:16 2026 +0100

Send push notifications when edubadge received

commit dea6c90
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Thu Feb 12 11:04:19 2026 +0100

Add logging for debugging purposes

commit 952b33a
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Thu Feb 12 10:41:50 2026 +0100

Add helper function for sending push notifications

commit acff2f2
Merge: 7cba71f 317f569
Author: Dostkamp 4895210+Iso5786@users.noreply.github.com
Date: Thu Feb 12 10:53:15 2026 +0100

Merge pull request #271 from edubadges/bugfix/add-correct-source-for-badge-class-relation

Add source for related badge class serializers

commit 317f569
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Thu Feb 12 10:32:12 2026 +0100

Add source for related badge class serializers

commit eeb87b4
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Wed Feb 11 14:58:22 2026 +0100

Add sorting to mobile api badge instances and catalog endpoints

commit 7cba71f
Merge: eda79af c6ddfae
Author: Dostkamp 4895210+Iso5786@users.noreply.github.com
Date: Wed Feb 11 08:57:45 2026 +0100

Merge pull request #267 from edubadges/feature/fix-inconsistencies-in-mobile-api

Feature/fix inconsistencies in mobile api

commit b889f24
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed Feb 11 01:49:12 2026 +0000

Bump cryptography from 44.0.1 to 46.0.5

Bumps [cryptography](https://github.com/pyca/cryptography) from 44.0.1 to 46.0.5.
- [Changelog](https://github.com/pyca/cryptography/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pyca/cryptography/compare/44.0.1...46.0.5)

---
updated-dependencies:
- dependency-name: cryptography dependency-version: 46.0.5 dependency-type: direct:production ...

Signed-off-by: dependabot[bot] <support@github.com>

commit eda79af
Merge: e808011 e5ceaba
Author: Dostkamp 4895210+Iso5786@users.noreply.github.com
Date: Tue Feb 10 12:48:25 2026 +0100

Merge pull request #266 from edubadges/feature/add-agreed-at-date-to-terms-agreement-model

Feature/add agreed at date to terms agreement model

commit e808011
Merge: 64b2b79 a837bd7
Author: Dostkamp 4895210+Iso5786@users.noreply.github.com
Date: Tue Feb 10 12:48:07 2026 +0100

Merge pull request #265 from edubadges/chore/add-missing-migrations

Add missing migrations

commit c6ddfae
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Tue Feb 10 10:10:44 2026 +0100

Replace badge collection views with viewset and unified serializer

commit e5ceaba
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Tue Feb 10 09:26:59 2026 +0100

Add comment to clarify logic

commit 2a88718
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Mon Feb 9 14:42:28 2026 +0100

Update students enrolled serializer fields to match direct awards

commit fc75c98
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Mon Feb 9 11:44:48 2026 +0100

Add agreed_at to terms agreement serializer

commit fdd488c
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Mon Feb 9 11:44:24 2026 +0100

Add data migration to backfill historical agreed terms

commit fc78d27
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Mon Feb 9 11:44:04 2026 +0100

Add agreed_at date to terms agreement model

commit 288e434
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Mon Feb 9 10:00:36 2026 +0100

Rename image_url to image in badge class serializer

commit a837bd7
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Mon Feb 9 09:58:52 2026 +0100

Add missing migrations

I ran makemigrations and some migrations were created. This means that
some models were updated in the code, but the migrations weren't
created yet. This change should reflect that in the DB's

commit 64b2b79
Merge: 55c724a eb143af
Author: Dostkamp 4895210+Iso5786@users.noreply.github.com
Date: Fri Feb 6 16:29:20 2026 +0100

Merge pull request #264 from edubadges/feature/add-register-device-endpoint-for-push-notifications

Feature/add register device endpoint for push notifications

commit 2f633b5
Merge: 1199d1b 55c724a
Author: Daniel Ostkamp 4895210+Iso5786@users.noreply.github.com
Date: Thu Feb 5 16:47:37 2026 +0100

Merge branch 'develop'

commit 55c724a
Merge: 41821bc eca12a1
Author: Dostkamp 4895210+Iso5786@users.noreply.github.com
Date: Thu Feb 5 16:47:19 2026 +0100

Merge pull request #263 from edubadges/bugfix/fix-migration-leaf-nodes-and-production-merge-migrations

Bugfix/fix migration leaf nodes and production merge migrations

commit eca12a1
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Thu Feb 5 16:42:15 2026 +0100

Fix populate institution email data migration

commit 25b1bea
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Thu Feb 5 16:41:56 2026 +0100

Add merge migrations that were generated on production server

commit 1199d1b
Merge: c4af65a 41821bc
Author: Daniel Ostkamp 4895210+Iso5786@users.noreply.github.com
Date: Thu Feb 5 15:53:12 2026 +0100

Merge branch 'develop'

commit c4af65a
Author: Daniel Ostkamp 4895210+Iso5786@users.noreply.github.com
Date: Thu Feb 5 15:52:32 2026 +0100

Added changelog for 8.4.1

commit 41821bc
Merge: 7e66b45 8a1c3eb
Author: Dostkamp 4895210+Iso5786@users.noreply.github.com
Date: Thu Feb 5 15:46:40 2026 +0100

Merge pull request #262 from edubadges/bugfix/fix-filter-for-audittrail-data-migration-on-entity-id

Filter the direct awards on entity id because that is currently stored

commit 8a1c3eb
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Thu Feb 5 15:40:23 2026 +0100

Filter the direct awards on entity id because that is currently stored

commit eb143af
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Thu Feb 5 14:21:58 2026 +0100

Add register device endpoint for mobile push notifications

commit 8e2130a
Merge: 411937b 7e66b45
Author: Daniel Ostkamp 4895210+Iso5786@users.noreply.github.com
Date: Thu Feb 5 14:17:06 2026 +0100

Merge branch 'develop'

commit 0b83bc9
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Thu Feb 5 13:15:10 2026 +0100

Add system check to warn if env variables are missing

commit ed92cea
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Thu Feb 5 13:14:35 2026 +0100

Install fcm-django and configure in settings

commit 7e66b45
Merge: f835625 8b4bf04
Author: Dostkamp 4895210+Iso5786@users.noreply.github.com
Date: Thu Feb 5 11:46:32 2026 +0100

Merge pull request #261 from edubadges/feature/add-terms-to-direct-award-endpoint

Add required terms to direct award detail view

commit 8b4bf04
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Thu Feb 5 11:37:28 2026 +0100

Add required terms to direct award detail view

And refactor to use a RetrieveAPIView

commit f835625
Merge: a130b5d 84cf1ee
Author: Dostkamp 4895210+Iso5786@users.noreply.github.com
Date: Wed Feb 4 16:35:39 2026 +0100

Merge pull request #258 from edubadges/feature/populate-institution-email

Add datamigration to populate institution email

commit a130b5d
Merge: 49f8e44 53e951e
Author: Dostkamp 4895210+Iso5786@users.noreply.github.com
Date: Wed Feb 4 16:18:59 2026 +0100

Merge pull request #260 from edubadges/bugfix/fix-institution-mobile-endpoint-filtering

Flip filtering logic around to make query faster

commit 53e951e
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Wed Feb 4 15:15:42 2026 +0100

Flip filtering logic around to make query faster

And this also should fix the visibility issue. I think it was because of the faculty visibility type

commit 49f8e44
Merge: f421531 30c250b
Author: Dostkamp 4895210+Iso5786@users.noreply.github.com
Date: Wed Feb 4 13:05:46 2026 +0100

Merge pull request #259 from edubadges/bugfix/institution-mobile-endpoint-use-correct-related-name

Use correct related name for badgeclass issuer FK

commit 30c250b
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Wed Feb 4 11:09:57 2026 +0100

Use correct related name for badgeclass issuer FK

commit 84cf1ee
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Wed Feb 4 08:58:47 2026 +0100

Add datamigration to populate institution email

commit f421531
Merge: 3c216af f490ca8
Author: Dostkamp 4895210+Iso5786@users.noreply.github.com
Date: Wed Feb 4 08:35:40 2026 +0100

Merge pull request #257 from edubadges/dependabot/pip/django-4.2.28

Bump django from 4.2.27 to 4.2.28

commit f490ca8
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue Feb 3 20:51:19 2026 +0000

Bump django from 4.2.27 to 4.2.28

Bumps [django](https://github.com/django/django) from 4.2.27 to 4.2.28.
- [Commits](https://github.com/django/django/compare/4.2.27...4.2.28)

---
updated-dependencies:
- dependency-name: django dependency-version: 4.2.28 dependency-type: direct:production ...

Signed-off-by: dependabot[bot] <support@github.com>

commit 3c216af
Merge: 122f4b4 2049380
Author: Dostkamp 4895210+Iso5786@users.noreply.github.com
Date: Tue Feb 3 16:59:28 2026 +0100

Merge pull request #255 from edubadges/feature/add-mobile-institution-api-endpoint

Add mobile institution api endpoint

commit 2049380
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Tue Feb 3 12:56:36 2026 +0100

Add mobile institution api endpoint

Only institutions that satisfy all filters will be included

# Conflicts:
#	apps/mobile_api/api.py

commit 122f4b4
Merge: 46669fe c73b8c4
Author: Dostkamp 4895210+Iso5786@users.noreply.github.com
Date: Tue Feb 3 16:30:27 2026 +0100

Merge pull request #256 from edubadges/feature/add-mobile-api-endpoint-for-badge-class-detail

Add mobile api endpoint for badge class detail

commit c73b8c4
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Tue Feb 3 16:20:34 2026 +0100

Add mobile api endpoint for badge class detail

commit 46669fe
Merge: 62f5dd0 ff4faa4
Author: Dostkamp 4895210+Iso5786@users.noreply.github.com
Date: Tue Feb 3 08:54:58 2026 +0100

Merge pull request #254 from edubadges/feature/add-terms-to-mobile-catalog

Feature/add terms to mobile catalog

commit ff4faa4
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Mon Feb 2 10:36:35 2026 +0100

Add boolean for whether user has accepted the terms

commit fb02215
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Mon Feb 2 10:36:06 2026 +0100

Add terms to catalog badge class serializer

commit 62f5dd0
Author: Okke Harsta oharsta@zilverline.com
Date: Thu Jan 29 10:58:39 2026 +0100

Added endpoint to make a badge instance public

commit 2db0dd9
Merge: 8108e72 14c1e6f
Author: Dostkamp 4895210+Iso5786@users.noreply.github.com
Date: Thu Jan 29 07:59:34 2026 +0100

Merge pull request #253 from edubadges/bugfix/fix-entity-id-for-direct-award

Use entity id for direct awards

commit 14c1e6f
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Wed Jan 28 15:58:07 2026 +0100

Use entity id for direct awards

commit 8108e72
Merge: 318183f 8fad553
Author: Dostkamp 4895210+Iso5786@users.noreply.github.com
Date: Wed Jan 28 15:44:54 2026 +0100

Merge pull request #252 from edubadges/bugfix/fix-creation-of-audit-trail-objects-in-signal

Find direct award and badgeclass on id and not entity_id

commit 318183f
Merge: 3c2c4b8 4beeef7
Author: Dostkamp 4895210+Iso5786@users.noreply.github.com
Date: Wed Jan 28 15:44:44 2026 +0100

Merge pull request #251 from edubadges/feature/update-filters-for-mobile-api-catalog-endpoint

Remove q filter and replace is_micro with institution_type filter

commit 8fad553
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Wed Jan 28 15:30:06 2026 +0100

Find direct award and badgeclass on id and not entity_id

commit 3c2c4b8
Author: Okke Harsta oharsta@zilverline.com
Date: Wed Jan 28 15:20:25 2026 +0100

Added grade_achieved in the BadgeInstanceDetailSerializer

commit 4beeef7
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Wed Jan 28 14:50:28 2026 +0100

Remove q filter and replace is_micro with institution_type filter

commit ad4798a
Author: Daniel Ostkamp 4895210+Iso5786@users.noreply.github.com
Date: Fri Jan 16 10:25:13 2026 +0100

Updated CHANGELOG for release 8.4

commit 4b74969
Author: Daniel d.ostkamp@posteo.de
Date: Tue Dec 2 15:23:06 2025 +0100

Updated CHANGELOG for 8.3.3 release

commit 1b88a4a
Merge: f03041a 8d675d2
Author: Dostkamp 4895210+Iso5786@users.noreply.github.com
Date: Wed Jan 28 09:28:20 2026 +0100

Merge pull request #250 from edubadges/bugfix/fix-swagger-ui-for-filterable-fields

Add filter backend globally and locally

commit 8d675d2
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Wed Jan 28 09:22:01 2026 +0100

Add filter backend globally and locally

commit f03041a
Author: Daniel d.ostkamp@posteo.de
Date: Tue Jan 27 20:20:42 2026 +0100

Annotate correct related objects (badgeinstances) #2

commit 7a8804a
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Tue Jan 27 16:14:40 2026 +0100

Annotate correct related objects

commit a722c5f
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Tue Jan 27 15:57:04 2026 +0100

Remove source from terms_agreed

commit 8c30831
Merge: 751b44b 2bf5c59
Author: Dostkamp 4895210+Iso5786@users.noreply.github.com
Date: Tue Jan 27 15:48:59 2026 +0100

Merge pull request #249 from edubadges/feature/mobile-profile-add-extra-metadata

Feature/mobile profile add extra metadata

commit 2bf5c59
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Mon Jan 26 16:40:13 2026 +0100

Add registration and consent data to user profile

commit a4741c5
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Mon Jan 26 16:25:41 2026 +0100

Replace profile api view with custom one for mobile api

commit 751b44b
Merge: b5ec35e 7437740
Author: Dostkamp 4895210+Iso5786@users.noreply.github.com
Date: Tue Jan 27 15:45:33 2026 +0100

Merge pull request #248 from edubadges/feature/mobile-catalog-endpoint-with-filtering-and-pagination

Feature/mobile catalog endpoint with filtering and pagination

commit 7437740
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Mon Jan 26 11:05:03 2026 +0100

Add schema example

commit b0ed25a
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Mon Jan 26 11:04:47 2026 +0100

Add filter class so endpoint can be filtered with query params

commit ba62d49
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Mon Jan 26 11:03:51 2026 +0100

Add catalog list view with pagination

This is a replacement for the api endpoint in queries with the raw sql

commit b5ec35e
Merge: e836805 f595116
Author: Dostkamp 4895210+Iso5786@users.noreply.github.com
Date: Tue Jan 27 15:37:43 2026 +0100

Merge pull request #247 from edubadges/improve_mobile_api_swagger

Feature/Improving mobile API swagger annotations and serveral fixes in mobile API

commit f595116
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Tue Jan 27 13:09:51 2026 +0100

Prefetch related badge instances to minimize queries

commit 6f3616e
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Tue Jan 27 13:09:30 2026 +0100

Use slug related field instead of serializer method field

commit ad7b577
Author: Daniel d.ostkamp@posteo.de
Date: Fri Jan 23 17:42:21 2026 +0100

fix: have badge instance PUT method only allow acceptance and public
field

commit 4c5b622
Author: Daniel d.ostkamp@posteo.de
Date: Fri Jan 23 17:12:31 2026 +0100

fix: use for badge-instances/entity_id path one view
(BadgeInstanceDetail) and add logic to support PUT method in
BadgeInstanceDetail

commit 4600b68
Author: Daniel d.ostkamp@posteo.de
Date: Fri Jan 23 16:54:10 2026 +0100

chore: improved the swagger doc by adding full models of badge instances, direct award, and collections

commit 1e178d3
Author: Daniel d.ostkamp@posteo.de
Date: Fri Jan 23 16:52:30 2026 +0100

fix: return entity_id's instead of id's of badgeinstances within collections

# Conflicts:
#	apps/mobile_api/serializers.py

# Conflicts:
#	apps/mobile_api/serializers.py

commit 7df7af9
Author: Daniel d.ostkamp@posteo.de
Date: Fri Jan 23 15:47:43 2026 +0100

fix: mobile API auth to return 401 instead of 403

commit 32d22a4
Author: Daniel Ostkamp 4895210+Iso5786@users.noreply.github.com
Date: Fri Jan 16 16:17:25 2026 +0100

Adding .zed to gitignore

commit ffe9846
Author: Daniel Ostkamp 4895210+Iso5786@users.noreply.github.com
Date: Fri Jan 16 16:17:15 2026 +0100

Feat: improve mobile api swagger, initial commit

commit e836805
Author: Okke Harsta oharsta@zilverline.com
Date: Mon Jan 26 11:24:38 2026 +0100

Added badge_class_type in mobile API

commit d0d686e
Merge: 489d893 4318e30
Author: Dostkamp 4895210+Iso5786@users.noreply.github.com
Date: Wed Jan 21 09:36:00 2026 +0100

Merge pull request #244 from edubadges/bugfix/fix-audittrail-errors

Bugfix/fix audittrail errors

commit 4318e30
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Tue Jan 20 17:07:15 2026 +0100

Add a one-off management command to backfill badgeclass ids

commit f0ff521
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Tue Jan 20 16:59:14 2026 +0100

Select related institution through issuer and faculty

As the badgeclass model itself doesn't have a FK relationship,
only a property

commit e900377
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Tue Jan 20 16:56:53 2026 +0100

Fix migration to filter on actual ids

commit 489d893
Merge: 14ce28a e724192
Author: Dostkamp 4895210+Iso5786@users.noreply.github.com
Date: Tue Jan 20 12:02:41 2026 +0100

Merge pull request #243 from edubadges/feature/improve-performance-of-direct-award-audit-trail-endpoint

Feature/improve performance of direct award audit trail endpoint

commit e724192
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Mon Jan 19 13:35:19 2026 +0100

Update audit trail signal receiver to set fk relations properly

commit ebee67d
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Mon Jan 19 13:34:33 2026 +0100

Improve performance with select_related and extra filter

commit 82503d7
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Mon Jan 19 13:33:59 2026 +0100

Refactor audit trail api view into a ListAPIView

Refactor the audit trail API endpoint to a ListAPIView and improve the serializer using the new model relations.

commit 001673f
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Mon Jan 19 13:23:20 2026 +0100

Refactor charfields to foreign key relationships

Refactor DirectAwardAuditTrail to use proper ForeignKey relations instead of CharField entity IDs. Includes a data migration to populate historical records and removes the legacy fields. The migration is also backwards compatible.

commit 14ce28a
Author: Okke Harsta oharsta@zilverline.com
Date: Mon Jan 19 11:24:00 2026 +0100

Added stackable to the badgeclass serializer

commit 7eb4834
Author: Okke Harsta oharsta@zilverline.com
Date: Mon Jan 19 10:27:01 2026 +0100

Added grade_achieved to mobile seerializer

commit 411937b
Author: Daniel Ostkamp 4895210+Iso5786@users.noreply.github.com
Date: Fri Jan 16 10:25:13 2026 +0100

Updated CHANGELOG for release 8.4

commit 8347ae2
Merge: d312ec4 001e3c0
Author: Dostkamp 4895210+Iso5786@users.noreply.github.com
Date: Thu Jan 15 16:43:17 2026 +0100

Merge pull request #242 from edubadges/feature/add-linkedin-url-to-mobile-badgeinstance-api-endpoint

Add linkedin_url field to badge instance detail serializer

commit 001e3c0
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Thu Jan 15 14:02:44 2026 +0100

Retrieve faculty directly fro badgeclass issuer

Should be always available

commit bc97941
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Wed Jan 14 15:08:15 2026 +0100

Add linkedin_url field to badge instance detail serializer

commit 02ca798
Merge: b00d51f d312ec4
Author: Daniel Ostkamp 4895210+Iso5786@users.noreply.github.com
Date: Wed Jan 14 10:05:29 2026 +0100

Merge branch 'develop' for release 8.4

commit d312ec4
Merge: b4997cb 574dace
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Wed Jan 14 08:30:19 2026 +0100

Merge pull request #239 from edubadges/dependabot/pip/urllib3-2.6.3

Bump urllib3 from 1.26.19 to 2.6.3

commit b4997cb
Merge: fe33131 8bd3c8e
Author: Okke Harsta oharsta@zilverline.com
Date: Tue Jan 13 19:30:34 2026 +0100

Merge pull request #241 from edubadges/chore/run-django-tests-in-ci-cd

Add workflow to run django tests

commit 574dace
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Tue Jan 13 11:12:05 2026 +0100

Update import of urllib

commit 310f475
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue Jan 13 09:26:25 2026 +0000

Bump urllib3 from 1.26.19 to 2.6.3

Bumps [urllib3](https://github.com/urllib3/urllib3) from 1.26.19 to 2.6.3.
- [Release notes](https://github.com/urllib3/urllib3/releases)
- [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst)
- [Commits](https://github.com/urllib3/urllib3/compare/1.26.19...2.6.3)

---
updated-dependencies:
- dependency-name: urllib3 dependency-version: 2.6.3 dependency-type: direct:production ...

Signed-off-by: dependabot[bot] <support@github.com>

commit 8bd3c8e
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Mon Jan 12 16:01:58 2026 +0100

Grant privileges to test db user

commit 9e9e4a5
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Mon Jan 12 15:34:48 2026 +0100

Add workflow to run django tests

commit fe33131
Merge: 503f94d 4e46cf3
Author: Okke Harsta oharsta@zilverline.com
Date: Mon Jan 12 15:32:32 2026 +0100

Merge pull request #240 from edubadges/chore/fix-tests

Chore/fix tests

commit 4e46cf3
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Mon Jan 12 15:19:10 2026 +0100

Fix tests for removed constraint for badgeclass

Badge names do not have to be unique anymore since dd765f3

commit 5138a0d
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Mon Jan 12 14:48:45 2026 +0100

Fix request data that was no valid json

commit aa7b04b
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Mon Jan 12 14:48:29 2026 +0100

Add required badgeclass type to request data

commit 3e6c9cd
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Mon Jan 12 14:42:29 2026 +0100

Disable extension validation in tests

This doesn't work because the @context is not available

commit abf0655
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Mon Jan 12 11:51:33 2026 +0100

Fix assertion for showing archived badges in issuer response

Archived badges should show now in the resolve_issuers. Change done in
49834567217f74bad9da418160f5e13f78891a2b by Okke, test was not updated

commit 94790ad
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Mon Jan 12 11:16:12 2026 +0100

Fix urls and expected response code in institution test

commit 72c1e0e
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Mon Jan 12 09:56:27 2026 +0100

Remove edit directaward functionality from tests

Functionality itself was removed in 72d6783

commit 3a00733
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Thu Jan 8 17:35:13 2026 +0100

Assert correct type

commit f56e713
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Thu Jan 8 16:59:03 2026 +0100

Fix staff permission in test to show issuers

Apparently for institution staff the may_update permission
is required to view issuers.

commit f3c1f42
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Thu Jan 8 15:21:56 2026 +0100

Fix broken test helpers for enrollment setup

commit a53679b
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Thu Jan 8 13:11:09 2026 +0100

Disable auth signals and logging in tests

Authentication login/logout signals produced noisy stdout output during
tests. These are now disabled via a test-only settings override

commit 4a40535
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Thu Jan 8 13:09:12 2026 +0100

Add dedicated settings for testing

commit 5acea26
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Thu Jan 8 12:23:06 2026 +0100

Suppress cssutils CSS validation errors in test environment

cssutils logs ERROR-level messages for valid modern CSS due to
CSS 2.1 validation limitations. Since these warnings do not
indicate functional issues, we silence cssutils logging in
BadgrRunner to reduce noise during tests.

commit e357bea
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Thu Jan 8 11:52:28 2026 +0100

Fix naive datetime defaults in legacy migrations

The previous defaults produced naive datetimes during test database
creation while USE_TZ was enabled, causing runtime warnings before
tests ran. This change fixes the issue at the migration level and
eliminates test startup noise.

commit 9834428
Author: Thomas Kalverda thomas.kalverda@surf.nl
Date: Thu Jan 8 10:29:37 2026 +0100

Remove setlocale usage and localize email dates in templates

Removed locale.setlocale() from email utility functions and moved
date localization into the email templates using Django’s {% language %}
tag and date filter.

This avoids reliance on system locales (which are missing in Docker)
and eliminates unsafe global locale switching in threaded email
sending. Localization is now explicit, thread-safe, and handled
entirely by Django’s i18n system.

commit 503f94d
Author: Okke Harsta oharsta@zilverline.com
Date: Fri Dec 19 16:19:22 2025 +0100

Fix for MA7QDbnn
Added expiration date based on the badgeclass when a user claims a DA
See https://trello.com/c/MA7QDbnn/1143-vervallen-edubadge-werkt-niet

commit b00d51f
Author: Daniel d.ostkamp@posteo.de
Date: Tue Dec 2 15:23:06 2025 +0100

Updated CHANGELOG for 8.3.3 release

[berkes]

@Iso5786 this introduces trivy as github action. Is that nessecary? We already have https://github.com/edubadges/edubadges-server/security which is i) better configured to deal with e.g. branches and PRs and ii) reports the same issues and iii) has actionable todos with it like dependabot Prs that we can use to resolve them.

Since this trivy appears to fail, not just in this PR but seemingly in many, can we a) remove it or b) fix it? I am honestly unconfortable with CI pipelines that we expect to fail because that will inevitably hide other failures that do matter.

Or do I misunderstand how we use trivy here?

[Iso5786]

LGTM