Repository navigation
Update production - #1313
Update production#1313
Conversation
I also updated the enrollments visibility for committee. They can now see all names that are public in their overview, and all private names become "anonymous", unless they deanonymise the enrollment list. I also removed the "edit enrollment" and "deregister" columns from the deanonymized column for anyone that is not board.
…ble for normal members.
…plate for the declaration
…l file for the decla email; added cleaner for the form; on save of form an email is sent to the decla email; added admin model; added formview for the form. Did migration for adding the declaration model
…ed declaration email
…. Adding frontend and backend check for maximum number of files.
…ot get saved in the bookkeeping for each declaration.
…ze instead of individual file size
…ent method is something other than 'Bank Transfer'
…han Personal Bank is selected
… non-blank description
Transition from Educational Bouquet to Cake
Currently translated at 100.0% (3117 of 3117 strings) Co-authored-by: Lars Kruitwagen <kruitwagenly@inter-actief.net> Translate-URL: https://weblate.ia.utwente.nl/projects/amelie/amelie/nl/ Translation: Amelie/Amelie
Translations update from Inter-/Actief/ Weblate
…adding and editing articles on the price list
- removed the category column because categories are an entire row and including the column leaves empty cells - added € to the table header
Redirect back to page you were on when logging in
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
|
Triggered from #1313 by @Kurocon. Checking if we can fast forward Target branch ( commit 63fc7530e42859389d5e3cf6d94657cb9076d450 (HEAD -> production, origin/production)
Merge: 738a9fe 9b7ddc5
Author: Kevin Alberts <kevin.alberts@inter-actief.net>
Date: Tue Jul 14 09:46:19 2026 +0200
Merge pull request #1263 from Inter-Actief/1169-unpaid-memberships-overview
Unpaid memberships overviewPull request ( commit a327a67f8990c71fb4cddd12fc127d2b7c1ef0c2 (pull_request/main)
Merge: 48dc3a4 8f1a089
Author: Kevin Alberts <kevin.alberts@inter-actief.net>
Date: Mon Aug 3 10:17:19 2026 +0200
Merge pull request #1312 from Inter-Actief/1311-auth-redirect
Redirect back to page you were on when logging inIt is possible to fast forward |
…-gte-2.49.1-and-lt-2.57 build(deps): update google-auth requirement from <2.54,>=2.49.1 to >=2.49.1,<2.57
|
Triggered from #1313 by @Kurocon. Checking if we can fast forward Target branch ( commit 63fc7530e42859389d5e3cf6d94657cb9076d450 (HEAD -> production, origin/production)
Merge: 738a9fe 9b7ddc5
Author: Kevin Alberts <kevin.alberts@inter-actief.net>
Date: Tue Jul 14 09:46:19 2026 +0200
Merge pull request #1263 from Inter-Actief/1169-unpaid-memberships-overview
Unpaid memberships overviewPull request ( commit d0e944f62668471aa5977a14dc2849421628bd41 (pull_request/main)
Merge: a327a67 60a8c46
Author: Kevin Alberts <kevin.alberts@inter-actief.net>
Date: Sat Aug 8 11:35:31 2026 +0200
Merge pull request #1295 from Inter-Actief/dependabot/pip/google-auth-gte-2.49.1-and-lt-2.57
build(deps): update google-auth requirement from <2.54,>=2.49.1 to >=2.49.1,<2.57It is possible to fast forward |
…h-toolkit-gte-1.7.1-and-lt-3.4 build(deps): update django-oauth-toolkit requirement from <3.3,>=1.7.1 to >=1.7.1,<3.4
…12.1.1-and-lt-12.4 build(deps): update pillow requirement from <12.3,>=12.1.1 to >=12.1.1,<12.4
|
Triggered from #1313 by @Kurocon. Checking if we can fast forward Target branch ( commit 63fc7530e42859389d5e3cf6d94657cb9076d450 (HEAD -> production, origin/production)
Merge: 738a9fe 9b7ddc5
Author: Kevin Alberts <kevin.alberts@inter-actief.net>
Date: Tue Jul 14 09:46:19 2026 +0200
Merge pull request #1263 from Inter-Actief/1169-unpaid-memberships-overview
Unpaid memberships overviewPull request ( commit d3ad9a2dde8ff2bfc8924862130b88ef302bd9cf (pull_request/main)
Merge: d0e944f b89c8f5
Author: Kevin Alberts <kevin.alberts@inter-actief.net>
Date: Sat Aug 8 11:35:55 2026 +0200
Merge pull request #1296 from Inter-Actief/dependabot/pip/django-oauth-toolkit-gte-1.7.1-and-lt-3.4
build(deps): update django-oauth-toolkit requirement from <3.3,>=1.7.1 to >=1.7.1,<3.4It is possible to fast forward |
…er-gte-25.2-and-lt-27 build(deps): update django-filter requirement from <26,>=25.2 to >=25.2,<27
|
Triggered from #1313 by @Kurocon. Checking if we can fast forward Target branch ( commit 63fc7530e42859389d5e3cf6d94657cb9076d450 (HEAD -> production, origin/production)
Merge: 738a9fe 9b7ddc5
Author: Kevin Alberts <kevin.alberts@inter-actief.net>
Date: Tue Jul 14 09:46:19 2026 +0200
Merge pull request #1263 from Inter-Actief/1169-unpaid-memberships-overview
Unpaid memberships overviewPull request ( commit 1616f0cb6dbb8458860490eca0ea7ae90c53df4c (pull_request/main)
Merge: d3ad9a2 935b1ee
Author: Kevin Alberts <kevin.alberts@inter-actief.net>
Date: Sat Aug 8 11:36:13 2026 +0200
Merge pull request #1297 from Inter-Actief/dependabot/pip/pillow-gte-12.1.1-and-lt-12.4
build(deps): update pillow requirement from <12.3,>=12.1.1 to >=12.1.1,<12.4It is possible to fast forward |
|
Triggered from #1313 by @Kurocon. Checking if we can fast forward Target branch ( commit 63fc7530e42859389d5e3cf6d94657cb9076d450 (HEAD -> production, origin/production)
Merge: 738a9fe 9b7ddc5
Author: Kevin Alberts <kevin.alberts@inter-actief.net>
Date: Tue Jul 14 09:46:19 2026 +0200
Merge pull request #1263 from Inter-Actief/1169-unpaid-memberships-overview
Unpaid memberships overviewPull request ( commit 3b6183b42837d555a540e44ea767b9642c8230e4 (pull_request/main)
Merge: 1616f0c 97224bb
Author: Kevin Alberts <kevin.alberts@inter-actief.net>
Date: Sat Aug 8 11:36:48 2026 +0200
Merge pull request #1298 from Inter-Actief/dependabot/pip/django-filter-gte-25.2-and-lt-27
build(deps): update django-filter requirement from <26,>=25.2 to >=25.2,<27It is possible to fast forward |
Updating the PR template
|
Triggered from #1313 by @Kurocon. Checking if we can fast forward Target branch ( commit 63fc7530e42859389d5e3cf6d94657cb9076d450 (HEAD -> production, origin/production)
Merge: 738a9fe 9b7ddc5
Author: Kevin Alberts <kevin.alberts@inter-actief.net>
Date: Tue Jul 14 09:46:19 2026 +0200
Merge pull request #1263 from Inter-Actief/1169-unpaid-memberships-overview
Unpaid memberships overviewPull request ( commit bf84451190d4a3082611eb3dd6b3cf17296129cd (pull_request/main)
Merge: 3b6183b ed1eea8
Author: Kevin Alberts <kevin.alberts@inter-actief.net>
Date: Sat Aug 8 12:26:43 2026 +0200
Merge pull request #1293 from Inter-Actief/update-pr-template
Updating the PR templateIt is possible to fast forward |
…-selectable-direct-debit Making ended memberships selectable for direct debits
|
Triggered from #1313 by @Kurocon. Checking if we can fast forward Target branch ( commit 63fc7530e42859389d5e3cf6d94657cb9076d450 (HEAD -> production, origin/production)
Merge: 738a9fe 9b7ddc5
Author: Kevin Alberts <kevin.alberts@inter-actief.net>
Date: Tue Jul 14 09:46:19 2026 +0200
Merge pull request #1263 from Inter-Actief/1169-unpaid-memberships-overview
Unpaid memberships overviewPull request ( commit 3fbc17d2e8db5a31cea68b8c8b8aea9e52d64536 (pull_request/main)
Merge: bf84451 ca70e12
Author: Kevin Alberts <kevin.alberts@inter-actief.net>
Date: Sat Aug 8 12:27:43 2026 +0200
Merge pull request #1302 from Inter-Actief/1301-ended-membership-fees-selectable-direct-debit
Making ended memberships selectable for direct debitsIt is possible to fast forward |
…o they can be re-activated
1254 editable price list
|
Triggered from #1313 by @Kurocon. Checking if we can fast forward Target branch ( commit 63fc7530e42859389d5e3cf6d94657cb9076d450 (HEAD -> production, origin/production)
Merge: 738a9fe 9b7ddc5
Author: Kevin Alberts <kevin.alberts@inter-actief.net>
Date: Tue Jul 14 09:46:19 2026 +0200
Merge pull request #1263 from Inter-Actief/1169-unpaid-memberships-overview
Unpaid memberships overviewPull request ( commit 1ca4c61dd8f9f9e7180cd66ba9911367c89ab4aa (pull_request/main)
Merge: 3fbc17d 3ea9b3b
Author: Kevin Alberts <kevin.alberts@inter-actief.net>
Date: Sat Aug 8 13:04:55 2026 +0200
Merge pull request #1309 from Inter-Actief/1254-editable-price-list
1254 editable price listIt is possible to fast forward |
|
/fast-forward |
|
Triggered from #1313 (comment) by @Kurocon. Trying to fast forward Target branch ( commit 63fc7530e42859389d5e3cf6d94657cb9076d450 (HEAD -> production, origin/production)
Merge: 738a9fe 9b7ddc5
Author: Kevin Alberts <kevin.alberts@inter-actief.net>
Date: Tue Jul 14 09:46:19 2026 +0200
Merge pull request #1263 from Inter-Actief/1169-unpaid-memberships-overview
Unpaid memberships overviewPull request ( commit 1ca4c61dd8f9f9e7180cd66ba9911367c89ab4aa (pull_request/main)
Merge: 3fbc17d 3ea9b3b
Author: Kevin Alberts <kevin.alberts@inter-actief.net>
Date: Sat Aug 8 13:04:55 2026 +0200
Merge pull request #1309 from Inter-Actief/1254-editable-price-list
1254 editable price listFast forwarding $ git push origin 1ca4c61dd8f9f9e7180cd66ba9911367c89ab4aa: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
63fc753..1ca4c61 1ca4c61dd8f9f9e7180cd66ba9911367c89ab4aa -> production |
7 participants
New features: