diff --git a/fsfe.org/.htaccess b/fsfe.org/.htaccess index d46a12b411..45a6a2bcca 100644 --- a/fsfe.org/.htaccess +++ b/fsfe.org/.htaccess @@ -331,4 +331,5 @@ RewriteRule ^about/printable(/.*)?$ /contribute/spreadtheword.html [R=301,L] RewriteRule ^(tools|build)(/.*)?$ - [F,L] # Redirect attempts to status to status.fsfe.org RewriteRule ^status.fsfe.org(/.*)?$ https://status.fsfe.org/ [R=301,L] - +# Redirect fediverse redirects to our script +RewriteRule ^\.well-known/webfinger$ /cgi-bin/webfinger.php [L] diff --git a/fsfe.org/about/people/people.en.xml b/fsfe.org/about/people/people.en.xml index 7749686d23..3be0b16c4b 100644 --- a/fsfe.org/about/people/people.en.xml +++ b/fsfe.org/about/people/people.en.xml @@ -51,6 +51,7 @@ full: Person is working 4 or 5 days a week part: Person is working 3 or less days a week freelancer: Person is working on honorary basis, no matter which salary or how long + Fediverse address of person. --> - + - + + + diff --git a/fsfe.org/cgi-bin/expense-request.pl b/fsfe.org/cgi-bin/expense-request.pl index 5a2e93f9f4..23e519dfb2 100755 --- a/fsfe.org/cgi-bin/expense-request.pl +++ b/fsfe.org/cgi-bin/expense-request.pl @@ -34,7 +34,6 @@ my %names = ( "dario" => "Dario Presutti", "eal" => "Erik Albers", "fi" => "Francesca Indorato", - "fkobi" => "Filip Kobierski", "floriansnow" => "Florian Snow", "gabriel.ku" => "Gabriel Ku Wei Bin", "hf" => "Henning Fehr", diff --git a/fsfe.org/cgi-bin/registerevent.php b/fsfe.org/cgi-bin/registerevent.php index 2f49672b08..c6a0fa437b 100755 --- a/fsfe.org/cgi-bin/registerevent.php +++ b/fsfe.org/cgi-bin/registerevent.php @@ -95,7 +95,7 @@ function parse_submission() 'location' => $location, 'countryname' => $countryname, 'countrycode' => $countrycode, - 'tags' => isset($_POST['tags']) ? htmlspecialchars($_POST['tags']) : '', + 'tags' => isset($_POST['tags']) ? $_POST['tags'] : '', 'lang' => isset($_POST['lang']) ? htmlspecialchars($_POST['lang']) : '', ]; diff --git a/fsfe.org/cgi-bin/webfinger.php b/fsfe.org/cgi-bin/webfinger.php new file mode 100755 index 0000000000..aa1b8ce255 --- /dev/null +++ b/fsfe.org/cgi-bin/webfinger.php @@ -0,0 +1,33 @@ +xpath('//fediverse') as $fedi_elem) { + if ('acct:'.strval($fedi_elem) === $acc_request) { + // if we have a location, return it and exit + if (isset($fedi_elem['handle'])) { + // Handles are in the form @ + $handle = strval($fedi_elem['handle']); + $handle_sections = explode('@', $handle); + $response = 'Location: https://'.$handle_sections[1].'/.well-known/webfinger?resource=acct:'.$handle; + header($response); + + exit; + } + http_response_code(500); + echo 'ERROR: fediverse element has no location attribute.'; + + exit; + } +} +// No matches +http_response_code(404); +echo '404 matching person not found.'; diff --git a/fsfe.org/config.toml b/fsfe.org/config.toml index a4e3d3c486..1b16146c2e 100644 --- a/fsfe.org/config.toml +++ b/fsfe.org/config.toml @@ -1,5 +1,5 @@ # This is a config file for a site, that cuontains necessary settings -# +# # Sources for the website # All repos should be mirrored to https://git.fsfe.org/fsfe-system-hackers-mirrors # @@ -11,6 +11,7 @@ file_sets = [ { source = "/dist/jquery.min.js", target = "scripts/thirdparty/" }, { source = "/dist/jquery.min.map", target = "scripts/thirdparty/" }, ] + [[dependencies]] repo = "https://git.fsfe.org/fsfe-system-hackers-mirrors/lunr.js" rev = "v2.3.9" @@ -32,4 +33,4 @@ file_sets = [{ source = "/src", target = "cgi-bin/thirdparty/PHPMailer" }] [deployment] # This files contains relative paths we want to deploy even if they would be blocked by the copy_files method filtering. # Special case hard code pass over order items xml required by cgi script -required_files = ["order/data/items.en.xml"] +required_files = ["order/data/items.en.xml", "about/people/people.en.xml"] diff --git a/fsfe.org/contribute/web/features.en.xhtml b/fsfe.org/contribute/web/features.en.xhtml index 7363349e18..62d5256264 100644 --- a/fsfe.org/contribute/web/features.en.xhtml +++ b/fsfe.org/contribute/web/features.en.xhtml @@ -51,8 +51,8 @@

