FSFE/fsfe-website
30
33
Fork 98
Code Issues 66 Pull Requests 18 Wiki Activity

Merge branch 'master' of git.fsfe.org:FSFE/fsfe-website into 20240425-frontpage

Browse Source
This commit is contained in:
tobiasd
2024-04-29 09:51:55 +02:00
parent 650bed3e2b 96699962e8
commit 8b815ee85c
23 changed files with 49 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
activities/ada-zangemann/activity.en.xml
+1 -1
View File
@@ -10,7 +10,7 @@ The illustrated book "Ada & Zangemann - a tale of software, skateboards, and
</description>
<link href="/activities/ada-zangemann/" />
<image url="/graphics/logos/childrensbook.png" />
<order priority="2" highlight="yes" />
<order priority="11" highlight="yes" />
<tags>
<tag key="awareness"/>
</tags>
activities/android/activity.en.xml
+1 -1
View File
@@ -10,7 +10,7 @@
</description>
<link href="/activities/android/android.html" />
<image url="/graphics/logos/android.png" />
<order priority="7" highlight="yes" />
<order priority="6" highlight="yes" />
<tags>
<tag key="awareness" />
</tags>
activities/deviceneutrality/activity.en.xml
+1 -1
View File
@@ -10,7 +10,7 @@
</description>
<link href="/activities/deviceneutrality/index" />
<image url="/graphics/logos/deviceneutrality-transparent.png" />
<order priority="6" highlight="yes" />
<order priority="7" highlight="yes" />
<tags>
<tag key="policy" />
<tag key="awareness" />
activities/ilovefs/activity.en.xml
+2 -7
View File
@@ -7,16 +7,11 @@
<title>I Love Free Software</title>
<description>
We often underestimate the power of a simple <strong>Thank
You</strong>. Free Software contributors do important work for
our society and they deserve attention. The "I Love Free Software
Day" on 14 February (also known as Valentine's Day) is the
perfect opportunity for you to express your special gratitude.
Since 2010, we have celebrated this wonderful annual event with a
ever-growing diverse community. ♥ ♥ ♥
You</strong>. Free Software contributors do important work for our society and the "I Love Free Software Day" on 14 February is the perfect opportunity for you to express your special gratitude. Since 2010, we have celebrated this wonderful annual event with an ever-growing and diverse community. ♥ ♥ ♥
</description>
<link href="/activities/ilovefs/" />
<image url="/graphics/logos/ilovefs.png" />
<order priority="4" highlight="yes" />
<order priority="9" highlight="yes" />
<tags>
<tag key="awareness" />
</tags>
activities/licence-questions/activity.en.xml
+2 -6
View File
@@ -6,15 +6,11 @@
<activity id="licence-questions" date="2015-11-25" status="active">
<title>Licence Questions</title>
<description>
The FSFE’s Licence Questions mailing list is our group of
volunteers dedicated to provide help with Free Software licences
and compliance. If you need advice on what Free Software licence
you should use, or if you want to know more about what rights you
have over a piece of Free Software, you can contact us.
The FSFE’s Licence Questions mailing list is our group of volunteers dedicated to provide help with Free Software licences and compliance. If you need advice on what Free Software licence you should use, or if you want to know more about what rights you have over a piece of Free Software, you can contact us.
</description>
<link href="/freesoftware/legal/faq.html" />
<image url="/graphics/logos/licence-questions.png" />
<order priority="3" highlight="yes" />
<order priority="4" highlight="yes" />
<tags>
<tag key="legal" />
</tags>
activities/ln/activity.en.xml
+1 -1
View File
@@ -10,7 +10,7 @@
</description>
<link href="/activities/ln/ln.html" />
<image url="/graphics/logos/ln.png" />
<order priority="4" highlight="yes" />
<order priority="1" highlight="yes" />
<tags>
<tag key="legal" />
</tags>
activities/ngi/activity.en.xml
+2 -9
View File
@@ -6,18 +6,11 @@
<activity id="ngi" date="2019-01-01" status="active">
<title>Next Generation Internet</title>
<description>
The FSFE is a partner organisation of NGI, a coalition of various
not-for-profit organisations from across Europe. Funded by the
European Commmission, NGI provides grants to individual
researchers and developers, as well as teams that wish to work on
new ideas and technologies that contribute to the establishment
of the Next Generation Internet. The FSFE provides legal support
for projects that improve openness, inclusivity, transparency,
privacy, cooperation, and protection of data.
The FSFE is a partner organisation of NGI, a coalition of non-profit organisations from across Europe. Funded by the EC, it provides grants to work on new ideas and technologies that contribute to the establishment of the Next Generation Internet. The FSFE provides legal support for these projects.
</description>
<link href="/activities/ngi/ngi.html" />
<image url="/graphics/logos/ngi.png" />
<order priority="1" highlight="yes" />
<order priority="3" highlight="yes" />
<tags>
<tag key="legal" />
</tags>
activities/publiccode/activity.en.xml
+1 -1
View File
@@ -10,7 +10,7 @@
</description>
<link href="/activities/publiccode/publiccode.html" />
<image url="/graphics/logos/publiccode.png" />
<order priority="1" highlight="yes" />
<order priority="12" highlight="yes" />
<tags>
<tag key="awareness" />
<tag key="policy" />
activities/reuse/activity.en.xml
+1 -1
View File
@@ -10,7 +10,7 @@ The FSFE is running a project to make licensing easy for humans and machines ali
</description>
<link href="https://reuse.software" />
<image url="/graphics/logos/reuse.png" />
<order priority="5" highlight="yes" />
<order priority="8" highlight="yes" />
<tags>
<tag key="legal" />
</tags>
activities/routers/activity.en.xml
+1 -1
View File
@@ -10,7 +10,7 @@
</description>
<link href="/activities/routers/routers.html" />
<image url="/graphics/logos/RouterFreedom-logo.png" />
<order priority="8" highlight="yes" />
<order priority="5" highlight="yes" />
<tags>
<tag key="policy" />
</tags>
activities/yh4f/activity.en.xml
+2 -5
View File
@@ -6,14 +6,11 @@
<activity id="yh4f" date="2021-09-27" status="active">
<title>Youth Hacking 4 Freedom</title>
<description>
Young people compete in Youth Hacking 4 Freedom by creating programs of
their choice licensed as Free Software. The winners receive an award in a
ceremony. Youth Hacking for Freedom inspires people to learn programming
and to collaborate.
Young people, from all over Europe, compete in Youth Hacking 4 Freedom to win cash prizes by creating programs of their choice licensed as Free Software. The six winners will be invited to the Award ceremony weekend. Youth Hacking for Freedom inspires people to learn programming and to collaborate.
</description>
<link href="/activities/yh4f/" />
<image url="/graphics/logos/yh4f.png" />
<order priority="3" highlight="yes" />
<order priority="10" highlight="yes" />
<tags>
<tag key="awareness" />
</tags>
activities/zooom/activity.en.xml
+2 -2
View File
@@ -6,11 +6,11 @@
<activity id="zooom" date="2022-12-13" status="active">
<title>The ZOOOM Initiative</title>
<description>
The FSFE is working with 9 European organizations to promote and raise awareness about the importance of Free Software, Open Data, and Open Hardware among academia, business, industry, and innovation supporting organizations. As a big part of our work with the ZOOOM Initiative, we are promoting the REUSE specification as an important element for licensing compliance.
The FSFE is part of these European consortium to promote and raise awareness about the importance of Free Software, Open Data, and Open Hardware among academia, business, industry, and innovation supporting organizations. As a big part of our work, we are promoting the REUSE specification as an important element for licensing compliance.
</description>
<link href="/activities/zooom/zooom.html" />
<image url="https://pics.fsfe.org/uploads/original/f4/19/43373b9e8b11fb99555f10503687.png" />
<order priority="1" highlight="yes" />
<order priority="2" highlight="yes" />
<tags>
<tag key="legal" />
</tags>
cgi-bin/promotion.php
+1
View File
@@ -98,6 +98,7 @@ $lang = $_POST['language'];
if (
empty($_POST['lastname']) ||
empty($_POST['mail']) ||
stripos($_POST['mail'], 'example') ||
empty($_POST['street']) ||
empty($_POST['zip']) ||
empty($_POST['city']) ||
cgi-bin/registerevent.php
+2 -1
View File
@@ -168,7 +168,8 @@ function send_registration_mail() {
}
if ( isset($_POST['register_event']) AND empty($_POST['spam']) AND eval_date($_POST['startdate'])
AND ( $_POST['startdate']>"2023-01-01") AND ( eval_date($_POST['enddate']) ) || empty($_POST['enddate']) ) {
AND ( $_POST['startdate']>"2023-01-01") AND ( eval_date($_POST['enddate']) ) || empty($_POST['enddate'])
AND ( !stripos($_POST['email'], 'example.com')) ) {
$error = send_registration_mail();
contribute/spreadtheword.en.xhtml
+1 -1
View File
@@ -13,7 +13,7 @@
<h1 id="spread-the-word">Spread the word!</h1>
<!-- module id="order-delay"//-->
<module id="order-delay" />
<div class="toc float-right">
<p class="head"><a href="#how-to-order">Order now</a></p>
events/2024/event-20240613-01.en.xml
+21
View File
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<eventset>
<version>1</version>
<event start="2024-06-13" end="2024-06-13">
<title>DevConf.CZ - Engaging with the next generation: A Tale of Software, Skateboards, and Raspberry Ice Cream in Brno, Czech Republic</title>
<body>
<p>Together, with the book author Matthias Kirschner, we will read &quot;Ada &amp; Zangemann - A Tale of Software, Skateboards, and Raspberry Ice Cream&quot; . This illustrated book tells the story of the famous inventor Zangemann and the girl Ada, a curious tinkerer. Ada begins to experiment with hardware and software, and in the process realises how crucial it is for her and others to control technology.</p>
<p>Matthias Kirschner will briefly share experiences from readings, and we will discuss concepts how to engage with younger audiences about Free Software. The goal is to enable each participant to better connect with young audiences about technology and together further develop a reusable tool kit for such readings.</p>
<p>DevConf.CZ is taking place in Brno from 13 to 15 June. <br />
</p>
</body>
<link>https://pretalx.com/devconf-cz-2024/talk/QKPPW8/</link>
<tags>
<tag key="cz">Czech Republic</tag> <tag key="talk"/>
<tag key="panel"/>
<tag key="front-page"/>
</tags>
</event>
</eventset>
order/order.de.xhtml
+1 -1
View File
@@ -10,7 +10,7 @@
<body class="toplevel">
<h1>Fanartikel</h1>
<!-- module id="order-delay" //-->
<module id="order-delay" />
<div class="toc float-right">
<p>Kategorien</p>
order/order.en.xhtml
+1 -1
View File
@@ -10,7 +10,7 @@
<body class="toplevel">
<h1>Merchandise</h1>
<!-- module id="order-delay" //-->
<module id="order-delay" />
<div class="toc float-right">
<p>Available merchandise</p>
order/order.es.xhtml
+1 -1
View File
@@ -10,7 +10,7 @@
<body class="toplevel">
<h1>Productos promocionales</h1>
<!-- module id="order-delay" //-->
<module id="order-delay" />
<div class="toc float-right">
<p>Productos disponibles</p>
order/order.fr.xhtml
+1 -1
View File
@@ -10,7 +10,7 @@
<body class="toplevel">
<h1>Marchandise</h1>
<!-- module id="order-delay" //-->
<module id="order-delay" />
<div class="toc float-right">
<p>Marchandise disponible</p>
order/order.it.xhtml
+1 -1
View File
@@ -10,7 +10,7 @@
<body class="toplevel">
<h1>Prodotti</h1>
<!-- module id="order-delay" //-->
<module id="order-delay" />
<div class="toc float-right">
<p>Prodotti disponibili</p>
order/order.nl.xhtml
+1 -1
View File
@@ -10,7 +10,7 @@
<body class="toplevel">
<h1>Fan-artikelen</h1>
<!-- module id="order-delay" //-->
<module id="order-delay" />
<div class="toc float-right">
<p>Beschikbare fan-artikelen</p>
order/order.xsl
+1
View File
@@ -121,6 +121,7 @@
<xsl:element name="input">
<xsl:attribute name="type">number</xsl:attribute>
<xsl:attribute name="size">2</xsl:attribute>
<xsl:attribute name="min">0</xsl:attribute>
<xsl:attribute name="name">
<xsl:value-of select="$id"/>
<xsl:text>_</xsl:text>