Merge pull request #332 from hongquan/feature/merge-upstream-jan-2025-2nd-attempt

Merge from upstream updates

Author: mariobehling

.github/workflows/tests.yml

@@ -12,6 +12,11 @@ on:
       - 'doc/**'
       - 'src/pretalx/locale/**'
 
+permissions:
+  contents: write
+  checks: write
+  pull-requests: write
+
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true

.gitignore

@@ -45,6 +45,7 @@ nosetests.xml
 coverage.xml
 *.cover
 .hypothesis/
+.mypy_cache
 
 # Translations
 *.mo

doc/administrator/installation.rst

@@ -84,6 +84,7 @@ flavours – on Ubuntu-like systems, you will need packages like:
 - ``build-essential``
 - ``libssl-dev``
 - ``python3-dev``
+- ``python3-venv``
 - ``gettext``
 
 
@@ -117,7 +118,7 @@ like this – you’ll only have to run this command once (that is, only once pe
 Python version – when you upgrade from Python 3.13 to 3.14, you’ll need to
 remove the old ``venv`` directory and create it again the same way)::
 
-    $ python -m venv /var/pretalx/venv
+    $ python3 -m venv /var/pretalx/venv
 
 Now, activate the virtual environment – you’ll have to run this command once
 per session whenever you’re interacting with ``python``, ``pip`` or
@@ -127,14 +128,14 @@ per session whenever you’re interacting with ``python``, ``pip`` or
 
 Now, upgrade your pip and then install the required Python packages::
 
-    (venv)$ pip install --user -U pip setuptools wheel gunicorn
+    (venv)$ pip install -U pip setuptools wheel gunicorn
 
 .. note:: You may need to replace all following mentions of ``pip`` with ``pip3``.
 
 +-----------------+------------------------------------------------------------------------+
 | Database        | Command                                                                |
 +=================+========================================================================+
-| SQLite          | ``pip install --user --upgrade-strategy eager -U pretalx``             |
+| SQLite          | ``pip install --upgrade-strategy eager -U pretalx``                    |
 +-----------------+------------------------------------------------------------------------+
 | PostgreSQL      | ``pip install --upgrade-strategy eager -U "pretalx[postgres]"``        |
 +-----------------+------------------------------------------------------------------------+
@@ -174,7 +175,7 @@ adjust the content to fit your system::
     User=pretalx
     Group=pretalx
     WorkingDirectory=/var/pretalx
-    ExecStart=/var/pretalx/.local/bin/gunicorn pretalx.wsgi \
+    ExecStart=/var/pretalx/venv/bin/gunicorn pretalx.wsgi \
                           --name pretalx --workers 4 \
                           --max-requests 1200  --max-requests-jitter 50 \
                           --log-level=info --bind=127.0.0.1:8345
@@ -198,8 +199,8 @@ To run Celery workers, you’ll need a second service
     [Service]
     User=pretalx
     Group=pretalx
-    ExecStart=/var/pretalx/venv/bin/celery -A pretalx.celery_app worker -l info
     WorkingDirectory=/var/pretalx
+    ExecStart=/var/pretalx/venv/bin/celery -A pretalx.celery_app worker -l info
     Restart=on-failure
 
     [Install]

doc/api/fundamentals.rst

@@ -135,4 +135,4 @@ If you see the ``o`` parameter on a resource, you can use it to sort the result
 set by one of the allowed fields. Prepend a ``-`` to the field name to reverse
 the sort order.
 
-.. _CSRF policies: https://docs.djangoproject.com/en/stable/ref/csrf/#ajax
+.. _CSRF policies: https://docs.djangoproject.com/en/stable/howto/csrf/#using-csrf-protection-with-ajax

doc/changelog.rst

@@ -3,6 +3,7 @@
 Release Notes
 =============
 
+- :feature:`schedule` When you embed the pretalx widget on an external page, clicking on session links will open the sessions in a new tab, so attendees won't have to try to navigate back to your home page.
 - :feature:`schedule` Organisers can now configure additional links to show in the top menu next to "Schedule", "Sessions", "Speakers", handy for links back to the conference website, streams, etc.
 - :feature:`orga` Organisers can now configure footer links that will be shown on all schedule pages.
 - :feature:`cfp` pretalx will now send an email after a user changes their password, notifying them of the change.
