Merge branch 'upstream'

signoffs: add "Only Mine" filter
Implements https://github.com/archlinux/archweb/issues/550
2025-06-23 10:14:50 -05:00 · 2025-06-21 12:11:44 +02:00 · 2025-06-10 14:15:11 +02:00 · 2025-06-01 09:42:51 +02:00 · 2025-05-26 09:26:40 +02:00 · 2025-05-26 09:26:40 +02:00
12 changed files with 49 additions and 40 deletions
--- a/devel/migrations/0011_userprofile_social.py
+++ b/devel/migrations/0011_userprofile_social.py
@@ -0,0 +1,16 @@
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('devel', '0010_merge_20230312_1527'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='userprofile',
+            name='social',
+            field=models.CharField(blank=True, max_length=200, null=True),
+        ),
+    ]
--- a/devel/models.py
+++ b/devel/models.py
@@ -40,6 +40,9 @@ class UserProfile(models.Model):
    website = models.URLField(max_length=200, null=True, blank=True)
    website_rss = models.URLField(max_length=200, null=True, blank=True,
                                  help_text='RSS Feed of your website for planet.archlinux.org')
+    social = models.URLField(max_length=200, null=True, blank=True,
+                             verbose_name="Social account URL",
+                             help_text="Mastodon or Fediverse account URL")
    yob = models.IntegerField("Year of birth", null=True, blank=True,
                              validators=[MinValueValidator(1950), MaxValueValidator(2500)])
    country = CountryField(blank=True)
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,19 +1,19 @@
 -e git+https://github.com/fredj/cssmin.git@master#egg=cssmin
-Django==5.0.13
+Django==5.1.9
 IPy==1.1
 Markdown==3.3.7
 bencode.py==4.0.0
 django-countries==7.6.1
-django-extensions==3.2.3
+django-extensions==4.1
 jsmin==3.0.1
 pgpdump==1.5
 parse==1.20.2
 sqlparse==0.5.0
-django-csp==3.8
+django-csp==4.0
 ptpython==2.0.4
 feedparser==6.0.11
 bleach==6.0.0
-requests==2.32.3
+requests==2.32.4
 xtarfile==0.2.1
 zstandard==0.23.0
 whitenoise==6.8.2