- First of all, when editing or creating websites, please make sure to enable - the Git hooks and follow the + First of all, when editing or creating websites, please make sure to enable + the Git hooks and follow the best practices. They will mitigate a lot of common issues and make things more pleasant for you and others.

@@ -67,7 +67,7 @@

Thirdly, also be aware of the more technical documentation of the features - on the Editing + on the Editing wiki page. While the page you are currently looking at is rather meant for editors, the wiki page may be more helpful for our tech-savvy web developers. @@ -77,7 +77,7 @@

Meta data

- You can add various meta data and clever tags in your XHTML file. This + You can add various meta data and clever tags in your XHTML file. This wiki page shows all of them. In this article, we set multiple authors (see on top) and a description and image that are visible in social media and other pages. @@ -301,7 +301,7 @@

Unfortunately, we currently cannot directly embed the video from Peertube directly. Therefore, we provide the Peertube - Embedder, a script on our download server + Embedder, a script on our download server that automates the necessary processes of download and conversion. Please follow the tool's documentation to learn how to use it and how it works. There you will also find a list of drawbacks of this temporary solution. @@ -658,7 +658,7 @@

- Small pitfall: if you build the + Small pitfall: if you build the website locally and include a module in a page for the first time, you'll have to run make after including a module once.

diff --git a/fsfe.org/donate/donors/donors-2025.en.xml b/fsfe.org/donate/donors/donors-2025.en.xml index 2d1d2324d0..df97c149be 100644 --- a/fsfe.org/donate/donors/donors-2025.en.xml +++ b/fsfe.org/donate/donors/donors-2025.en.xml @@ -45,6 +45,7 @@ Adfinis + Alessandro Rubini Amateur Radio Digital Communications (ARDC) Arthur Schreiber Bird & Bird diff --git a/fsfe.org/donate/donors/donors-2026.en.xml b/fsfe.org/donate/donors/donors-2026.en.xml index d032818168..7d7bc8cccd 100644 --- a/fsfe.org/donate/donors/donors-2026.en.xml +++ b/fsfe.org/donate/donors/donors-2026.en.xml @@ -33,6 +33,8 @@ Andrea Soto and Roberto Moratore Björn Persson credativ + Document Foundation + Eclipse Foundation Guido Bienhaus Holger Kienle Hostsharing eG diff --git a/fsfe.org/events/2026/event-20260312-01.en.xml b/fsfe.org/events/2026/event-20260312-01.en.xml new file mode 100644 index 0000000000..0368588fcb --- /dev/null +++ b/fsfe.org/events/2026/event-20260312-01.en.xml @@ -0,0 +1,21 @@ + + + 1 + + FSFE Zurich local group meeting (online) + + Zurich + + + + +

We will discuss the topics outlined in our agenda. You're welcome to join us!

+ + + https://docs.fsfe.org/en/LocalGroups/Active/Zurich/Monatstreffen/2026-03-12 + + + + + + diff --git a/fsfe.org/events/2026/event-20260324-01.en.xml b/fsfe.org/events/2026/event-20260324-01.en.xml new file mode 100644 index 0000000000..6a45330b0a --- /dev/null +++ b/fsfe.org/events/2026/event-20260324-01.en.xml @@ -0,0 +1,27 @@ + + + 1 + + 26. Gautinger Internet meeting in Gautingen, Germany + + None + + + + +

Digital sovereignty affects all of us – it is a socio-political challenge and also determines our everyday dealings with media. Children and young people are also moving intensively in digital spaces, which are characterized by tech corporations and closed platforms mostly outside Europe and often also by the political ideas of their owners.

+

At the 26. Gautinger Internet meeting Johannes Näder and Bonnie Mehring, from the FSFE, will present the youth activities from the FSFE, Youth Hacking 4 Freedom and the well known "Ada & Zangemann" childrens book.

+

Join us for a hands on session on the 25th of March, at 11:00 o'clock (CEST) in Germeringer Str. 30, 82131 Gauting.

+

Registration is mandatory.

+ + + https://www.studioimnetz.de/projekte/gautinger-internettreffen/git26/ + + + Germany + + + + + + diff --git a/fsfe.org/events/2026/event-20260328-01.de.xml b/fsfe.org/events/2026/event-20260328-01.de.xml new file mode 100644 index 0000000000..cac4f31a2f --- /dev/null +++ b/fsfe.org/events/2026/event-20260328-01.de.xml @@ -0,0 +1,26 @@ + + + 1 + + Chemnitzer Linux-Tage 2026 in Chemnitz, Deutschland + + Germany + + + + +

