Skip to content

Merge develop back into ewi#307

Closed
berkes wants to merge 200 commits intofeature/ewifrom
develop
Closed

Merge develop back into ewi#307
berkes wants to merge 200 commits intofeature/ewifrom
develop

Conversation

@berkes
Copy link
Copy Markdown
Contributor

@berkes berkes commented Mar 18, 2026

No description provided.

Iso5786 and others added 30 commits December 2, 2025 15:23
Added expiration date based on the badgeclass when a user claims a DA
See https://trello.com/c/MA7QDbnn/1143-vervallen-edubadge-werkt-niet
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.
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.
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.
Authentication login/logout signals produced noisy stdout output during
tests. These are now disabled via a test-only settings override
Apparently for institution staff the may_update permission
is required to view issuers.
Functionality itself was removed in 72d6783
Archived badges should show now in the resolve_issuers. Change done in
4983456 by Okke, test was not updated
This doesn't work because the @context is not available
Badge names do not have to be unique anymore since dd765f3
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](urllib3/urllib3@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>
…bile-badgeinstance-api-endpoint

Add linkedin_url field to badge instance detail serializer
Iso5786 and others added 28 commits March 10, 2026 11:34
…rd-in-reminder-management-command-in-try-except-to-avoid-crash

Wrap saving of direct award in try except to avoid crash
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](aquasecurity/trivy-action@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>
…github/workflows/aquasecurity/trivy-action-0.34.0

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

Bump cryptography from 44.0.1 to 46.0.5
…dge-instance-endpoint-in-mobile-api

Add request to context of badge instance serializer
…or-issuer-permissions

Refactor management query for issuer members
…date

Additionally made it more readable with helper functions
…s-to-mobile-api

Feature/add missing data fields to mobile api
…from-mobile-api-badge-instances

Add filter to badge instances endpoint to remove revoked badges
…-linkedin-url

Use UI_URL from settings for the cert url in the linkedin url
@berkes
Copy link
Copy Markdown
Contributor Author

berkes commented Mar 20, 2026

Replaced by #312 because the conflicts had to be resolved manually

@berkes berkes closed this Mar 20, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants