diff options
author | Christian Grothoff <christian@grothoff.org> | 2019-07-24 19:09:14 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2019-07-24 19:09:14 +0200 |
commit | 5d02d33e4d7e0013d9dff806cf8d74adc82476b9 (patch) | |
tree | 3b33cdfd5e3bc7a24680bd82ea315de4b19a7d31 | |
parent | 84846dd2be3df03aa0d3dd1484af19be4d480f2b (diff) | |
parent | 913f738d8635a0e08b47b20ee7a597303adea263 (diff) | |
download | www-5d02d33e4d7e0013d9dff806cf8d74adc82476b9.tar.gz www-5d02d33e4d7e0013d9dff806cf8d74adc82476b9.zip |
Merge branch 'master' into stable
-rw-r--r-- | template/video.html.j2 | 59 |
1 files changed, 24 insertions, 35 deletions
diff --git a/template/video.html.j2 b/template/video.html.j2 index 7ff610e2..d44e11f2 100644 --- a/template/video.html.j2 +++ b/template/video.html.j2 | |||
@@ -31,7 +31,7 @@ | |||
31 | <div class="row container"> | 31 | <div class="row container"> |
32 | <div class="col-md-5 col-12"> | 32 | <div class="col-md-5 col-12"> |
33 | <video width="100%" height="100%" controls> | 33 | <video width="100%" height="100%" controls> |
34 | <source src="https://git.gnunet.org/gnunet-videos-2019.git/plain/IETF104/GNU_Name_System_-_2019_Edition_IETF104__Christian_Grothoff.mkv" type="video/x-matroska"> | 34 | <source src="https://git.gnunet.org/gnunet-videos-2019.git/plain/IETF104/GNU_Name_System_-_2019_Edition_IETF104__Christian_Grothoff.mkv" type="video/webm"> |
35 | Your browser does not support the video tag. | 35 | Your browser does not support the video tag. |
36 | </video> | 36 | </video> |
37 | </div> | 37 | </div> |
@@ -55,7 +55,7 @@ | |||
55 | <div class="row container"> | 55 | <div class="row container"> |
56 | <div class="col-md-5 col-12"> | 56 | <div class="col-md-5 col-12"> |
57 | <video width="100%" height="100%" controls> | 57 | <video width="100%" height="100%" controls> |
58 | <source src="https://git.gnunet.org/gnunet-videos-2018.git/plain/hack.lu/Hack.lu_2018_LT_-_GNUnet_-_You_Broke_The_Internet_Lets_Make_A_GNU_One__sva.webm"> | 58 | <source src="https://git.gnunet.org/gnunet-videos-2018.git/plain/hack.lu/Hack.lu_2018_LT_-_GNUnet_-_You_Broke_The_Internet_Lets_Make_A_GNU_One__sva.webm" type="video/webm"> |
59 | Your browser does not support the video tag. | 59 | Your browser does not support the video tag. |
60 | </video> | 60 | </video> |
61 | </div> | 61 | </div> |
@@ -66,7 +66,7 @@ | |||
66 | <div class="row container"> | 66 | <div class="row container"> |
67 | <div class="col-md-5 col-12"> | 67 | <div class="col-md-5 col-12"> |
68 | <video width="100%" height="100%" controls> | 68 | <video width="100%" height="100%" controls> |
69 | <source src="https://git.gnunet.org/gnunet-videos-2018.git/plain/GNS_-_The_GNU_Name_System_-_Overview.mkv"> | 69 | <source src="https://git.gnunet.org/gnunet-videos-2018.git/plain/GNS_-_The_GNU_Name_System_-_Overview.mkv" type="video/webm"> |
70 | Your browser does not support the video tag. | 70 | Your browser does not support the video tag. |
71 | </video> | 71 | </video> |
72 | </div> | 72 | </div> |
@@ -80,7 +80,7 @@ | |||
80 | <div class="row container"> | 80 | <div class="row container"> |
81 | <div class="col-md-5 col-12"> | 81 | <div class="col-md-5 col-12"> |
82 | <video width="100%" height="100%" controls> | 82 | <video width="100%" height="100%" controls> |
83 | <source src="https://git.gnunet.org/gnunet-videos-2017.git/plain/34c3/34c3-chaoswest-1-eng-Three_Ways_to_Enhance_Metadata_Protection_Beyond_Tor_-_secushareorg_webm-hd.webm"> | 83 | <source src="https://git.gnunet.org/gnunet-videos-2017.git/plain/34c3/34c3-chaoswest-1-eng-Three_Ways_to_Enhance_Metadata_Protection_Beyond_Tor_-_secushareorg_webm-hd.webm" type="video/webm"> |
84 | Your browser does not support the video tag. | 84 | Your browser does not support the video tag. |
85 | </video> | 85 | </video> |
86 | </div> | 86 | </div> |
@@ -91,7 +91,7 @@ | |||
91 | <div class="row container"> | 91 | <div class="row container"> |
92 | <div class="col-md-5 col-12"> | 92 | <div class="col-md-5 col-12"> |
93 | <video width="100%" height="100%" controls> | 93 | <video width="100%" height="100%" controls> |
94 | <source src="https://git.gnunet.org/gnunet-videos-2017.git/plain/34c3/34c3-chaoswest-2-eng-Modeling_Trust_in_a_Distributed_Private_Social_Network_-_secushareorg_webm-hd.webm"> | 94 | <source src="https://git.gnunet.org/gnunet-videos-2017.git/plain/34c3/34c3-chaoswest-2-eng-Modeling_Trust_in_a_Distributed_Private_Social_Network_-_secushareorg_webm-hd.webm" type="video/webm"> |
95 | Your browser does not support the video tag. | 95 | Your browser does not support the video tag. |
96 | </video> | 96 | </video> |
97 | </div> | 97 | </div> |
@@ -102,7 +102,7 @@ | |||
102 | <div class="row container"> | 102 | <div class="row container"> |
103 | <div class="col-md-5 col-12"> | 103 | <div class="col-md-5 col-12"> |
104 | <video width="100%" height="100%" controls> | 104 | <video width="100%" height="100%" controls> |
105 | <source src="https://git.gnunet.org/gnunet-videos-2017.git/plain/34c3/34c3-chaoswest-7-eng-Scalable_and_privacy-respectful_distributed_systems_-_Our_chance_to_avoid_cloud_computing_webm-hd.webm"> | 105 | <source src="https://git.gnunet.org/gnunet-videos-2017.git/plain/34c3/34c3-chaoswest-7-eng-Scalable_and_privacy-respectful_distributed_systems_-_Our_chance_to_avoid_cloud_computing_webm-hd.webm" type="video/webm"> |
106 | Your browser does not support the video tag. | 106 | Your browser does not support the video tag. |
107 | </video> | 107 | </video> |
108 | </div> | 108 | </div> |
@@ -113,7 +113,7 @@ | |||
113 | <div class="row container"> | 113 | <div class="row container"> |
114 | <div class="col-md-5 col-12"> | 114 | <div class="col-md-5 col-12"> |
115 | <video width="100%" height="100%" controls> | 115 | <video width="100%" height="100%" controls> |
116 | <source src="https://git.gnunet.org/gnunet-videos-2017.git/plain/34c3/34c3-chaoswest-6-eng-Privacy-Oriented_Distributed_Networking_for_an_Ethical_Internet_-_including_50_subsystems_of_GNUnet_webm-hd.webm"> | 116 | <source src="https://git.gnunet.org/gnunet-videos-2017.git/plain/34c3/34c3-chaoswest-6-eng-Privacy-Oriented_Distributed_Networking_for_an_Ethical_Internet_-_including_50_subsystems_of_GNUnet_webm-hd.webm" type="video/webm"> |
117 | Your browser does not support the video tag. | 117 | Your browser does not support the video tag. |
118 | </video> | 118 | </video> |
119 | </div> | 119 | </div> |
@@ -127,7 +127,7 @@ | |||
127 | <div class="row container"> | 127 | <div class="row container"> |
128 | <div class="col-md-5 col-12"> | 128 | <div class="col-md-5 col-12"> |
129 | <video width="100%" height="100%" controls> | 129 | <video width="100%" height="100%" controls> |
130 | <source src="https://git.gnunet.org/gnunet-videos-2016.git/plain/Battlemeshv9/Gnunet%20For%20Mesh%20Communities%20-%20Battlemesh%20v9%20(Porto,%20Portugal).mp4"> | 130 | <source src="https://git.gnunet.org/gnunet-videos-2016.git/plain/Battlemeshv9/Gnunet%20For%20Mesh%20Communities%20-%20Battlemesh%20v9%20(Porto,%20Portugal).mp4" type="video/mp4"> |
131 | Your browser does not support the video tag. | 131 | Your browser does not support the video tag. |
132 | </video> | 132 | </video> |
133 | </div> | 133 | </div> |
@@ -138,7 +138,7 @@ | |||
138 | <div class="row container"> | 138 | <div class="row container"> |
139 | <div class="col-md-5 col-12"> | 139 | <div class="col-md-5 col-12"> |
140 | <video width="100%" height="100%" controls> | 140 | <video width="100%" height="100%" controls> |
141 | <source src="https://git.gnunet.org/gnunet-videos-2015.git/plain/GHM%202015/expose-GNUJeffBurdges19aout2016.mp4"> | 141 | <source src="https://git.gnunet.org/gnunet-videos-2015.git/plain/GHM%202015/expose-GNUJeffBurdges19aout2016.mp4" type="video/mp4> |
142 | Your browser does not support the video tag. | 142 | Your browser does not support the video tag. |
143 | </video> | 143 | </video> |
144 | </div> | 144 | </div> |
@@ -149,7 +149,7 @@ | |||
149 | <div class="row container"> | 149 | <div class="row container"> |
150 | <div class="col-md-5 col-12"> | 150 | <div class="col-md-5 col-12"> |
151 | <video width="100%" height="100%" controls> | 151 | <video width="100%" height="100%" controls> |
152 | <source src="https://git.gnunet.org/gnunet-videos-2016.git/plain/Datenspuren2016/DS2016-7775-deu-Secushare_webm-hd.webm"> | 152 | <source src="https://git.gnunet.org/gnunet-videos-2016.git/plain/Datenspuren2016/DS2016-7775-deu-Secushare_webm-hd.webm" type="video/webm"> |
153 | Your browser does not support the video tag. | 153 | Your browser does not support the video tag. |
154 | </video> | 154 | </video> |
155 | </div> | 155 | </div> |
@@ -167,7 +167,7 @@ | |||
167 | <div class="row container"> | 167 | <div class="row container"> |
168 | <div class="col-md-5 col-12"> | 168 | <div class="col-md-5 col-12"> |
169 | <video width="100%" height="100%" controls> | 169 | <video width="100%" height="100%" controls> |
170 | <source src="https://git.gnunet.org/gnunet-videos-2015.git/plain/psc2015/grothoff.webm"> | 170 | <source src="https://git.gnunet.org/gnunet-videos-2015.git/plain/psc2015/grothoff.webm" type="video/webm"> |
171 | Your browser does not support the video tag. | 171 | Your browser does not support the video tag. |
172 | </video> | 172 | </video> |
173 | </div> | 173 | </div> |
@@ -178,7 +178,7 @@ | |||
178 | <div class="row container"> | 178 | <div class="row container"> |
179 | <div class="col-md-5 col-12"> | 179 | <div class="col-md-5 col-12"> |
180 | <video width="100%" height="100%" controls> | 180 | <video width="100%" height="100%" controls> |
181 | <source src="https://git.gnunet.org/gnunet-videos-2015.git/plain/Datenspuren2015/datenspuren15-7069-de-EDN_-_Echt_Dezentrales_Netzwerk_webm.webm"> | 181 | <source src="https://git.gnunet.org/gnunet-videos-2015.git/plain/Datenspuren2015/datenspuren15-7069-de-EDN_-_Echt_Dezentrales_Netzwerk_webm.webm" type="video/webm"> |
182 | Your browser does not support the video tag. | 182 | Your browser does not support the video tag. |
183 | </video> | 183 | </video> |
184 | </div> | 184 | </div> |
@@ -189,7 +189,7 @@ | |||
189 | <div class="row container"> | 189 | <div class="row container"> |
190 | <div class="col-md-5 col-12"> | 190 | <div class="col-md-5 col-12"> |
191 | <video width="100%" height="100%" controls> | 191 | <video width="100%" height="100%" controls> |
192 | <source src="https://git.gnunet.org/gnunet-videos-2015.git/plain/BattleMeshV8/GNUnet%20in%20Community%20Mesh%20Networks%20+%20Slides%20-%20BattleMeshV8.mkv"> | 192 | <source src="https://git.gnunet.org/gnunet-videos-2015.git/plain/BattleMeshV8/GNUnet%20in%20Community%20Mesh%20Networks%20+%20Slides%20-%20BattleMeshV8.mkv" type="video/webm"> |
193 | Your browser does not support the video tag. | 193 | Your browser does not support the video tag. |
194 | </video> | 194 | </video> |
195 | </div> | 195 | </div> |
@@ -204,11 +204,11 @@ | |||
204 | <hr> | 204 | <hr> |
205 | <!-- FIXME: no source link on web. <li>Julian Kirsch, <a href="">"Knocking down the HACIENDA"</a>, GNU Hacker Meeting 2014</li> --> | 205 | <!-- FIXME: no source link on web. <li>Julian Kirsch, <a href="">"Knocking down the HACIENDA"</a>, GNU Hacker Meeting 2014</li> --> |
206 | <!-- FIXME: no source link on web. <li>Peter Schaar, <a href="">"Technik, Recht und Überwachung"</a>, Technische Universität München</li> --> | 206 | <!-- FIXME: no source link on web. <li>Peter Schaar, <a href="">"Technik, Recht und Überwachung"</a>, Technische Universität München</li> --> |
207 | <!-- FIXME: no source link on web. <li>Christian Grothoff, <a href="">"A Public Key Infrastructure for Social Movements in the Age of Universal Surveillance"</a>, Univeristy of Oxford</li> --> | 207 | <!-- FIXME: no source link on web. <li>Christian Grothoff, <a href="">"A Public Key Infrastructure for Social Movements in the Age of Universal Surveillance"</a>, University of Oxford</li> --> |
208 | <div class="row container"> | 208 | <div class="row container"> |
209 | <div class="col-md-5 col-12"> | 209 | <div class="col-md-5 col-12"> |
210 | <video width="100%" height="100%" controls> | 210 | <video width="100%" height="100%" controls> |
211 | <source src="https://git.gnunet.org/gnunet-videos-2014.git/plain/31c3/voting-voting.webm"> | 211 | <source src="https://git.gnunet.org/gnunet-videos-2014.git/plain/31c3/voting-voting.webm" type="video/webm"> |
212 | Your browser does not support the video tag. | 212 | Your browser does not support the video tag. |
213 | </video> | 213 | </video> |
214 | </div> | 214 | </div> |
@@ -219,7 +219,7 @@ | |||
219 | <div class="row container"> | 219 | <div class="row container"> |
220 | <div class="col-md-5 col-12"> | 220 | <div class="col-md-5 col-12"> |
221 | <video width="100%" height="100%" controls> | 221 | <video width="100%" height="100%" controls> |
222 | <source src="https://git.gnunet.org/gnunet-videos-2014.git/plain/31c3/freedombox-freedombox.webm"> | 222 | <source src="https://git.gnunet.org/gnunet-videos-2014.git/plain/31c3/freedombox-freedombox.webm" type="video/webm"> |
223 | Your browser does not support the video tag. | 223 | Your browser does not support the video tag. |
224 | </video> | 224 | </video> |
225 | </div> | 225 | </div> |
@@ -230,7 +230,7 @@ | |||
230 | <div class="row container"> | 230 | <div class="row container"> |
231 | <div class="col-md-5 col-12"> | 231 | <div class="col-md-5 col-12"> |
232 | <video width="100%" height="100%" controls> | 232 | <video width="100%" height="100%" controls> |
233 | <source src="https://git.gnunet.org/gnunet-videos-2014.git/plain/31c3/fenrir-fenrir.webm"> | 233 | <source src="https://git.gnunet.org/gnunet-videos-2014.git/plain/31c3/fenrir-fenrir.webm" type="video/webm"> |
234 | Your browser does not support the video tag. | 234 | Your browser does not support the video tag. |
235 | </video> | 235 | </video> |
236 | </div> | 236 | </div> |
@@ -241,18 +241,7 @@ | |||
241 | <div class="row container"> | 241 | <div class="row container"> |
242 | <div class="col-md-5 col-12"> | 242 | <div class="col-md-5 col-12"> |
243 | <video width="100%" height="100%" controls> | 243 | <video width="100%" height="100%" controls> |
244 | <source src="https://git.gnunet.org/gnunet-videos-2014.git/plain/31c3/do-panic-do-panic.webm"> | 244 | <source src="https://git.gnunet.org/gnunet-videos-2014.git/plain/31c3/do-panic-do-panic.webm" type="video/webm"> |
245 | Your browser does not support the video tag. | ||
246 | </video> | ||
247 | </div> | ||
248 | <div class="col"> | ||
249 | https://git.gnunet.org/gnunet-videos-2014.git/plain/31c3/do-panic-do-panic.webm | ||
250 | </div> | ||
251 | </div> | ||
252 | <div class="row container"> | ||
253 | <div class="col-md-5 col-12"> | ||
254 | <video width="100%" height="100%" controls> | ||
255 | <source src=""> | ||
256 | Your browser does not support the video tag. | 245 | Your browser does not support the video tag. |
257 | </video> | 246 | </video> |
258 | </div> | 247 | </div> |
@@ -263,7 +252,7 @@ | |||
263 | <div class="row container"> | 252 | <div class="row container"> |
264 | <div class="col-md-5 col-12"> | 253 | <div class="col-md-5 col-12"> |
265 | <video width="100%" height="100%" controls> | 254 | <video width="100%" height="100%" controls> |
266 | <source src="https://git.gnunet.org/gnunet-videos-2014.git/plain/2014-coe.webm"> | 255 | <source src="https://git.gnunet.org/gnunet-videos-2014.git/plain/2014-coe.webm" type="video/webm"> |
267 | Your browser does not support the video tag. | 256 | Your browser does not support the video tag. |
268 | </video> | 257 | </video> |
269 | </div> | 258 | </div> |
@@ -274,7 +263,7 @@ | |||
274 | <div class="row container"> | 263 | <div class="row container"> |
275 | <div class="col-md-5 col-12"> | 264 | <div class="col-md-5 col-12"> |
276 | <video width="100%" height="100%" controls> | 265 | <video width="100%" height="100%" controls> |
277 | <source src="https://git.gnunet.org/gnunet-videos-2014.git/plain/31c3/taler-taler.webm"> | 266 | <source src="https://git.gnunet.org/gnunet-videos-2014.git/plain/31c3/taler-taler.webm" type="video/webm"> |
278 | Your browser does not support the video tag. | 267 | Your browser does not support the video tag. |
279 | </video> | 268 | </video> |
280 | </div> | 269 | </div> |
@@ -285,7 +274,7 @@ | |||
285 | <div class="row container"> | 274 | <div class="row container"> |
286 | <div class="col-md-5 col-12"> | 275 | <div class="col-md-5 col-12"> |
287 | <video width="100%" height="100%" controls> | 276 | <video width="100%" height="100%" controls> |
288 | <source src="https://git.gnunet.org/gnunet-videos-2014.git/plain/31c3/queries-queries.webm"> | 277 | <source src="https://git.gnunet.org/gnunet-videos-2014.git/plain/31c3/queries-queries.webm" type="video/webm"> |
289 | Your browser does not support the video tag. | 278 | Your browser does not support the video tag. |
290 | </video> | 279 | </video> |
291 | </div> | 280 | </div> |
@@ -296,7 +285,7 @@ | |||
296 | <div class="row container"> | 285 | <div class="row container"> |
297 | <div class="col-md-5 col-12"> | 286 | <div class="col-md-5 col-12"> |
298 | <video width="100%" height="100%" controls> | 287 | <video width="100%" height="100%" controls> |
299 | <source src="https://git.gnunet.org/gnunet-videos-2014.git/plain/31c3/net2o-net2o.webm"> | 288 | <source src="https://git.gnunet.org/gnunet-videos-2014.git/plain/31c3/net2o-net2o.webm" type="video/webm"> |
300 | Your browser does not support the video tag. | 289 | Your browser does not support the video tag. |
301 | </video> | 290 | </video> |
302 | </div> | 291 | </div> |
@@ -313,7 +302,7 @@ | |||
313 | <div class="row container"> | 302 | <div class="row container"> |
314 | <div class="col-md-5 col-12"> | 303 | <div class="col-md-5 col-12"> |
315 | <video width="100%" height="100%" controls> | 304 | <video width="100%" height="100%" controls> |
316 | <source src="https://git.gnunet.org/gnunet-videos-2013.git/plain/you%20broke%20the%20internet/internetistschuld.webm"> | 305 | <source src="https://git.gnunet.org/gnunet-videos-2013.git/plain/you%20broke%20the%20internet/internetistschuld.webm" type="video/webm"> |
317 | Your browser does not support the video tag. | 306 | Your browser does not support the video tag. |
318 | </video> | 307 | </video> |
319 | </div> | 308 | </div> |
@@ -324,7 +313,7 @@ | |||
324 | <div class="row container"> | 313 | <div class="row container"> |
325 | <div class="col-md-5 col-12"> | 314 | <div class="col-md-5 col-12"> |
326 | <video width="100%" height="100%" controls> | 315 | <video width="100%" height="100%" controls> |
327 | <source src="https://audio-video.gnu.org/video/ghm2013/Christian_Grothoff-The_GNU_Name_System_and_the_Future_of_Social_Networking_with_GNUnet_.webm"> | 316 | <source src="https://audio-video.gnu.org/video/ghm2013/Christian_Grothoff-The_GNU_Name_System_and_the_Future_of_Social_Networking_with_GNUnet_.webm" type="video/webm"> |
328 | Your browser does not support the video tag. | 317 | Your browser does not support the video tag. |
329 | </video> | 318 | </video> |
330 | </div> | 319 | </div> |