Die Chemnitzer Linux-Tage (CLT) sind die größte Freie-Software-Konferenz in Deutschland. Seit langem tragen sie zur Aufklärung über Linux und Freie Software bei. Die Veranstaltung umfasst Workshops, Vorträge und Einsteiger-Talks im Zentralgebäude der Technischen Universität Chemnitz.

+

Die FSFE wird auf der CLT 2026 mit einem Informationsstand und einem Vortrag vertreten sein: Am Sonntag um 13:00 Uhr spricht der Technische Berater der FSFE, Florian Snow, über „Lizenzierung freier Software: Was Entwickler wissen müssen“ (Raum V4).

+ + + https://chemnitzer.linux-tage.de/2026/de/programm/vortraege + + + Deutschland + + + + + + + diff --git a/fsfe.org/events/2026/event-20260328-01.en.xml b/fsfe.org/events/2026/event-20260328-01.en.xml new file mode 100644 index 0000000000..101705cbd8 --- /dev/null +++ b/fsfe.org/events/2026/event-20260328-01.en.xml @@ -0,0 +1,26 @@ + + + 1 + + Chemnitzer Linux-Tage 2026 in Chemnitz, Germany + + Germany + + + + +

The Chemnitz Linux Days (CLT) are the largest Free Software conference in Germany. It is a long-standing event for education about Linux and Free Software. The event includes workshops, lectures and beginners' talks in the central building of the Chemnitz University of Technology.

+

The FSFE will be present at the CLT 2026 edition with an information booth and serveral talks a presentations On Sunday at 13:00, the FSFE's Technical Advisor Florian Snow will talk about "Lizenzierung freier Software: Was Entwickler wissen müssen" (room V4).

+ + + https://chemnitzer.linux-tage.de/2026/de/programm/vortraege + + + Germany + + + + + + + diff --git a/fsfe.org/news/2026/news-20260218-01.en.xhtml b/fsfe.org/news/2026/news-20260218-01.en.xhtml index 2a806e6832..760da80ea7 100644 --- a/fsfe.org/news/2026/news-20260218-01.en.xhtml +++ b/fsfe.org/news/2026/news-20260218-01.en.xhtml @@ -33,7 +33,7 @@ end-users to run Free Software on their devices.

years, the Free Software Foundation Europe (FSFE) has been successfully advocating for this freedom across Europe with successes -in Finland, Germany, Italy, the Netherlands, Greece, and Belgium, respectively.

+in Finland, Germany, Italy, the Netherlands, Greece, and Belgium.

The proposed Digital @@ -133,7 +133,7 @@ for the network, or threaten end-users who use personal routers with contract termination or fines.

This situation undermines not only user rights, but also the internal -market of the EU. If you pay the electricity to power your router, it +market of the EU. If you pay for the electricity to power your router, it should be as much under your control as your own coffee machine or laptop, not something dictated by your internet provider. Different national rules on where the network ends and the user’s equipment begins diff --git a/fsfe.org/news/2026/news-20260302-01.en.xhtml b/fsfe.org/news/2026/news-20260302-01.en.xhtml index 4939ded749..79ecc663a4 100644 --- a/fsfe.org/news/2026/news-20260302-01.en.xhtml +++ b/fsfe.org/news/2026/news-20260302-01.en.xhtml @@ -110,7 +110,14 @@ a look at the Weblate project and get in touch with me via email.

+<<<<<<< HEAD +======= + + + Petter + +>>>>>>> 44c275587d268305ae3d34c053c20f0fa14f4aca Community diff --git a/fsfe.org/news/2026/news-20260305-01.en.xhtml b/fsfe.org/news/2026/news-20260305-01.en.xhtml new file mode 100644 index 0000000000..edff552f36 --- /dev/null +++ b/fsfe.org/news/2026/news-20260305-01.en.xhtml @@ -0,0 +1,139 @@ + + +1 + + + 22 events, one message: Maintainers Matter and we love Free Software + + + + +

22 events, one message: Maintainers Matter and we love Free Software

+ +

The 2026 edition of “I Love Free Software Day” demonstrated, once +again, the strength and gratitude of our Free Software community. 22 +celebrations in 12 European countries highlighted the invaluable work +of Free Software maintainers as well as bringing people together to +thank everyone who contributes to Free Software. Appreciation also +extended across the Fediverse, alongside other surprises.

+ +
+ +
+ +

We are really proud of our community and what the Free Software +ecosystem is achieving day after day, but there is one special moment +each year when we invite everyone to shout it out into the world. “I +Love Free Software Day” is our yearly celebration dedicated to saying +thank you to all those behind our favourite Free Software projects.

