summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2014-12-04 20:41:27 +0100
committerChristian Grothoff <christian@grothoff.org>2014-12-04 20:41:27 +0100
commite71a8e49e6c774eff5dffc9aa073dbb645093c96 (patch)
tree8abb7f806968c97dadd16a0551f67cbe829ea47b
parent475c53c123f5721f77c073be271993be9a6a95a2 (diff)
downloadwww-e71a8e49e6c774eff5dffc9aa073dbb645093c96.tar.gz
www-e71a8e49e6c774eff5dffc9aa073dbb645093c96.tar.bz2
www-e71a8e49e6c774eff5dffc9aa073dbb645093c96.zip
posting fossa video
Former-commit-id: eab5ba4e8d5fc9b02df0e619601ff1f1ec0fc9c0
-rw-r--r--images/ccby.pngbin0 -> 4739 bytes
-rw-r--r--images/fossa2014.pngbin0 -> 15400 bytes
-rw-r--r--news.html13
-rw-r--r--videos/grothoff2014fossa.ogv.REMOVED.git-id1
-rw-r--r--videos/grothoff2014fossa.webm.REMOVED.git-id1
5 files changed, 15 insertions, 0 deletions
diff --git a/images/ccby.png b/images/ccby.png
new file mode 100644
index 00000000..822491ed
--- /dev/null
+++ b/images/ccby.png
Binary files differ
diff --git a/images/fossa2014.png b/images/fossa2014.png
new file mode 100644
index 00000000..07196642
--- /dev/null
+++ b/images/fossa2014.png
Binary files differ
diff --git a/news.html b/news.html
index ea0d3a0b..8c864e4e 100644
--- a/news.html
+++ b/news.html
@@ -18,6 +18,19 @@
<!-- Example row of columns -->
<div class="row">
<div class="col-lg-4">
+ <h2>12-2014: Watch Christian Grothoff's FOSSA talk on Taler</h2>
+ <p>
+ <video id="video" poster="/images/fossa2014.png" autobuffer height="360" width="640" controls="controls">
+ <source src="/videos/grothoff2014fossa.webm" type="video/webm">
+ <source src="/videos/grothoff2014fossa.ogv" type="video/ogv">
+ </video>
+ <a rel="license" href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US"><img alt="Creative Commons License" style="border-width:0" src="/images/ccby.png" /></a><br />"<span xmlns:dct="http://purl.org/dc/terms/" property="dct:title">Taler</span>" by <span xmlns:cc="http://creativecommons.org/ns#" property="cc:attributionName">Christian Grothoff, produced by FOSSA, Inria Rennes Bretagne Atlantique</span> is licensed under a <a rel="license" href="https://creativecommons.org/licenses/by-nd/3.0/deed.en_US">Creative Commons Attribution NoDerivatives 3.0 Unported License</a>.
+ </p>
+ </div>
+ </div>
+
+ <div class="row">
+ <div class="col-lg-4">
<h2>11-2014: Launching <tt>taler.net</tt></h2>
<p>Welcome to our new site about the Taler electronic payment system.</p>
</div>
diff --git a/videos/grothoff2014fossa.ogv.REMOVED.git-id b/videos/grothoff2014fossa.ogv.REMOVED.git-id
new file mode 100644
index 00000000..c79e31d8
--- /dev/null
+++ b/videos/grothoff2014fossa.ogv.REMOVED.git-id
@@ -0,0 +1 @@
+9c4c6df94e08531362034ec947a813db27ca6066 \ No newline at end of file
diff --git a/videos/grothoff2014fossa.webm.REMOVED.git-id b/videos/grothoff2014fossa.webm.REMOVED.git-id
new file mode 100644
index 00000000..d76c4a0c
--- /dev/null
+++ b/videos/grothoff2014fossa.webm.REMOVED.git-id
@@ -0,0 +1 @@
+7398eccda11722b00eb0ce8a5c80ed517fb061ae \ No newline at end of file