Repository navigation
Update production - #1338
Merged
Merged
Update production#1338
Conversation
Kurocon
commented
Aug 24, 2026
Kurocon
commented
Member
- Textual fixes
- Disable CB theme if board rights have been handed out
- Update dependencies
…nt transactions in transaction overview
Updates the requirements on [django-localflavor](https://github.com/django/django-localflavor) to permit the latest version. - [Changelog](https://github.com/django/django-localflavor/blob/master/docs/changelog.rst) - [Commits](django/django-localflavor@5.0...5.1) --- updated-dependencies: - dependency-name: django-localflavor dependency-version: '5.1' dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>
Updates the requirements on [icalendar](https://github.com/collective/icalendar) to permit the latest version. - [Release notes](https://github.com/collective/icalendar/releases) - [Changelog](https://github.com/collective/icalendar/blob/main/CHANGES.rst) - [Commits](collective/icalendar@v7.0.3...v7.3.0) --- updated-dependencies: - dependency-name: icalendar dependency-version: 7.3.0 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>
Updates the requirements on [django-oauth-toolkit](https://github.com/django-oauth/django-oauth-toolkit) to permit the latest version. - [Release notes](https://github.com/django-oauth/django-oauth-toolkit/releases) - [Changelog](https://github.com/django-oauth/django-oauth-toolkit/blob/master/CHANGELOG.md) - [Commits](django-oauth/django-oauth-toolkit@1.7.1...3.4.1) --- updated-dependencies: - dependency-name: django-oauth-toolkit dependency-version: 3.4.1 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>
Updates the requirements on [flower](https://github.com/mher/flower) to permit the latest version. - [Release notes](https://github.com/mher/flower/releases) - [Changelog](https://github.com/mher/flower/blob/v2.1.0/CHANGELOG.md) - [Commits](mher/flower@v2.0.1...v2.1.0) --- updated-dependencies: - dependency-name: flower dependency-version: 2.1.0 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>
…2.0.1-and-lt-2.2 build(deps): update flower requirement from <2.1,>=2.0.1 to >=2.0.1,<2.2
…lflavor-gte-5.0-and-lt-5.2 build(deps): update django-localflavor requirement from <5.1,>=5.0 to >=5.0,<5.2
…te-7.0.3-and-lt-7.4 build(deps): update icalendar requirement from <7.3,>=7.0.3 to >=7.0.3,<7.4
…h-toolkit-gte-1.7.1-and-lt-3.5 build(deps): update django-oauth-toolkit requirement from <3.4,>=1.7.1 to >=1.7.1,<3.5
Currently translated at 100.0% (3337 of 3337 strings) Co-authored-by: Kevin Alberts <albertskja@inter-actief.net> Translate-URL: https://weblate.ia.utwente.nl/projects/amelie/amelie/nl/ Translation: Amelie/Amelie
Translations update from Inter-/Actief/ Weblate
|
Triggered from #1338 by @Kurocon. Checking if we can fast forward Target branch ( commit edfd55b40de58d01da9536c6a28efb0e6906a4a5 (HEAD -> production, origin/production)
Merge: 66b13b1 e84c8eb
Author: Kevin Alberts <kevin.alberts@inter-actief.net>
Date: Thu Aug 20 12:18:37 2026 +0200
Merge pull request #1331 from Inter-Actief/ia-weblate
Translations update from Inter-/Actief/ WeblatePull request ( commit fa321806e7229311ad8339602774e57d476ae479 (pull_request/main)
Author: Conner Hof <hofcl@inter-actief.net>
Date: Mon Aug 24 16:47:54 2026 +0200
Disable the CB theme for people with board permissions.It is possible to fast forward |
Member
Author
|
/fast-forward |
|
Triggered from #1338 (comment) by @Kurocon. Trying to fast forward Target branch ( commit edfd55b40de58d01da9536c6a28efb0e6906a4a5 (HEAD -> production, origin/production)
Merge: 66b13b1 e84c8eb
Author: Kevin Alberts <kevin.alberts@inter-actief.net>
Date: Thu Aug 20 12:18:37 2026 +0200
Merge pull request #1331 from Inter-Actief/ia-weblate
Translations update from Inter-/Actief/ WeblatePull request ( commit fa321806e7229311ad8339602774e57d476ae479 (pull_request/main)
Author: Conner Hof <hofcl@inter-actief.net>
Date: Mon Aug 24 16:47:54 2026 +0200
Disable the CB theme for people with board permissions.Fast forwarding $ git push origin fa321806e7229311ad8339602774e57d476ae479:production
remote: Bypassed rule violations for refs/heads/production:
remote:
remote: - At least 1 approving review is required by reviewers with write access.
remote:
To https://github.com/Inter-Actief/amelie.git
edfd55b..fa32180 fa321806e7229311ad8339602774e57d476ae479 -> production |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.