CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

upstream/2025.4.0 #4

Merged
philipp merged 90 commits from upstream/2025.4.0 into master 2025-05-08 22:05:44 +00:00
Conversation 0 Commits 90 Files Changed 175 +46249 -41048
philipp commented 2025-05-08 21:55:14 +00:00
Collaborator
Copy Link

Update to 2025.4.0 from upstream by use of the following commands

// upstream einrichten
git remote add upstream https://git.ortlerstrasse.de/Ortlerstrasse/pretix_original.git

// sicherstellen dass master aktuell ist
git checkout master
git pull

// Tags from upstream
git fetch upstream --tags
git checkout -b upstream/2025.4.0 tags/v2025.4.0

// Merge mit master, wenn nötig
git merge master
git push --set-upstream origin upstream/2025.4.0

Update to 2025.4.0 from upstream by use of the following commands // upstream einrichten git remote add upstream https://git.ortlerstrasse.de/Ortlerstrasse/pretix_original.git // sicherstellen dass master aktuell ist git checkout master git pull // Tags from upstream git fetch upstream --tags git checkout -b upstream/2025.4.0 tags/v2025.4.0 // Merge mit master, wenn nötig git merge master git push --set-upstream origin upstream/2025.4.0
philipp self-assigned this 2025-05-08 21:55:14 +00:00
philipp added 90 commits 2025-05-08 21:55:14 +00:00
Bump version to 2025.4.0.dev0 592b98b83a
Date picker: Guess default time 23:59 for end dates (Z#23182900) (#4917) 42399c3488 
* Date picker: Guess default time 23:59 for end dates (Z#23182900)

* Update src/pretix/static/pretixcontrol/js/ui/main.js

Co-authored-by: luelista <weller@rami.io>

* Update src/pretix/static/pretixpresale/js/ui/main.js

Co-authored-by: luelista <weller@rami.io>

---------

Co-authored-by: luelista <weller@rami.io>
Translations: Update French bacb40fd7f 
Currently translated at 100.0% (5863 of 5863 strings)

Translation: pretix/pretix
Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/fr/

powered by weblate
Translations: Update French 736792fc01 
Currently translated at 100.0% (236 of 236 strings)

Translation: pretix/pretix (JavaScript parts)
Translate-URL: https://translate.pretix.eu/projects/pretix/pretix-js/fr/

powered by weblate
Translations: Update Spanish 6f3c2ed444 
Currently translated at 100.0% (5863 of 5863 strings)

Translation: pretix/pretix
Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/es/

powered by weblate
Translations: Update Spanish 8c9a94f87e 
Currently translated at 100.0% (236 of 236 strings)

Translation: pretix/pretix (JavaScript parts)
Translate-URL: https://translate.pretix.eu/projects/pretix/pretix-js/es/

powered by weblate
Add a label for empty salutation option (Z#23183319) (#4913) 6c7041c875
[A11y] Improve focus management for widget overlay 1c8bcca846
[A11y] Widget: add missing labels to dialog and iframe f70874b21c
[A11y] Improve HTML-output for date-ranges 1a1948e3fa
Discounts: Add applicability date ranges (Z#23151897) (#4927) 0b8a7349c7 
* Add event date fields, add preliminary range check

* Remove function, use filtered queryset for subevent id limit

* Improve and fix date range check

* Add formfields

* Add tests

* Improve tests

* Add new fields to API and documentation

* Add migration

* Change description according to suggestion

* Change discount apply signature, remove unnecessary query

* Rename new fields, simplify range check

* Rename fields in template

* Apply suggestions from code review

Co-authored-by: Raphael Michel <michel@rami.io>

---------

Co-authored-by: Raphael Michel <michel@rami.io>
order_overview: allow filtering by time (#4958) 4755200ab0
Sort organizers in typeahead by number of events (Z##23185900) (#4912) d928adf7a3
Fix bulk edit of revoked devices (Z#23187227) (#4960) d39a01af4d 
When selecting revoked devices and using bulk edit on them, the edit was performed 
either *on all active devices* or not at all. This commit fixes that behaviour so that the 
selected devices are edited.
Translations: Update Dutch fbb6246020 
Currently translated at 99.5% (5836 of 5863 strings)

Translation: pretix/pretix
Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/nl/

powered by weblate
Translations: Update Dutch a7c8bb0f02 
Currently translated at 99.8% (5853 of 5863 strings)

Translation: pretix/pretix
Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/nl/

powered by weblate
Translations: Update Dutch e5fc7144e4 
Currently translated at 77.5% (183 of 236 strings)

Translation: pretix/pretix (JavaScript parts)
Translate-URL: https://translate.pretix.eu/projects/pretix/pretix-js/nl/

powered by weblate
PDF-Editor: improve UI for page-size and background PDF (#4959) 9447e5802d 
* PDF-Editor: improve UI for page-size and background PDF

* Update src/pretix/control/templates/pretixcontrol/pdf/index.html

Co-authored-by: leiascyr <156191181+leiascyr@users.noreply.github.com>

* Update src/pretix/control/templates/pretixcontrol/pdf/index.html

Co-authored-by: leiascyr <156191181+leiascyr@users.noreply.github.com>

* Update label text

Co-authored-by: Raphael Michel <michel@rami.io>

---------

Co-authored-by: Raphael Michel <michel@rami.io>
Co-authored-by: leiascyr <156191181+leiascyr@users.noreply.github.com>
Show link to stripe payment receipt in backend (Z#23187178) (#4961) f455152447 
* Show link to stripe payment receipt in backend (Z#23187178)

* Revert "Show link to stripe payment receipt in backend (Z#23187178)"

This reverts commit 4a261ac1aca03908e01c6c6cb3ab17f7f3cab6a4.

* Show link to stripe payment receipt in backend payment details (Z#23187178)
Order search: Keep searching in canceled positions (Z#23187097) (#4963) 5138e86cf1
Update djangorestframework requirement from ==3.15.* to ==3.16.* (#4965) b5544b120d 
Updates the requirements on [djangorestframework](https://github.com/encode/django-rest-framework) to permit the latest version.
- [Release notes](https://github.com/encode/django-rest-framework/releases)
- [Commits](https://github.com/encode/django-rest-framework/compare/3.15.0...3.16.0)

---
updated-dependencies:
- dependency-name: djangorestframework
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Add Federal district (DF) to state dropdown for Brazil (BR) (#4966) a3d721c08b
Check-in API: Return order locale, and allow to use order locale for … (#4969) 804b048dbb 
* Check-in API: Return order locale, and allow to use order locale for reasons

* Fix failing tests
OrderChangeManager: Fix for change_tax_rule and recalculate_taxes in same transaction (Z#23187299) (#4964) d8ec489b13 
* Add test case

* Do not overwrite tax_rule in PriceOperation
Translations: Update Japanese d88e47d76b 
Currently translated at 100.0% (5863 of 5863 strings)

Translation: pretix/pretix
Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/ja/

powered by weblate
Translations: Update Japanese 5768fbca54 
Currently translated at 100.0% (236 of 236 strings)

Translation: pretix/pretix (JavaScript parts)
Translate-URL: https://translate.pretix.eu/projects/pretix/pretix-js/ja/

powered by weblate
Translations: Update Portuguese (Brazil) f3bd918846 
Currently translated at 92.1% (5401 of 5863 strings)

Translation: pretix/pretix
Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/pt_BR/

powered by weblate
Translations: Update Korean 17df83a9fb 
Currently translated at 13.7% (805 of 5863 strings)

Translation: pretix/pretix
Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/ko/

powered by weblate
Translations: Update French 9a61de9a22 
Currently translated at 100.0% (5863 of 5863 strings)

Translation: pretix/pretix
Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/fr/

powered by weblate
Bump @rollup/plugin-node-resolve in /src/pretix/static/npm_dir (#4974) fa468366c7 
Bumps [@rollup/plugin-node-resolve](https://github.com/rollup/plugins/tree/HEAD/packages/node-resolve) from 16.0.0 to 16.0.1.
- [Changelog](https://github.com/rollup/plugins/blob/master/packages/node-resolve/CHANGELOG.md)
- [Commits](https://github.com/rollup/plugins/commits/node-resolve-v16.0.1/packages/node-resolve)

---
updated-dependencies:
- dependency-name: "@rollup/plugin-node-resolve"
  dependency-version: 16.0.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bump @babel/core from 7.26.9 to 7.26.10 in /src/pretix/static/npm_dir (#4975) 957462739a 
Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.26.9 to 7.26.10.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.26.10/packages/babel-core)

---
updated-dependencies:
- dependency-name: "@babel/core"
  dependency-version: 7.26.10
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Update flake8 requirement from ==7.1.* to ==7.2.* (#4972) 1bbefddc11 
* Update flake8 requirement from ==7.1.* to ==7.2.*

Updates the requirements on [flake8](https://github.com/pycqa/flake8) to permit the latest version.
- [Commits](https://github.com/pycqa/flake8/compare/7.1.0...7.2.0)

---
updated-dependencies:
- dependency-name: flake8
  dependency-type: direct:production
...

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

* Resolve warning

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Raphael Michel <michel@rami.io>
Allow changing ticket secret via API (Z#23188201) (#4989) 277a5bffa8
Improve SOLD OUT / FULLY BOOKED message logic (Z#23187802) (#4988) 899994ef1e 
Show SOLD OUT instead of FULLY BOOKED if ticket is not free of charge even if a voucher gives 100% off
Backend event list: Sort event series by their actual dates, like in the frontend (Z#23187301) (#4993) b4d8e9ccc4
Fix bug in Question.clean_answer (#4987) 8c3ac46ddf
Fix checkin-list-filter test randomly matching secret 12f4473fbd
Discounts: Fix incorrect test for subevent date limitation (#4991) 9844ffca98 
If two discounts match the same products, the first one wins. Therefore,
the one we want to win in the test must always come last, otherwise the
test is not actually testing anything. In this case, this is highlighted
by the fact that the test does not pass in diffrent orders of discounts
unless we subtract a second from the date, because we compare with <=,
not <.
Fix image size in help-text for logo-images ea955c779e
Fix datepicker locale when using min/max 2bb324f885
Bump qrcode from 8.0 to 8.1 (#5003) 9608c7aa15 
Bumps [qrcode](https://github.com/lincolnloop/python-qrcode) from 8.0 to 8.1.
- [Changelog](https://github.com/lincolnloop/python-qrcode/blob/main/CHANGES.rst)
- [Commits](https://github.com/lincolnloop/python-qrcode/commits)

---
updated-dependencies:
- dependency-name: qrcode
  dependency-version: '8.1'
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Translations: Update Arabic ac2b1186d1 
Currently translated at 63.2% (3711 of 5863 strings)

Translation: pretix/pretix
Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/ar/

powered by weblate
Translations: Update Arabic 1e3b924998 
Currently translated at 63.3% (3712 of 5863 strings)

Translation: pretix/pretix
Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/ar/

powered by weblate
Translations: Update Korean 86133ee52f 
Currently translated at 15.0% (883 of 5863 strings)

Translation: pretix/pretix
Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/ko/

powered by weblate
Translations: Update Korean 54e02da2b3 
Currently translated at 100.0% (236 of 236 strings)

Translation: pretix/pretix (JavaScript parts)
Translate-URL: https://translate.pretix.eu/projects/pretix/pretix-js/ko/

powered by weblate
Update django-otp requirement from ==1.5.* to ==1.6.* (#4996) 810bdff5d9 
Updates the requirements on [django-otp](https://github.com/django-otp/django-otp) to permit the latest version.
- [Changelog](https://github.com/django-otp/django-otp/blob/master/CHANGES.rst)
- [Commits](https://github.com/django-otp/django-otp/compare/v1.5.0...v1.6.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Update pillow requirement from ==11.1.* to ==11.2.* (#4976) 3b0cd35c7a 
Updates the requirements on [pillow](https://github.com/python-pillow/Pillow) to permit the latest version.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst)
- [Commits](https://github.com/python-pillow/Pillow/compare/11.1.0...11.2.0)

---
updated-dependencies:
- dependency-name: pillow
  dependency-version: 11.2.0
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Questions: validate that min < max (#4992) 66dfa99e58 
* Questions: validate that min < max

* Update src/pretix/base/models/items.py

Co-authored-by: Richard Schreiber <schreiber@rami.io>

---------

Co-authored-by: Richard Schreiber <schreiber@rami.io>
Update sentry-sdk requirement from ==2.24.* to ==2.25.* (#4973) 08eabfa61c 
Updates the requirements on [sentry-sdk](https://github.com/getsentry/sentry-python) to permit the latest version.
- [Release notes](https://github.com/getsentry/sentry-python/releases)
- [Changelog](https://github.com/getsentry/sentry-python/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-python/compare/2.24.0...2.25.0)

---
updated-dependencies:
- dependency-name: sentry-sdk
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Fix datepicker date display when using min/max (Z#23185544) 929a2eb6e3
Translations: Update Hungarian fea519962c 
Currently translated at 10.9% (641 of 5863 strings)

Translation: pretix/pretix
Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/hu/

powered by weblate
Translations: Update Korean 15251ff208 
Currently translated at 18.4% (1080 of 5863 strings)

Translation: pretix/pretix
Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/ko/

powered by weblate
Translations: Update Korean 6d28a7f384 
Currently translated at 100.0% (236 of 236 strings)

Translation: pretix/pretix (JavaScript parts)
Translate-URL: https://translate.pretix.eu/projects/pretix/pretix-js/ko/

powered by weblate
Translations: Update Korean c6862454f5 
Currently translated at 18.5% (1087 of 5863 strings)

Translation: pretix/pretix
Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/ko/

powered by weblate
Bump markdown from 3.7 to 3.8 (#5009) 6cc7a2a0de 
Bumps [markdown](https://github.com/Python-Markdown/markdown) from 3.7 to 3.8.
- [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/compare/3.7...3.8)

---
updated-dependencies:
- dependency-name: markdown
  dependency-version: '3.8'
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Update celery requirement from ==5.4.* to ==5.5.* (#5010) 6b58c1484c 
Updates the requirements on [celery](https://github.com/celery/celery) to permit the latest version.
- [Release notes](https://github.com/celery/celery/releases)
- [Changelog](https://github.com/celery/celery/blob/main/Changelog.rst)
- [Commits](https://github.com/celery/celery/compare/v5.4.0rc1...v5.5.1)

---
updated-dependencies:
- dependency-name: celery
  dependency-version: 5.5.1
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Fix wrong flag for language code ca 4bf4cd748c
Add missing flag config for nb-no d61aed105f
Translations: Fix inconsistent wording d1bd719f66
Item categories: Show IDs (required for widget usage) c1656158f2
Docs/Certificates: Fix download-path in API-call sample (Z#23189733) 94671f6f70
Fix #4982 -- API: Do not parse decimal input to float (#5012) 025ee6710c
A11y: do not use px-based fontsizes 515f79b206
Stripe: Do not allow redirect in iframe for PayPal e1d2721747
Translations: Update Portuguese (Brazil) 4ceb617104 
Currently translated at 92.4% (5421 of 5863 strings)

Translation: pretix/pretix
Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/pt_BR/

powered by weblate
Translations: Update German 2ba2f9ff4b 
Currently translated at 100.0% (5863 of 5863 strings)

Translation: pretix/pretix
Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/de/

powered by weblate
Translations: Update German (informal) (de_Informal) f051ddca2d 
Currently translated at 100.0% (5863 of 5863 strings)

Translation: pretix/pretix
Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/de_Informal/

powered by weblate
Translations: Update Catalan 2b245f727e 
Currently translated at 32.5% (1909 of 5863 strings)

Translation: pretix/pretix
Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/ca/

powered by weblate
[A11y] fix border contrast for inputs 48c2d57cd4
[A11y] allow users to scale website 9d01072880 
* on smaller screens, make fontsize bigger for inputs to not have iPhones zoom on focus
Product list: Fix DOM position of label causing wrong border d50d6a1dfd
[A11y] Fix color contrast on headings-small-color 578518e8ab
[A11y] Fix tab order on customer step (remove autofocus on email-field) a252c69988
Fix rem-based input height ec627d6a3c
Fix missing checkbox-button disabled-state 698f687c54
Add CSS for right-to-left language input fields (#5021) 8796b4359c
Fix double-thick line between inputs in input-group 0eb11b154b
[A11y] Add sr-only "Log out" to logout-link 21c273854c
Fix checkbox-labels always containing text "required" although not being required ca12cbb69e
Translations: Update Polish 3e3cabe2bb 
Currently translated at 98.4% (5774 of 5863 strings)

Translation: pretix/pretix
Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/pl/

powered by weblate
Translations: Update Polish 22e99cf246 
Currently translated at 99.9% (5862 of 5863 strings)

Translation: pretix/pretix
Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/pl/

powered by weblate
Translations: Update Polish 667443ab56 
Currently translated at 100.0% (236 of 236 strings)

Translation: pretix/pretix (JavaScript parts)
Translate-URL: https://translate.pretix.eu/projects/pretix/pretix-js/pl/

powered by weblate
Order changes: Correctly respect tax rules when adding or changing items (Z#23190086) 384d0c4824
Update po files 117a66a837 
[CI skip]

Signed-off-by: Raphael Michel <michel@rami.io>
Translations: Update German cb3514a14f 
Currently translated at 100.0% (5869 of 5869 strings)

Translation: pretix/pretix
Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/de/

powered by weblate
Translations: Update German (informal) (de_Informal) ef1220d240 
Currently translated at 100.0% (5869 of 5869 strings)

Translation: pretix/pretix
Translate-URL: https://translate.pretix.eu/projects/pretix/pretix/de_Informal/

powered by weblate
Translations: Update German b21ea1ba9a 
Currently translated at 100.0% (244 of 244 strings)

Translation: pretix/pretix (JavaScript parts)
Translate-URL: https://translate.pretix.eu/projects/pretix/pretix-js/de/

powered by weblate
Translations: Update German (informal) (de_Informal) bbde731dca 
Currently translated at 100.0% (244 of 244 strings)

Translation: pretix/pretix (JavaScript parts)
Translate-URL: https://translate.pretix.eu/projects/pretix/pretix-js/de_Informal/

powered by weblate
Bump version to 2025.4.0 01228dd865
Merge branch 'master' into upstream/2025.4.0
All checks were successful
Build Deploy email notification tool / Apply-Kubernetes-Resources (push) Successful in 1m50s
Details
3fda118234
philipp requested review from simon 2025-05-08 21:55:20 +00:00
philipp merged commit e03ec73490 into master 2025-05-08 22:05:44 +00:00
Sign in to join this conversation.
Reviewers
No Reviewers
simon
Labels
No items
No Label
Milestone
No items
No Milestone
Assignees
Clear assignees
philipp simon
No Assignees philipp
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: CGM_Public/pretix_cgo#4
No description provided.
Delete Branch "upstream/2025.4.0"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?