Merge branch 'upstream'

Update django to the latest version
main: render package maintainers pgp keys correctly
2025-10-02 12:06:30 -05:00 · 2025-10-02 11:30:53 +02:00 · 2025-09-18 18:00:44 +02:00 · 2025-09-17 16:17:38 -05:00 · 2025-09-17 21:14:21 +02:00 · 2025-09-17 21:13:11 +02:00
4 changed files with 7 additions and 7 deletions
--- a/main/templatetags/pgp.py
+++ b/main/templatetags/pgp.py
@@ -59,7 +59,7 @@ def pgp_key_link(key_id, link_text=None):
    return format_html('<a href="{url}" title="PGP key search for {key}">{content}</a>',
                       url=url,
                       key=format_key(key_id),
-                       content=link_text)
+                       content=mark_safe(link_text))


@register.simple_tag
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 -e git+https://github.com/fredj/cssmin.git@master#egg=cssmin
-Django==5.1.10
+Django==5.1.13
 IPy==1.1
 Markdown==3.3.7
 bencode.py==4.0.0
--- a/sitestatic/archweb.css
+++ b/sitestatic/archweb.css
@@ -1207,12 +1207,12 @@ ul.signoff-list {

    /* style input as a normal anchor */
    input {
-      background: none!important;
+      background: none !important;
      border: none;
-      padding: 0!important;
-      /*optional*/
+      padding: 0 0.5em !important;
+      /* optional */
      font-family: arial, sans-serif;
-      font-size: 0.9em;
+      font-size: 100%;
      /*input has OS specific font-family*/
      color: #07b;
    }
--- a/todolists/templatetags/todolists.py
+++ b/todolists/templatetags/todolists.py
@@ -13,7 +13,7 @@ def todopkg_details_link(todopkg):
    pkg = todopkg.pkg
    if not pkg:
        return todopkg.pkgname
-    link = '<a href={url}s" title="View package details for {pkgname}">{pkgname}</a>'
+    link = '<a href="{url}" title="View package details for {pkgname}">{pkgname}</a>'
    url = pkg_absolute_url(todopkg.repo, todopkg.arch, pkg.pkgname)
    return format_html(link, url=url, pkgname=pkg.pkgname)
Author	SHA1	Message	Date
Cory Sanin	7354af5787	Merge branch 'upstream' All checks were successful Docker Image CI / build (push) Successful in 3m27s Details Github-Actions / build (push) Successful in -36s Details	2025-10-02 12:06:30 -05:00
Jelle van der Waa	b814ab4d72	Update django to the latest version All checks were successful Github-Actions / build (push) Successful in 2m44s Details	2025-10-02 11:30:53 +02:00
Jelle van der Waa	a0ec59ddc3	main: render package maintainers pgp keys correctly We need to allow html to be passed into format_html.	2025-09-18 18:00:44 +02:00
Cory Sanin	cea449ddcd	Merge branch 'upstream' All checks were successful Github-Actions / build (push) Successful in -34s Details Docker Image CI / build (push) Successful in 3m10s Details	2025-09-17 16:17:38 -05:00
Lukas Fleischer	70e796acc3	Fix logout link formatting Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>	2025-09-17 21:14:21 +02:00
Jelle van der Waa	242a126245	Update to Django 5.1.12	2025-09-17 21:13:11 +02:00
Jakub Klinkovský	03a0e748ec	Fix format string for package links in todo lists Fixes `0cf24055d5` Fixes https://github.com/archlinux/archweb/issues/582	2025-09-17 09:33:24 +02:00