summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2018-03-04 00:51:14 +0100
committerChristian Grothoff <christian@grothoff.org>2018-03-04 00:51:14 +0100
commitf7a4f09735fce41cd564a6651316593ceb50cadd (patch)
tree18be57daf0639a3e7928114a4c553037f8e1ed9d
parent8b817fcabdb25500a56e6aa54f3e545958472aba (diff)
downloadwww-f7a4f09735fce41cd564a6651316593ceb50cadd.tar.gz
www-f7a4f09735fce41cd564a6651316593ceb50cadd.tar.bz2
www-f7a4f09735fce41cd564a6651316593ceb50cadd.zip
fix #5292
-rw-r--r--news/2014-11.inc2
-rw-r--r--news/2014-12.inc2
-rw-r--r--news/2015-02.inc2
-rw-r--r--news/2015-11.inc2
-rw-r--r--news/2015-12.inc2
-rw-r--r--news/2016-06.inc2
-rw-r--r--news/2016-08.inc2
-rw-r--r--news/2016-09.inc2
-rw-r--r--news/2016-10.inc2
-rw-r--r--news/2016-12.inc2
-rw-r--r--news/2017-01.inc2
-rw-r--r--news/2017-02.inc2
-rw-r--r--news/2017-03.inc2
-rw-r--r--news/2017-04.inc2
-rw-r--r--news/2017-08.inc2
-rw-r--r--news/2017-10.inc3
m---------web-common0
17 files changed, 16 insertions, 17 deletions
diff --git a/news/2014-11.inc b/news/2014-11.inc
index edb994a5..774a5ac4 100644
--- a/news/2014-11.inc
+++ b/news/2014-11.inc
@@ -1,2 +1,2 @@
- <h3>11-2014: Launching <tt>taler.net</tt></h3>
+ <h3>2014-11: Launching <tt>taler.net</tt></h3>
<p>Welcome to our new site about the Taler electronic payment system.</p>
diff --git a/news/2014-12.inc b/news/2014-12.inc
index a234919c..81455583 100644
--- a/news/2014-12.inc
+++ b/news/2014-12.inc
@@ -1,4 +1,4 @@
- <h3>12-2014: Watch Christian Grothoff's FOSSA talk on Taler</h3>
+ <h3>2014-12: Watch Christian Grothoff's FOSSA talk on Taler</h3>
<p>
<video id="video" poster="/images/fossa2014.png" autobuffer="" height="360" width="640" controls="controls">
<source src="/videos/grothoff2014fossa.webm" type="video/webm">
diff --git a/news/2015-02.inc b/news/2015-02.inc
index 3b168c8f..6840b017 100644
--- a/news/2015-02.inc
+++ b/news/2015-02.inc
@@ -1,4 +1,4 @@
- <h3>2-2015: Taler becomes an official GNU package</h3>
+ <h3>2015-02x: Taler becomes an official GNU package</h3>
<p>Taler was accepted into the GNU project today. GNU will offer advice,
advocacy and cooperation --- and host our official public
mailinglist <a href="mailto:taler@gnu.org">taler@gnu.org</a>.</p> \ No newline at end of file
diff --git a/news/2015-11.inc b/news/2015-11.inc
index df7e3b02..712fcf3c 100644
--- a/news/2015-11.inc
+++ b/news/2015-11.inc
@@ -1,4 +1,4 @@
- <h3>11-2015: Christian Grothoff's explains the goals behind Taler</h3>
+ <h3>2015-11: Christian Grothoff's explains the goals behind Taler</h3>
<p>
<video id="video" poster="/videos/inria2015interview.png" autobuffer="" height="360" width="640" controls="controls">
<source src="/videos/inria2015interview.webm" type="video/webm">
diff --git a/news/2015-12.inc b/news/2015-12.inc
index 5d160355..401166c4 100644
--- a/news/2015-12.inc
+++ b/news/2015-12.inc
@@ -1,4 +1,4 @@
- <h3>12-2015: Taler Demo for Chrome/Chromium online</h3>
+ <h3>2015-12: Taler Demo for Chrome/Chromium online</h3>
<p>We finally have a first simple demo for Taler online. The Firefox-variant
still needs some love, but you can start to try out the demo using
the Chrome/Chromium browser at <a href="https://demo.taler.net/">demo.taler.net</a>.
diff --git a/news/2016-06.inc b/news/2016-06.inc
index 0155fc7b..72744aa6 100644
--- a/news/2016-06.inc
+++ b/news/2016-06.inc
@@ -1,4 +1,4 @@
- <h3>6-2016: GNU Taler 0.0.0 released</h3>
+ <h3>2016-06: GNU Taler 0.0.0 released</h3>
<p>We have reached our first big milestone, the 0.0.0 release!
The release includes implementations of a bank, exchange, merchant and wallet
and is available on the GNU FTP mirrors.
diff --git a/news/2016-08.inc b/news/2016-08.inc
index 73e231f4..00bbe4a9 100644
--- a/news/2016-08.inc
+++ b/news/2016-08.inc
@@ -1,3 +1,3 @@
- <h3>8-2016: Taler Systems S.A. created</h3>
+ <h3>2016-08: Taler Systems S.A. created</h3>
<p>We now have a business entity for Taler. Potential investors may
contact the executive team at <a href="mailto:clevel@taler.net">clevel@taler.net</a>.</p>
diff --git a/news/2016-09.inc b/news/2016-09.inc
index 42dd8577..d9d67c1e 100644
--- a/news/2016-09.inc
+++ b/news/2016-09.inc
@@ -1,4 +1,4 @@
- <h3>9-2016: Taler Web Payments paper published</h3>
+ <h3>2016-09: Taler Web Payments paper published</h3>
<p>We just finished the camera-ready version of our paper on how to use Taler
for Web payments. This paper does not discuss the cryptography behind
Taler, but focuses on the practical aspects of how the wallet and the merchants
diff --git a/news/2016-10.inc b/news/2016-10.inc
index 2f35b2f6..8ad14484 100644
--- a/news/2016-10.inc
+++ b/news/2016-10.inc
@@ -1,4 +1,4 @@
- <h3>10-2016: Taler Wallet for Firefox online</h3>
+ <h3>2016-10: Taler Wallet for Firefox online</h3>
<p>We now have a first version of the Taler wallet for Firefox.
For now, a development build of Firefox is required.
Installation instructions are on the <a href="/wallet">Wallet page</a>.</p>
diff --git a/news/2016-12.inc b/news/2016-12.inc
index d45a4198..5665cef4 100644
--- a/news/2016-12.inc
+++ b/news/2016-12.inc
@@ -1,4 +1,4 @@
- <h3>12-2016: Christian Grothoff explains Taler at hasgeek in Bangalore</h3>
+ <h3>2016-12: Christian Grothoff explains Taler at hasgeek in Bangalore</h3>
<p>
<video id="video" poster="/videos/grothoff2016bangalore.png" autobuffer="" height="360" width="720" controls="controls">
<source src="/videos/grothoff2016bangalore.webm" type="video/webm">
diff --git a/news/2017-01.inc b/news/2017-01.inc
index c9185bc3..49040a1a 100644
--- a/news/2017-01.inc
+++ b/news/2017-01.inc
@@ -1,3 +1,3 @@
- <h3>1-2017: Taler Documentation pages updated</h3>
+ <h3>2017-01: Taler Documentation pages updated</h3>
<p><a href="https://docs.taler.net/">docs.taler.net</a> is now
online, providing a new portal to the Taler system documentation.</p>
diff --git a/news/2017-02.inc b/news/2017-02.inc
index aa825e50..b4de8e49 100644
--- a/news/2017-02.inc
+++ b/news/2017-02.inc
@@ -1,4 +1,4 @@
- <h3>02-2017: Florian Dold explains Taler at 50p in Bangalore</h3>
+ <h3>2017-02: Florian Dold explains Taler at 50p in Bangalore</h3>
<p>
<video id="video" poster="/videos/dold50p.png" autobuffer="" height="360" width="640" controls="controls">
<source src="/videos/dold50p.webm" type="video/webm">
diff --git a/news/2017-03.inc b/news/2017-03.inc
index 4478a038..8d6440ef 100644
--- a/news/2017-03.inc
+++ b/news/2017-03.inc
@@ -1,4 +1,4 @@
- <h3>03-2017: Sva explains GNU Taler at FOSSASIA in Singapore</h3>
+ <h3>2017-03: Sva explains GNU Taler at FOSSASIA in Singapore</h3>
<p>
<video id="video" poster="/videos/taler2017fossasia.png" autobuffer="" height="360" width="640" controls="controls">
<source src="/videos/taler2017fossasia.webm" type="video/webm">
diff --git a/news/2017-04.inc b/news/2017-04.inc
index 50cd9b4c..e67d668d 100644
--- a/news/2017-04.inc
+++ b/news/2017-04.inc
@@ -1,4 +1,4 @@
- <h3>04-2017: Sva explains GNU Taler at EasterHegg and Torsten demonstrates it is child's play</h3>
+ <h3>2017-04: Sva explains GNU Taler at EasterHegg and Torsten demonstrates it is child's play</h3>
<p>
<video id="video" poster="/videos/taler2017eh.png" autobuffer="" height="360" width="640" controls="controls">
<source src="/videos/taler2017eh.webm" type="video/webm">
diff --git a/news/2017-08.inc b/news/2017-08.inc
index d4e0fb7b..38630007 100644
--- a/news/2017-08.inc
+++ b/news/2017-08.inc
@@ -1,4 +1,4 @@
- <h3>08-2017: We explain GNU Taler at SHA 2017</h3>
+ <h3>2017-08: We explain GNU Taler at SHA 2017</h3>
<p>
<video id="video" poster="/videos/sha2017taler.png" autobuffer="" height="360" width="640" controls="controls">
<source src="/videos/sha2017taler.webm" type="video/webm">
diff --git a/news/2017-10.inc b/news/2017-10.inc
index e112a137..d5d5b9f9 100644
--- a/news/2017-10.inc
+++ b/news/2017-10.inc
@@ -1,4 +1,4 @@
- <h3>10-2017: GNU Taler v0.4.0 released</h3>
+ <h3>2017-10: GNU Taler v0.4.0 released</h3>
<p>We are happy to announce the release GNU Taler v0.4.0 with support for customer
refunds, protocol versioning, incremental key material download, returning funds
from the wallet directly back into one's bank account,
@@ -7,4 +7,3 @@
backend and bank components are on the GNU FTP mirrors. Note that the
Firefox wallet will take a few more days to become available in the
App store due to the Mozilla review process.</p>
-
diff --git a/web-common b/web-common
-Subproject dc9d5ab2308fef7cdd1e8c95fbf4fdd51bed7bf
+Subproject caf5a98114402d057ba08b14279eb8e46481a02