--- a/sitestatic/archweb.js
+++ b/sitestatic/archweb.js
@@ -324,6 +324,10 @@ function filter_signoffs() {
    /* start with all rows, and then remove ones we shouldn't show */
    var rows = $('#tbody_signoffs').children(),
        all_rows = rows;
+    /* apply the filters, cheaper ones first */
+    if ($('#id_mine_only').is(':checked')) {
+        rows = rows.filter('.mine');
+    }
    /* apply arch and repo filters */
    $('#signoffs_filter .arch_filter').add(
            '#signoffs_filter .repo_filter').each(function() {
@@ -352,6 +356,7 @@ function filter_signoffs() {
 function filter_signoffs_reset() {
    $('#signoffs_filter .arch_filter').prop('checked', true);
    $('#signoffs_filter .repo_filter').prop('checked', true);
+    $('#id_mine_only').prop('checked', false);
    $('#id_pending').prop('checked', false);
    filter_signoffs();
 }
--- a/sitestatic/pia_logo.png
+++ b/sitestatic/pia_logo.png
--- a/sitestatic/uptimerobot_logo.png
+++ b/sitestatic/uptimerobot_logo.png
--- a/templates/packages/differences.html
+++ b/templates/packages/differences.html
@@ -16,7 +16,7 @@
                <th>Multilib Version</th>
                <th>x86_64 Version</th>
                <th>x86_64 Name</th>
-                <th>x864_ Repo</th>
+                <th>x86_64 Repo</th>
                <th>Multilib Last Updated</th>
                <th>x86_64 Last Updated</th>
            </tr>
--- a/templates/packages/signoffs.html
+++ b/templates/packages/signoffs.html
@@ -26,6 +26,10 @@
            <div><label for="id_repo_{{ repo_name|lower }}" title="Target Repository {{ repo_name }}">[{{ repo_name|lower }}]</label>
                <input type="checkbox" name="repo_{{ repo_name|lower }}" id="id_repo_{{ repo_name|lower }}" class="repo_filter" value="{{ repo_name|lower }}" checked="checked"/></div>
            {% endfor %}
+            {% if user.is_authenticated %}
+            <div><label for="id_mine_only" title="Show only packages packaged by me">Only Mine</label>
+                <input type="checkbox" name="mine_only" id="id_mine_only" value="mine_only"/></div>
+            {% endif %}
            <div><label for="id_pending" title="Packages with not enough signoffs">Only Pending Approval</label>
                <input type="checkbox" name="pending" id="id_pending" value="pending"/></div>
            <div><label>&nbsp;</label><input title="Reset search criteria" type="button" id="criteria_reset" value="Reset"/></div>
@@ -50,7 +54,8 @@
            </tr>
        </thead>
        <tbody id="tbody_signoffs">
-            {% for group in signoff_groups %}<tr class="{{ group.arch.name }} {{ group.target_repo|lower }}">
+            {% for group in signoff_groups %}
+            <tr class="{% if user == group.packager %} mine{% endif %} {{ group.arch.name }} {{ group.target_repo|lower }}">
                <td>{% pkg_details_link group.package %} {{ group.version }}</td>
                <td>{{ group.arch.name }}</td>
                <td>{{ group.target_repo }}</td>
--- a/templates/public/developer_list.html
+++ b/templates/public/developer_list.html
@@ -49,6 +49,11 @@
                    <td>{% if prof.website %}<a itemprop="url" href="{{ prof.website }}"
                            title="Visit the website for {{ dev.get_full_name }}">
                            {{ prof.website }}</a>{% endif %}</td>
+                </tr><tr>
+                    <th>Social:</th>
+                    <td>{% if prof.social %}<a itemprop="url" href="{{ prof.social }}"
+                            title="Visit social account for {{ dev.get_full_name }}" rel="me">
+                            {{ prof.social }}</a>{% endif %}</td>
                </tr><tr>
                    <th>Occupation:</th>
                    <td>{{ prof.occupation }}</td>
--- a/templates/public/donate.html
+++ b/templates/public/donate.html
@@ -53,17 +53,6 @@
    <img src="{% static "nitrokey_logo.png" %}"
    class="sponsor-btn-nitrokey" title="" alt="Nitrokey logo"/></a>

-    <p>We would also like to thank <a href="https://www.privateinternetaccess.com/"
-    title="Private Internet Access">Private Internet Access</a> for sponsoring
-    dedicated servers across the globe. Private Internet Access is the leading
-    VPN Service provider specializing in secure, encrypted VPN tunnels which
-    create several layers of privacy and security providing users safety on the
-    internet.</p>
-
-    <a href="https://www.privateinternetaccess.com/" title="Private Internet Access">
-    <img src="{% static "pia_logo.png" %}"
-    class="sponsor-btn-pia" title="" alt="Private Internet Access logo"/></a>
-
    <p>We would also like to thank <a href="https://www.shells.com/"
    title="Shells">Shells.com</a> for their monetary donation.
    Shells provides you with a 1-click, powerful virtual desktop environment,
@@ -74,14 +63,6 @@
    <img src="{% static "shells_logo.png" %}"
    title="" alt="Shells logo"/></a>

-    <p>We would also like to thank <a href="https://uptimerobot.com/"
-    title="UptimeRobot">UptimeRobot</a> for providing their monitoring service to us.
-    UptimeRobot is a leading uptime monitoring service.</p>
-
-    <a href="https://uptimerobot.com/" title="UptimeRobot">
-    <img src="{% static "uptimerobot_logo.png" %}"
-    title="" alt="UptimeRobot logo"/></a>
-
    <h3>Past donors</h3>

    <p><a href="http://www.dotcom-monitor.com/" title="Dotcom-Monitor">Dotcom-Monitor</a> &amp; <a href="https://www.loadview-testing.com/" title="LoadView">LoadView</a></p>
--- a/templates/public/download.html
+++ b/templates/public/download.html
@@ -77,13 +77,6 @@
            title="Arch Linux Netboot">Arch Linux Netboot</a></li>
    </ul>

-    <h3>Vagrant images</h3>
-
-    <p>Vagrant images for libvirt and virtualbox are available on the <a href="https://app.vagrantup.com/archlinux/boxes/archlinux">Vagrant Cloud</a>. You can bootstrap the image with the following commands:</p>
-    <code>vagrant init archlinux/archlinux</code>
-    <br/>
-    <code>vagrant up</code>
-
    <h3>Docker image</h3>

    <p>The official Docker image is available on <a href="https://hub.docker.com/_/archlinux/">Docker Hub</a>. You can run the image with the following command:</p>
@@ -93,6 +86,14 @@

    <p>Official virtual machine images are available for download on our <a href="https://gitlab.archlinux.org/archlinux/arch-boxes/-/packages">GitLab instance</a>, more information is available in the <a href="https://gitlab.archlinux.org/archlinux/arch-boxes/">README</a>.</p>

+    <h3>WSL images</h3>
+
+    <p>The official WSL image can be installed with the following command (in a PowerShell prompt from a Windows system with WSL 2 installed):</p>
+    <code>wsl --install archlinux</code>
+
+    <p>It is also available for download on <a href="https://geo.mirror.pkgbuild.com/wsl/latest">mirrors</a>.</p>
+    <p>More information available in the <a href="https://wiki.archlinux.org/title/Install_Arch_Linux_on_WSL">Wiki</a>.</p>
+
    <h3 id="http-downloads">HTTP Direct Downloads</h3>

    <p>In addition to the BitTorrent links above, install images can also be
@@ -140,7 +141,7 @@
    Alternatively, using GnuPG, download the signing key from WKD:
    <pre><code>$ gpg --auto-key-locate clear,wkd -v --locate-external-key {{ release.wkd_email }}</code></pre>
    Verify the signature:
-    <pre><code>$ gpg --keyserver-options auto-key-retrieve --verify archlinux-{{ release.version }}-x86_64.iso.sig archlinux-{{ release.version }}-x86_64.iso</code></pre>
+    <pre><code>$ gpg --verify archlinux-{{ release.version }}-x86_64.iso.sig archlinux-{{ release.version }}-x86_64.iso</code></pre>

    {% cache 600 download-mirrors %}
    <div id="download-mirrors">
--- a/templates/public/index.html
+++ b/templates/public/index.html
@@ -133,8 +133,6 @@
    <h4>Support</h4>
    <ul>
        <li><a href="{% url 'page-donate' %}" title="Help support Arch Linux">Donate</a></li>
-        <li><a href="https://www.unixstickers.com/tag/archlinux" title="Arch
-	Linux stickers, t-shirts, hoodies, mugs, posters and pins">Products via Unixstickers</a></li>
        <li><a href="https://www.freewear.org/?page=list_items&amp;org=Archlinux"
            title="T-shirts">T-shirts via Freewear</a></li>
        <li><a href="https://www.hellotux.com/arch"
@@ -202,11 +200,6 @@
            title="" alt="Hetzner logo"/>
    </a>

-    <a href="https://www.privateinternetaccess.com/" title="Private Internet Access">
-        <img src="{% static "pia_logo.png" %}"
-            title="" alt="Private Internet Access logo"/>
-    </a>
-
    <a href="https://icons8.com/" title="Icons8">
        <img src="{% static "icons8_logo.png" %}"
            title="" alt="Icons8 logo"/>
Author	SHA1	Message	Date
Cory Sanin	9e36ad4e38	Merge branch 'upstream' All checks were successful Github-Actions / build (push) Successful in -44s Details Docker Image CI / build (push) Successful in 3m9s Details	2025-06-23 10:14:50 -05:00
Daniel M. Capella	2027adaaba	signoffs: add "Only Mine" filter Implements https://github.com/archlinux/archweb/issues/550	2025-06-21 12:11:44 +02:00
dependabot[bot]	05abc7f386	build(deps): bump requests from 2.32.3 to 2.32.4 Bumps [requests](https://github.com/psf/requests) from 2.32.3 to 2.32.4. - [Release notes](https://github.com/psf/requests/releases) - [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md) - [Commits](https://github.com/psf/requests/compare/v2.32.3...v2.32.4) --- updated-dependencies: - dependency-name: requests dependency-version: 2.32.4 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>	2025-06-10 14:15:11 +02:00
nl6720	c1d70301c9	templates/public/download.html: remove gpg keyserver-options The public key is retrieved via WKD in the previous command, so there is no reason to contact any keyservers.	2025-06-01 09:42:51 +02:00
Levente Polyak	323002ffe1	donate: remove PIA as the active sponsorship has stopped	2025-05-26 09:26:40 +02:00
Levente Polyak	a49a2cadc5	donate: remove UptimeRobot as they stopped sponsoring us	2025-05-26 09:26:40 +02:00
Marcus B Spencer	a733efa173	Fix typo on "Multilib Differences to Main Packages" page "x864_" is a typo of "x86_64". https://archlinux.org/packages/differences	2025-05-19 09:10:07 +02:00
Jelle van der Waa	ce776a6297	Update to latest django LTS release	2025-05-12 20:18:11 +02:00
Kristian Klausen	7126b7b006	public: Remove Vagrant images We are no longer releasing Vagrant images[1]. [1] `3f7b895725`	2025-05-12 20:02:37 +02:00
Jelle van der Waa	ba4eb27ae3	Drop UnixStickers from support	2025-05-12 20:01:19 +02:00
Wiktor Kwapisiewicz	375713717a	Add `social` field to user's profiles	2025-05-12 20:00:40 +02:00
Cory Sanin	93e59ab09b	Merge branch 'upstream' All checks were successful Github-Actions / build (push) Successful in -46s Details Docker Image CI / build (push) Successful in 2m29s Details	2025-05-09 08:39:34 -05:00
Luca Weiss	5e33be47a7	bump django to 5.0.14 All checks were successful Github-Actions / build (push) Successful in 2m33s Details	2025-04-17 10:05:42 +02:00
Robin Candau	4473a9cdba	Add the automated install / run method for the WSL image to the Download page	2025-04-15 10:18:56 +02:00
Robin Candau	24b21bffed	Point to the wiki page in the WSL images download section More informative than the GitLab repo's README	2025-04-12 15:23:40 +02:00
Robin Candau	7f5d7e9082	Add WSL images to the download page https://geo.mirror.pkgbuild.com/wsl/latest https://gitlab.archlinux.org/archlinux/archlinux-wsl/	2025-04-12 15:14:54 +02:00