diff --git a/.clabot b/.clabot
index f011f8e9e..b83e106f2 100644
--- a/.clabot
+++ b/.clabot
@@ -1,5 +1,5 @@
{
"contributors": "https://crm.rami.io/cla/check/?project=pretix&checkContributor=",
- "message": "Hey there! :) Thank you very much for offering a contribution to pretix! For legal reasons, we need you to sign a Contributor License Agreement in order to be able to merge the code. Sorry for the hassle :( Please download the agreement from https://pretix.eu/about/en/cla and send a signed copy to support@pretix.eu. Feel free to also contact us there or via comments here if you have any questions!",
+ "message": "Hey there! :) Thank you very much for offering a contribution to pretix! For legal reasons, we need you to sign a Contributor License Agreement in order to be able to merge the code. Sorry for the hassle :( Please download the agreement from https://pretix.eu/about/en/cla and send a signed copy to support@pretix.eu. Feel free to also contact us there or via comments here if you have any questions!\n\nFeel free to ignore me on documentation changes, translations, and trivial PRs like typo fixes (and similar single-line changes) – we can merge these without a CLA as well.",
"label": "cla-signed"
}
diff --git a/doc/development/api/plugins.rst b/doc/development/api/plugins.rst
index 181feadd7..fe2287eee 100644
--- a/doc/development/api/plugins.rst
+++ b/doc/development/api/plugins.rst
@@ -84,6 +84,8 @@ A working example would be:
restricted = False
description = _("This plugin allows you to receive payments via PayPal")
compatibility = "pretix>=2.7.0"
+ settings_links = []
+ navigation_links = []
default_app_config = 'pretix_paypal.PaypalApp'
@@ -185,6 +187,28 @@ your Django app label.
with checking that the calling user is logged in, has appropriate permissions,
etc. We plan on providing native support for this in a later version.
+To make your plugin views easily discoverable, you can specify links for "Go to"
+and "Settings" buttons next to your entry on the plugin page. These links should be
+added to the ``navigation_links`` and ``settings_links``, respectively, in the
+``PretixPluginMeta`` class.
+
+Each array entry consists of a tuple ``(label, urlname, kwargs)``. For the label,
+either a string or a tuple of strings can be specified. In the latter case, the provided
+strings will be merged with a separator indicating they are successive navigation steps
+the user would need to take to reach the page via the regular menu
+(e.g. "Payment > Bank transfer" as below).
+
+.. code-block:: python
+
+ settings_links = [
+ ((_("Payment"), _("Bank transfer")), "control:event.settings.payment.provider", {"provider": "banktransfer"}),
+ ]
+ navigation_links = [
+ ((_("Bank transfer"), _("Import bank data")), "plugins:banktransfer:import", {}),
+ ((_("Bank transfer"), _("Export refunds")), "plugins:banktransfer:refunds.list", {}),
+ ]
+
+
.. _Django app: https://docs.djangoproject.com/en/3.0/ref/applications/
.. _signal dispatcher: https://docs.djangoproject.com/en/3.0/topics/signals/
.. _namespace packages: https://legacy.python.org/dev/peps/pep-0420/
diff --git a/pyproject.toml b/pyproject.toml
index 188d9c11a..a99ea20ac 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -36,7 +36,7 @@ dependencies = [
"css-inline==0.14.*",
"defusedcsv>=1.1.0",
"Django[argon2]==4.2.*,>=4.2.15",
- "django-bootstrap3==24.3",
+ "django-bootstrap3==25.1",
"django-compressor==4.5.1",
"django-countries==7.6.*",
"django-filter==25.1",
@@ -61,7 +61,7 @@ dependencies = [
"importlib_metadata==8.*", # Polyfill, we can probably drop this once we require Python 3.10+
"isoweek",
"jsonschema",
- "kombu==5.4.*",
+ "kombu==5.5.*",
"libsass==0.23.*",
"lxml",
"markdown==3.7", # 3.3.5 requires importlib-metadata>=4.4, but django-bootstrap3 requires importlib-metadata<3.
@@ -73,15 +73,15 @@ dependencies = [
"paypalrestsdk==1.13.*",
"paypal-checkout-serversdk==1.0.*",
"PyJWT==2.10.*",
- "phonenumberslite==8.13.*",
+ "phonenumberslite==9.0.*",
"Pillow==11.1.*",
"pretix-plugin-build",
- "protobuf==5.29.*",
+ "protobuf==6.30.*",
"psycopg2-binary",
"pycountry",
"pycparser==2.22",
- "pycryptodome==3.21.*",
- "pypdf==5.1.*",
+ "pycryptodome==3.22.*",
+ "pypdf==5.4.*",
"python-bidi==0.6.*", # Support for Arabic in reportlab
"python-dateutil==2.9.*",
"pytz",
@@ -91,7 +91,7 @@ dependencies = [
"redis==5.2.*",
"reportlab==4.3.*",
"requests==2.31.*",
- "sentry-sdk==2.22.*",
+ "sentry-sdk==2.24.*",
"sepaxml==2.6.*",
"stripe==7.9.*",
"text-unidecode==1.*",
diff --git a/src/pretix/__init__.py b/src/pretix/__init__.py
index fae2d9ba2..69fc637da 100644
--- a/src/pretix/__init__.py
+++ b/src/pretix/__init__.py
@@ -19,4 +19,4 @@
# You should have received a copy of the GNU Affero General Public License along with this program. If not, see
# Host: {{ request.headers.Host }}
{% if xfh %}
- X-Forwarded-For: {{ xfh }}
+ X-Forwarded-Host: {{ xfh }}
{% if not settings.USE_X_FORWARDED_HOST %}({% trans "ignored" %}){% endif %}
{% endif %}
diff --git a/src/pretix/base/templates/pretixbase/email/order_details.html b/src/pretix/base/templates/pretixbase/email/order_details.html
index 2ec01146e..77f5f556c 100644
--- a/src/pretix/base/templates/pretixbase/email/order_details.html
+++ b/src/pretix/base/templates/pretixbase/email/order_details.html
@@ -15,10 +15,7 @@
{{ event.name }}
{% if event.has_subevents and ev.name|upper != event.name|upper %}{{ ev.name }}
{% endif %}
- {{ ev.get_date_range_display }}
- {% if event.settings.show_times %}
- {{ ev.date_from|date:"TIME_FORMAT" }}
- {% endif %}
+ {{ ev.get_date_range_display_with_times }}
{% blocktrans trimmed count count=cnt %} - Are you sure you want to permanently delete the check-ins of one ticket. + Are you sure you want to permanently delete the check-ins of one ticket? {% plural %} Are you sure you want to permanently delete the check-ins of {{ count }} tickets? {% endblocktrans %} diff --git a/src/pretix/control/templates/pretixcontrol/checkin/index.html b/src/pretix/control/templates/pretixcontrol/checkin/index.html index d22e2339e..652a8819b 100644 --- a/src/pretix/control/templates/pretixcontrol/checkin/index.html +++ b/src/pretix/control/templates/pretixcontrol/checkin/index.html @@ -148,7 +148,7 @@
{{ plugin.description|safe }}
+{{ plugin.description|safe }}
{% if plugin.restricted and plugin.module not in request.event.settings.allowed_restricted_plugins %}diff --git a/src/pretix/control/templates/pretixcontrol/event/payment.html b/src/pretix/control/templates/pretixcontrol/event/payment.html index 1583ff9d6..bf481901c 100644 --- a/src/pretix/control/templates/pretixcontrol/event/payment.html +++ b/src/pretix/control/templates/pretixcontrol/event/payment.html @@ -48,19 +48,19 @@