+ +

Every year on 14 February, or in the days +around it, our communities come together across Europe and online to +express their appreciation. Whether through local meet-ups, talks, +workshops, postcards, blog posts, social media messages, or simple words +of gratitude, the message is clear: Free Software exists and thrives +because of the people who build, maintain, document, translate, test, +and support it.

+ +

For the 2026 celebration, and under the motto “Maintaners Matter”, +our communities organised 22 events across 12 different European +countries, reaching more than 300 people offline. From cosy café +meet-ups to university gatherings and hacker spaces, people came +together to say a heartfelt “Thank you” to Free Software maintainers, +contributors, and developers.

+ +

And many more people celebrated it online. Hundreds of individuals +and organisations joined the celebration on the Fediverse, sharing +appreciation posts and gratitude messages. The hashtag #ilovefs ranked +among the +most used hashtags on the day. For the first time, the celebration +also reached the front page of Hacker News, thanks to a “thank you” blog +post by Matthias Kirschner, the president of the FSFE, who +shared his appreciation for Arch Linux and the extensive +ArchWiki.

+ +

New countries, Badges, Fediwall, a comic, and a map

+

For the first time, “I Love Free Software Day” reached +Croatia and Norway, each hosting a local event and +expanding the celebration further north and south across Europe. New +cities joined as well, including Bonn (Germany) and Amsterdam +(Netherlands). And also Tirana (Albania) returned for this edition.

+ +

The Polish community, which reactivated its activities around last +year’s “I Love Free Software Day”, strengthened continued its strong +engagement with events in Łódź, Warsaw, and Poznań. Poznań hosted one of +the largest gatherings in 2026, bringing together nearly 80 participants +for a vibrant day of talks, discussions, and shared appreciation.

+

Across Europe, communities also met in +Oxford and the Potteries (UK), Rotterdam, Amsterdam and Eindhoven +(Netherlands), Zurich (Switzerland), Barcelona and Madrid (Spain), +Frankfurt, Berlin, Bonn and Nuremberg (Germany), as well as in Portugal, +where ANSOL organised an online celebration, and many more.

+ +

This year also saw remarkable volunteer-driven innovations:

+
    +
  • A new Fediwall +system was developed to highlight and visualise online participation +across the Fediverse.
    • +
  • A Polish volunteer set up a BadgeFed instance, +creating dedicated “I Love Free Software Day” badges for organisers, +participants, and contributors. A creative new way to publicly recognise +engagement!
    • +
  • A long-standing wish for a dedicated event map became reality thanks +to Tom, the project leader of mapforge, who made a +customised “I Love Free Software Day” map possible, showcasing +celebrations across Europe.
    • +
+ +

To convey the importance of the day in a more visual and accessible +way, the 2026 celebrations also introduced a brand-new +comic, explaining why appreciation and recognition for Free Software +contributors matter so much.

+ + +
+ ILoveFS comic by Mullana CC-BY-SA 4.0 +
Comic by Mullana under CC-BY-SA 4.0 ❤
+
+ +

For the 2026 edition, the Software Freedom Podcast +released its 47th episode, “ILoveFS: Let’s meet our maintainers”. In +this episode, Bonnie Mehring speaks with maintainer Lorenz Kästle about +the rewards and challenges of maintaining Free Software projects in +one’s free time.

+ +

“I Love Free Software Day” has grown into a well-established online +and offline celebration of Software Freedom. Above all, the day remains +what it has always been: a joyful celebration full of gratitude, +connection, and recognition.

+ +

To everyone who organised an event, sent a postcard, shared a +hashtag, joined a podcast, created a badge, developed tools, or simply +said “Thank you”: thank you for making “I Love Free +Software Day 2026: Maintainers Matter” such a special and inspiring +celebration.

+ +

Wanna know more? Read our Report about the 2026 I +love Free Software day celebrations

+ + + + + Community + I Love Free Software Day + + highlights + + + + + + + diff --git a/global/data/modules/fsfe-employee-options.en.xml b/global/data/modules/fsfe-employee-options.en.xml index 91c9b33df1..264299807d 100644 --- a/global/data/modules/fsfe-employee-options.en.xml +++ b/global/data/modules/fsfe-employee-options.en.xml @@ -7,7 +7,6 @@ - diff --git a/status.fsfe.org/status.en.xml b/status.fsfe.org/status.en.xml index e48eea5363..260a940e76 100644 --- a/status.fsfe.org/status.en.xml +++ b/status.fsfe.org/status.en.xml @@ -5,6 +5,9 @@ There have been reports of connection problems to our Matrix server on the weekend. System Hackers are investigating the problem. + + FSFE System Hackers have identified issues on the Database of the Matrix service and are working on resolving them. +