[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[www] branch stable updated (834f154 -> 812fcd2)
From: |
gnunet |
Subject: |
[www] branch stable updated (834f154 -> 812fcd2) |
Date: |
Sun, 10 Nov 2019 16:14:22 +0100 |
This is an automated email from the git hooks/post-receive script.
martin-schanzenbach pushed a change to branch stable
in repository www.
from 834f154 update text
add dee0c8c ignore .core
add 3a521e8 Merge branch 'master' of gnunet.org:www
add 65f835a Merge branch 'master' of gnunet.org:www
add 60614bd Merge branch 'master' of gnunet.org:www
add 818e50a @ html
add 6246a1a readd current commit
add 94f15e0 allow up to 800 chars
add 1d465c0 Merge branch 'master' of git+ssh://gnunet.org/www
add 75c48fe Merge branch 'master' of gnunet.org:www
new 812fcd2 allow up to 1000 chars
The 1 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:
.gitignore | 2 ++
build-system/taler-build-scripts | 2 +-
news/2019-11-ICANNUpdate.html.j2 | 2 +-
template.py | 2 +-
4 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/.gitignore b/.gitignore
index ffeeaad..f5d1cb1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,5 @@ sitemap.html
futility_engine_loader.sh
config.mk
+
+*.core
diff --git a/build-system/taler-build-scripts b/build-system/taler-build-scripts
index 5c4681c..2536801 160000
--- a/build-system/taler-build-scripts
+++ b/build-system/taler-build-scripts
@@ -1 +1 @@
-Subproject commit 5c4681cf16a996a41b4c50445125810dd99635f0
+Subproject commit 2536801927781ea38fefc3de924934e1c6a74d88
diff --git a/news/2019-11-ICANNUpdate.html.j2 b/news/2019-11-ICANNUpdate.html.j2
index 47bcf2f..3606ff0 100644
--- a/news/2019-11-ICANNUpdate.html.j2
+++ b/news/2019-11-ICANNUpdate.html.j2
@@ -1,6 +1,6 @@
{% extends "common/news.j2" %}
{% block body_content %}
- <h1>GNS@ICANN66</h1>
+ <h1>GNS@ICANN66</h1>
<p>
The <a href="https://meetings.icann.org/en/montreal66">ICANN Annual General
Meeting</a> is concluded. We were invited to join a panel discussion on
<i>Emerging Internet Identifier Technologies</i> in order to share our ideas
and work on the <i>GNU Name System (GNS)</i>. You can find the presentation on
GNS in <a href="{{ url_localized('video.html') }}">our video section</a>. The
handshake.org project, which proposes a decentralized, blockchain-based
governance of the root zone (as oppo [...]
</p>
diff --git a/template.py b/template.py
index 9fe859f..d2dc5a9 100755
--- a/template.py
+++ b/template.py
@@ -166,7 +166,7 @@ def preview_text(filename):
k.append(i)
b = ''.join(str(e) for e in k)
text = b.replace("\n", "")
- textreduced = (text[:300] + '...') if len(text) > 300 else (text +
'..')
+ textreduced = (text[:1000] + '...') if len(text) > 1000 else (text +
'..')
return(textreduced)
--
To stop receiving notification emails like this one, please contact
address@hidden.
- [www] branch stable updated (834f154 -> 812fcd2),
gnunet <=