@@ -697,7 +698,7 @@ Release Notes
 - :bug:`-` There was no possibility to reset a user’s API token.
 - :bug:`-` If an organiser changed a speaker’s email address, they could assign an address already in use in the pretalx instance, resulting in buggy behaviour all around.
 - :release:`0.5.0 <2018-03-07>`
-- :feature:`-` pretalx now features a Plugin API, allowing to install custom plugins. Plugins can add their own exporters, and hook into plugin hooks. You can enable or disable plugins per event.
+- :feature:`-` pretalx now features a Plugin API, allowing to install custom plugins. Plugins can add their own exporters, and hook into plugin hooks. You can enable or disable plugins per event. You can find the plugin developer documentation :ref:`here<plugin-index>`.
 - :feature:`340` Organisers can now decide if reviewers should have to submit a score or a text with their review.
 - :feature:`93` Organisers can provide room-based information for speakers, and send it automatically in the emails about talk scheduling.
 - :feature:`318` The list of submissions is now better searchable.

doc/conf.py

@@ -109,9 +109,6 @@
 # Output file base name for HTML help builder.
 htmlhelp_basename = 'pretalxdoc'
 
-# Example configuration for intersphinx: refer to the Python standard library.
-intersphinx_mapping = {'https://docs.python.org/': ('https://docs.python.org/3', None)}
-
 linkcheck_ignore = [
     'https://pretalx.yourdomain.com',
     'http://localhost',

doc/user/markdown.rst

@@ -67,6 +67,11 @@ on the right:
 | .. code-block:: md                       | .. raw:: html                        |
 |                                          |                                      |
 |     *****                                |     <hr>                             |
+|     -----                                |     <hr>                             |
++------------------------------------------+--------------------------------------+
+| .. code-block:: md                       | .. raw:: html                        |
+|                                          |                                      |
+|     ~~strikethrough~~                    |     <del>strikethough</del>          |
 +------------------------------------------+--------------------------------------+
 
 

pyproject.toml

@@ -60,7 +60,7 @@ dependencies = [
   "vobject~=0.9.0",
   "whitenoise~=6.8.0",
   "zxcvbn~=4.4.0",
-  "pretalx_pages @ git+https://github.com/fossasia/eventyay-talk-pages.git@main",
+  "pretalx_pages @ git+https://github.com/hongquan/eventyay-talk-pages.git@2956f13",
   "pretalx_venueless @ git+https://github.com/fossasia/eventyay-talk-video.git@main",
   "pretalx-downstream @ git+https://github.com/fossasia/eventyay-talk-downstream.git@main",
   "django-allauth~=0.63.3",

src/pretalx/agenda/templates/agenda/base.html

@@ -21,16 +21,17 @@
         {{ request.event.urls.base }}
     {% endif %}
 {% endblock nav_link %}
+
 {% block header_tabs %}
-    <a href="{{ request.event.urls.schedule }}" class='header-tab {% if "/schedule/" in request.path_info %}active{% endif %}'>
+    <a href="{{ request.event.urls.schedule }}" class="header-tab {% if "/schedule/" in request.path_info %}active{% endif %}">
         <i class="fa fa-calendar"></i> {{ phrases.schedule.schedule }}
     </a>
     {% if request.event.display_settings.schedule_display != "list" %}
-        <a href="{{ request.event.urls.talks }}" class='header-tab {% if "/talk/" in request.path_info %} active{% endif %}'>
+        <a href="{{ request.event.urls.talks }}" class="header-tab {% if "/talk/" in request.path_info %} active{% endif %}">
             <i class="fa fa-comments-o"></i> {{ phrases.schedule.sessions }}
         </a>
     {% endif %}
-    <a href="{{ request.event.urls.speakers }}" class='header-tab {% if "/speaker/" in request.path_info %} active{% endif %}'>
+    <a href="{{ request.event.urls.speakers }}" class="header-tab {% if "/speaker/" in request.path_info %} active{% endif %}">
         <i class="fa fa-group"></i> {{ phrases.schedule.speakers }}
     </a>
     {% for link in header_links %}
@@ -50,7 +51,6 @@
 {% endblock header_tabs %}
 
 {% block content %}
-    {% include "agenda/header_row.html" %}
     {% if not request.event|get_feature_flag:"show_schedule" and not request.user.is_anonymous and not hide_visibility_warning %}
         <div id="event-nonpublic" class="d-print-none">
             <i class="fa fa-user-secret"></i>