// 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
* 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>
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.
* 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)
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 <.
* 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>
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.
simon
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