[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[www] branch stable updated (5340517b -> 92b5017c)
|
From: |
gnunet |
|
Subject: |
[www] branch stable updated (5340517b -> 92b5017c) |
|
Date: |
Thu, 27 Oct 2022 10:20:51 +0200 |
This is an automated email from the git hooks/post-receive script.
martin-schanzenbach pushed a change to branch stable
in repository www.
from 5340517b also release gtk
new 0fe1d8b7 typo
add 6bb7cab1 add link to NGI discovery
add 2ed4ae05 ack funding in news
new 92b5017c Merge branch 'master' of git+ssh://git.gnunet.org/www
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
build-system/taler-build-scripts | 2 +-
static/images/ngi_discovery.svg | 226 +++++++++++++++++++++++++++++++++++
template/about.html.j2 | 6 +
template/news/2022-10-0.18.0.html.j2 | 7 +-
4 files changed, 238 insertions(+), 3 deletions(-)
create mode 100644 static/images/ngi_discovery.svg
diff --git a/build-system/taler-build-scripts b/build-system/taler-build-scripts
index 32716a80..5fb2f811 160000
--- a/build-system/taler-build-scripts
+++ b/build-system/taler-build-scripts
@@ -1 +1 @@
-Subproject commit 32716a804208379ae6558d9cedbf00e9a95d0f6c
+Subproject commit 5fb2f811026bbe7152ed59b712248048853eb0f6
diff --git a/static/images/ngi_discovery.svg b/static/images/ngi_discovery.svg
new file mode 100644
index 00000000..aabef1c9
--- /dev/null
+++ b/static/images/ngi_discovery.svg
@@ -0,0 +1,226 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:xlink="http://www.w3.org/1999/xlink";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ version="1.1"
+ id="svg2"
+ xml:space="preserve"
+ width="553.96533"
+ height="170.64532"
+ viewBox="0 0 166.1896 51.193597"
+ sodipodi:docname="NGI0_Discovery_Tag.svg"
+ inkscape:version="1.0.2 (e86c870879, 2021-01-15)"
+
inkscape:export-filename="/home/joost/Nextcloud/NGI/ICT-24/Comms_and_Press/NGI
Zero brand and logo's/NGI Zero Discovery logo with tag.png"
+ inkscape:export-xdpi="151.94293"
+ inkscape:export-ydpi="151.94293"><metadata
+ id="metadata8"><rdf:RDF><cc:Work
+ rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage";
/><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+ id="defs6"><linearGradient
+ inkscape:collect="always"
+ id="linearGradient845"><stop
+ style="stop-color:#98bf00;stop-opacity:1;"
+ offset="0"
+ id="stop841" /><stop
+ style="stop-color:#98bf00;stop-opacity:0.85958904"
+ offset="1"
+ id="stop843" /></linearGradient><linearGradient
+ id="linearGradient1220"
+ inkscape:collect="always"><stop
+ id="stop1216"
+ offset="0"
+ style="stop-color:#98bf00;stop-opacity:1;" /><stop
+ id="stop1218"
+ offset="1"
+ style="stop-color:#98bf00;stop-opacity:0.51"
/></linearGradient><linearGradient
+ x1="0"
+ y1="0"
+ x2="1"
+ y2="0"
+ gradientUnits="userSpaceOnUse"
+
gradientTransform="matrix(-139.45511,-135.52185,-135.52185,139.45511,177.4727,131.75308)"
+ spreadMethod="pad"
+ id="linearGradient28"><stop
+ style="stop-opacity:1;stop-color:#00afbc"
+ offset="0"
+ id="stop24" /><stop
+ style="stop-opacity:1;stop-color:#205374"
+ offset="1"
+ id="stop26" /></linearGradient><clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath38"><path
+ d="M 0,127.984 H 415.474 V 0 H 0 Z"
+ id="path36"
+ inkscape:connector-curvature="0" /></clipPath><clipPath
+ clipPathUnits="userSpaceOnUse"
+ id="clipPath38-3"><path
+ d="M 0,127.984 H 415.474 V 0 H 0 Z"
+ id="path36-5"
+ inkscape:connector-curvature="0" /></clipPath><linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1220"
+ id="linearGradient924"
+ gradientUnits="userSpaceOnUse"
+ x1="14.915152"
+ y1="14.167241"
+ x2="214.11908"
+ y2="111.76186" /><linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient845"
+ id="linearGradient926"
+ gradientUnits="userSpaceOnUse"
+ x1="14.915152"
+ y1="14.167241"
+ x2="213.75"
+ y2="112.50001" /><linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient845"
+ id="linearGradient928"
+ gradientUnits="userSpaceOnUse"
+ x1="14.915152"
+ y1="14.167241"
+ x2="213.75"
+ y2="112.50001" /><linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient845"
+ id="linearGradient930"
+ gradientUnits="userSpaceOnUse"
+ x1="14.915152"
+ y1="14.167241"
+ x2="213.75"
+ y2="112.50001" /><linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient845"
+ id="linearGradient932"
+ gradientUnits="userSpaceOnUse"
+ x1="14.915152"
+ y1="14.167241"
+ x2="213.75"
+ y2="112.50001" /></defs><sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1716"
+ inkscape:window-height="415"
+ id="namedview4"
+ showgrid="true"
+ inkscape:zoom="0.50000001"
+ inkscape:cx="820.74051"
+ inkscape:cy="80.204866"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="g10"
+ scale-x="0.7"
+ fit-margin-top="30"
+ fit-margin-right="30"
+ fit-margin-left="30"
+ fit-margin-bottom="30"
+ inkscape:document-rotation="0"><inkscape:grid
+ type="xygrid"
+ id="grid924"
+ originx="-8.7011428"
+ originy="108.34203" /></sodipodi:namedview><g
+ id="g10"
+ inkscape:groupmode="layer"
+ inkscape:label="Logo-NGI_Tag-rgb_Editable-text"
+ transform="matrix(1.3333333,0,0,-1.3333333,-9.9026662,160.74)">
+
+
+
+
+
+
+
+
+
+<g
+ id="g1019"
+ transform="translate(-6.6602739,2.3306973)"><g
+ id="g12-6"
+ style="fill:url(#linearGradient932);fill-opacity:1"
+ transform="matrix(0.30423163,0,0,0.30423163,12.048482,79.5582)"><g
+ id="g14-2"
+ style="fill:url(#linearGradient930);fill-opacity:1"><g
+ id="g20-9"
+ style="fill:url(#linearGradient928);fill-opacity:1"><g
+ id="g22-1"
+ style="fill:url(#linearGradient926);fill-opacity:1"><path
+ d="m 25.228,113.805 c -6.079,0 -11.051,-4.973 -11.051,-11.051 v 0
-77.523 c 0,-6.079 4.972,-11.051 11.051,-11.051 v 0 h 165.035 c 6.078,0
11.051,4.973 11.051,11.051 v 0 18.26 c 0,2.022 0.803,3.962 2.234,5.393 v 0 l
9.096,9.096 c 2.54,2.539 2.533,6.657 -0.013,9.188 v 0 l -9.067,9.017 c
-1.44,1.431 -2.25,3.379 -2.25,5.409 v 0 21.16 c 0,6.078 -4.973,11.051
-11.051,11.051 v 0 z"
+ style="fill:url(#linearGradient924);fill-opacity:1;stroke:none"
+ id="path30-2"
+ inkscape:connector-curvature="0" /></g></g></g></g><g
+ id="g32-7"
+ transform="matrix(0.30423163,0,0,0.30423163,12.048482,79.5582)"><g
+ id="g34-0"
+ clip-path="url(#clipPath38-3)"><g
+ id="g40-9"
+ transform="translate(175.9982,95.8645)"><path
+ d="m 0,0 v 0 c 4.074,0 7.376,-3.302 7.376,-7.376 v -48.993 c
0,-4.074 -3.302,-7.376 -7.376,-7.376 -4.074,0 -7.376,3.302 -7.376,7.376 V
-7.376 C -7.376,-3.302 -4.074,0 0,0"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+ id="path42-3"
+ inkscape:connector-curvature="0" /></g><g
+ id="g44-6"
+ transform="translate(152.1193,64.9934)"><path
+ d="M 0,0 H -0.506 C -0.57,0 -0.633,-0.008 -0.698,-0.01
-0.762,-0.008 -0.825,0 -0.89,0 h -7.283 c -3.929,0 -7.359,-2.965 -7.613,-6.885
-0.278,-4.296 3.124,-7.867 7.361,-7.867 0.776,0 1.343,-0.754 1.111,-1.494
-0.658,-2.088 -2.341,-3.751 -4.547,-4.333 -2.074,-0.547 -4.276,-0.821
-6.605,-0.821 -4.007,0 -7.574,0.865 -10.7,2.595 -3.127,1.73 -5.57,4.144
-7.331,7.24 -1.761,3.096 -2.641,6.617 -2.641,10.564 0,4.006 0.88,7.558
2.641,10.654 1.761,3.097 4.219,5.493 7.377,7.195 3.156,1.698 [...]
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+ id="path46-0"
+ inkscape:connector-curvature="0" /></g><g
+ id="g48-6"
+ transform="translate(90.5807,88.5798)"><path
+ d="m 0,0 v -49.176 c 0,-4.023 -3.262,-7.285 -7.286,-7.285 h -1.381
c -2.181,0 -4.247,0.977 -5.631,2.662 l -24.229,29.505 c -1.804,2.197
-5.368,0.921 -5.368,-1.922 v -22.96 c 0,-4.023 -3.261,-7.285 -7.285,-7.285
-4.023,0 -7.285,3.262 -7.285,7.285 V 0 c 0,4.024 3.262,7.285 7.285,7.285 h
1.468 c 2.184,0 4.253,-0.979 5.636,-2.669 l 24.135,-29.475 c 1.802,-2.202
5.37,-0.927 5.37,1.918 V 0 c 0,4.024 3.261,7.285 7.285,7.285 C -3.262,7.285
0,4.024 0,0"
+ style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+ id="path50-2"
+ inkscape:connector-curvature="0" /></g></g></g><g
+ aria-label="Z E R O"
+ transform="matrix(0.30660307,0,0,-0.30660307,11.345065,79.172949)"
+ id="text56"
+
style="font-variant:normal;font-weight:600;font-stretch:normal;font-size:31.76px;font-family:'Montserrat
SemiBold';-inkscape-font-specification:Montserrat-SemiBold;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#6f9aa8;fill-opacity:1;fill-rule:nonzero;stroke:none"><path
+ d="m 261.11744,-81.528508 -13.08512,15.97528 h 13.498 v 3.4936 H
242.5696 v -2.76312 l 13.08512,-15.97528 h -12.8628 v -3.4936 h 18.32552 z"
+ id="path963" /><path
+ d="m 278.20424,-71.651148 v 6.12968 h 12.5452 v 3.46184 h -16.674 v
-22.232 h 16.22936 v 3.46184 h -12.10056 v 5.78032 h 10.73488 v 3.39832 z"
+ id="path965" /><path
+ d="m 323.11279,-62.059628 h -4.4464 l -4.54168,-6.5108 q
-0.28584,0.03176 -0.85752,0.03176 h -5.01808 v 6.47904 h -4.1288 v -22.232 h
9.14688 q 2.89016,0 5.01808,0.9528 2.15968,0.9528 3.30304,2.73136
1.14336,1.77856 1.14336,4.22408 0,2.50904 -1.23864,4.31936 -1.20688,1.81032
-3.4936,2.6996 z m -4.54168,-14.32376 q 0,-2.12792 -1.39744,-3.27128
-1.39744,-1.14336 -4.09704,-1.14336 h -4.82752 v 8.86104 h 4.82752 q 2.6996,0
4.09704,-1.14336 1.39744,-1.17512 1.39744,-3.30304 z"
+ id="path967" /><path
+ d="m 346.48809,-61.742028 q -3.39832,0 -6.12968,-1.46096
-2.73136,-1.49272 -4.2876,-4.09704 -1.55624,-2.63608 -1.55624,-5.8756
0,-3.23952 1.55624,-5.84384 1.55624,-2.63608 4.2876,-4.09704 2.73136,-1.49272
6.12968,-1.49272 3.39832,0 6.12968,1.49272 2.73136,1.46096 4.2876,4.06528
1.55624,2.60432 1.55624,5.8756 0,3.27128 -1.55624,5.8756 -1.55624,2.60432
-4.2876,4.09704 -2.73136,1.46096 -6.12968,1.46096 z m 0,-3.62064 q 2.2232,0
4.00176,-0.98456 1.77856,-1.01632 2.79488,-2.79488 1.016 [...]
+ id="path969" /></g><g
+ aria-label="D I S C O V E R Y"
+ transform="matrix(0.30660307,0,0,-0.30660307,11.345065,79.172949)"
+ id="text56-9"
+
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:20px;font-family:'Montserrat
SemiBold';-inkscape-font-specification:'Montserrat SemiBold,
Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#6f9aa8;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1"><path
+ d="m 241.4057,-36.53109 v -14 h 6.12 q 2.24,0 3.98,0.88 1.74,0.86
2.7,2.46 0.96,1.58 0.96,3.66 0,2.08 -0.96,3.68 -0.96,1.58 -2.7,2.46 -1.74,0.86
-3.98,0.86 z m 6,-2.2 q 1.54,0 2.7,-0.58 1.18,-0.6 1.8,-1.68 0.64,-1.1
0.64,-2.54 0,-1.44 -0.64,-2.52 -0.62,-1.1 -1.8,-1.68 -1.16,-0.6 -2.7,-0.6 h
-3.4 v 9.6 z"
+ id="path972" /><path
+ d="m 266.04564,-36.53109 h -2.6 v -14 h 2.6 z"
+ id="path974" /><path
+ d="m 279.68559,-36.33109 q -1.62,0 -3.14,-0.46 -1.5,-0.46 -2.38,-1.22 l
0.9,-2.02 q 0.86,0.68 2.1,1.12 1.26,0.42 2.52,0.42 1.56,0 2.32,-0.5 0.78,-0.5
0.78,-1.32 0,-0.6 -0.44,-0.98 -0.42,-0.4 -1.08,-0.62 -0.66,-0.22 -1.8,-0.5
-1.6,-0.38 -2.6,-0.76 -0.98,-0.38 -1.7,-1.18 -0.7,-0.82 -0.7,-2.2 0,-1.16
0.62,-2.1 0.64,-0.96 1.9,-1.52 1.28,-0.56 3.12,-0.56 1.28,0 2.52,0.32 1.24,0.32
2.14,0.92 l -0.82,2.02 q -0.92,-0.54 -1.92,-0.82 -1,-0.28 -1.94,-0.28 -1.54,0
-2.3,0.52 -0.74,0.52 -0.74,1 [...]
+ id="path976" /><path
+ d="m 299.92557,-36.33109 q -2.12,0 -3.84,-0.92 -1.7,-0.94 -2.68,-2.58
-0.96,-1.64 -0.96,-3.7 0,-2.06 0.98,-3.7 0.98,-1.64 2.68,-2.56 1.72,-0.94
3.84,-0.94 1.72,0 3.14,0.6 1.42,0.6 2.4,1.74 l -1.68,1.58 q -1.52,-1.64
-3.74,-1.64 -1.44,0 -2.58,0.64 -1.14,0.62 -1.78,1.74 -0.64,1.12 -0.64,2.54
0,1.42 0.64,2.54 0.64,1.12 1.78,1.76 1.14,0.62 2.58,0.62 2.22,0 3.74,-1.66 l
1.68,1.6 q -0.98,1.14 -2.42,1.74 -1.42,0.6 -3.14,0.6 z"
+ id="path978" /><path
+ d="m 320.04553,-36.33109 q -2.14,0 -3.86,-0.92 -1.72,-0.94 -2.7,-2.58
-0.98,-1.66 -0.98,-3.7 0,-2.04 0.98,-3.68 0.98,-1.66 2.7,-2.58 1.72,-0.94
3.86,-0.94 2.14,0 3.86,0.94 1.72,0.92 2.7,2.56 0.98,1.64 0.98,3.7 0,2.06
-0.98,3.7 -0.98,1.64 -2.7,2.58 -1.72,0.92 -3.86,0.92 z m 0,-2.28 q 1.4,0
2.52,-0.62 1.12,-0.64 1.76,-1.76 0.64,-1.14 0.64,-2.54 0,-1.4 -0.64,-2.52
-0.64,-1.14 -1.76,-1.76 -1.12,-0.64 -2.52,-0.64 -1.4,0 -2.52,0.64 -1.12,0.62
-1.76,1.76 -0.64,1.12 -0.64,2.52 0,1.4 0.64, [...]
+ id="path980" /><path
+ d="m 341.3655,-39.73109 4.7,-10.8 h 2.6 l -6.1,14 h -2.56 l -6.12,-14 h
2.82 z"
+ id="path982" /><path
+ d="m 358.56544,-42.57109 v 3.86 h 7.9 v 2.18 h -10.5 v -14 h 10.22 v
2.18 h -7.62 v 3.64 h 6.76 v 2.14 z"
+ id="path984" /><path
+ d="m 386.84539,-36.53109 h -2.8 l -2.86,-4.1 q -0.18,0.02 -0.54,0.02 h
-3.16 v 4.08 h -2.6 v -14 h 5.76 q 1.82,0 3.16,0.6 1.36,0.6 2.08,1.72 0.72,1.12
0.72,2.66 0,1.58 -0.78,2.72 -0.76,1.14 -2.2,1.7 z m -2.86,-9.02 q 0,-1.34
-0.88,-2.06 -0.88,-0.72 -2.58,-0.72 h -3.04 v 5.58 h 3.04 q 1.7,0 2.58,-0.72
0.88,-0.74 0.88,-2.08 z"
+ id="path986" /><path
+ d="m 403.98536,-50.53109 h 2.56 l -5.48,9.06 v 4.94 h -2.6 v -4.9 l
-5.5,-9.1 h 2.78 l 4.1,6.82 z"
+ id="path988" /></g></g>
+
+
+
+
+
+
+</g></svg>
diff --git a/template/about.html.j2 b/template/about.html.j2
index cd81e67e..81976c42 100644
--- a/template/about.html.j2
+++ b/template/about.html.j2
@@ -134,6 +134,12 @@
We are grateful for past funding from the following organizations:
{% endtrans %}
<ul>
+ <li>
+ <p>
+ <a href="https://nlnet.nl/discovery/";>NGI DISCOVERY</a> [<a
href="https://nlnet.nl/project/GNS/";>Project summary</a>]<br>
+ <img style="width: 35%" src="{{ url('images/ngi_discovery.svg')
}}" alt="NGI DISCOVERY logo">
+ </p>
+ </li>
<li>
<p>
<a href="https://wiki.geant.org/display/NGITrust/";>GEANT NGI
TRUST</a> [<a href="{{ url_localized('news/2021-05-DISSENS.html') }}">Project
report</a>]<br>
diff --git a/template/news/2022-10-0.18.0.html.j2
b/template/news/2022-10-0.18.0.html.j2
index 8b15ade6..0836b32d 100644
--- a/template/news/2022-10-0.18.0.html.j2
+++ b/template/news/2022-10-0.18.0.html.j2
@@ -23,7 +23,7 @@
of use, but also some critical privacy issues especially for mobile users.
Also, the nascent network is tiny and thus unlikely to
provide good anonymity or extensive amounts of interesting information.
- As a result, the 0.17.0 release is still <b>only suitable for early adopters
+ As a result, the 0.18.0 release is still <b>only suitable for early adopters
with some reasonable pain tolerance</b>.
</p>
<h4>Download links</h4>
@@ -89,6 +89,9 @@
<h4>Thanks</h4>
<p>
This release was the work of many people. The following people contributed
code and were thus easily identified:
- Christian Grothoff, Tristan Schwieren, madmurphy, Willow Liquorice,
t3sserakt, TheJackiMonster and Martin Schanzenbach.
+ Bernd Fix, Christian Grothoff, Tristan Schwieren, madmurphy, Willow
Liquorice, t3sserakt, TheJackiMonster and Martin Schanzenbach.
+ We are greatful for funding from <a href="https://nlnet.nl/discovery/";>NGI
Zero DISCOVERY</a> that
+ has supported several developers over the last four years to work on the
+ <a href="../gns.html">GNU Name System</a> and related subsystems.
</p>
{% endblock body_content %}
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [www] branch stable updated (5340517b -> 92b5017c),
gnunet <=