summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWerner Almesberger <werner@almesberger.net>2015-09-07 14:53:26 -0300
committerWerner Almesberger <werner@almesberger.net>2015-09-07 14:53:26 -0300
commitc95b23b7cbc146f2396c2c00d39ac05091549867 (patch)
tree73482567faa290c67febab569e4367fd994d85ed
parentf59825ca881c54fe0088de593ce82f17899ad9af (diff)
parentd0605b9ffb797e756fd3cdee3c063abb5e1ccfa7 (diff)
downloadwww-c95b23b7cbc146f2396c2c00d39ac05091549867.tar.gz
www-c95b23b7cbc146f2396c2c00d39ac05091549867.tar.bz2
www-c95b23b7cbc146f2396c2c00d39ac05091549867.zip
Merge branch 'master' of ssh://neo900.org:22022/~/www
-rw-r--r--content/0018-neo900-on-chaos-communication-camp-2015.html4
-rw-r--r--content/pages/resources.html12
-rw-r--r--content/ublog/1441119040.html13
-rw-r--r--content/ublog/1441376565.html13
-rw-r--r--content/ublog/1441377291.html13
-rw-r--r--theme/templates/index.html7
6 files changed, 55 insertions, 7 deletions
diff --git a/content/0018-neo900-on-chaos-communication-camp-2015.html b/content/0018-neo900-on-chaos-communication-camp-2015.html
index 930d7a8..a98aa6d 100644
--- a/content/0018-neo900-on-chaos-communication-camp-2015.html
+++ b/content/0018-neo900-on-chaos-communication-camp-2015.html
@@ -9,6 +9,10 @@
be present at
<a href="https://events.ccc.de/camp/2015/wiki/Main_Page">CCCamp2015</a> next week near Berlin!</p>
+<div style="font-family: Open Sans, sans; float: right; width: 45%; max-width: 600px; display: block; padding: 9.5px; margin: 0px 0px 10px 20px; line-height: 1.42857; color: #333; background-color: #F5F5F5; border: 1px solid #CCC; border-radius: 4px;">
+<p><strong>UPDATE:</strong> the talks are available at our <a href="/resources">resources page</a>!</p>
+</div>
+
<p>We will have the following presentations:</p>
<ul>
diff --git a/content/pages/resources.html b/content/pages/resources.html
index cf7015f..adac5bc 100644
--- a/content/pages/resources.html
+++ b/content/pages/resources.html
@@ -42,12 +42,16 @@
<h4>Talks and presentations</h4>
<ul>
- <li><strong>Neo900 - the next N900</strong> - <a target="_blank" href="http://neo900.org/stuff/Neo900_the_next_N900_-_Dr_H_Nikolaus_Schaller.pdf">PDF</a>, <a target="_blank" href="http://neo900.org/stuff/Neo900_the_next_N900_-_Dr_H_Nikolaus_Schaller.mp4">MP4</a>, <a target="_blank" href="/ohsw2013">YouTube</a><br/>
- Dr. H. Nikolaus Schaller; <em>OpenPhoenux Hard &amp; Software Workshop, Garching, 30.11.2013</em></li>
- <li><strong>Free Mobile - when Android is not enough</strong> - <a target="_blank" href="http://neo900.org/stuff/piwo/piwo.pdf">PDF</a>, <a target="_blank" href="http://neo900.org/stuff/piwo/wolne-mobilne-gdy-android-to-za-malo.ogg">OGG Vorbis (Polish)</a><br/>
- Sebastian Krzyszkowiak; <em>Poznańska Impreza Wolnego Oprogramowania, Poznań, 17.05.2014</em></li>
+ <li><strong>The Neo900 Open Smartphone: A platform with new security features</strong> - <a href="http://neo900.org/stuff/cccamp15/ccc2015talk/talk.pdf" target="_blank">PDF</a>, <a href="http://neo900.org/stuff/cccamp15/ccc2015talk/neo900-wpwrak_CCC2015.webm" target="_blank">WebM</a><br/>
+ Werner Almesberger; <em>Chaos Communication Camp 2015, Zehdenick, 16.08.2015</em></li>
+ <li><strong>Neo900: Lightning talk</strong> - <a href="http://neo900.org/stuff/cccamp15/lightningtalk.mp4" target="_blank">MP4</a>, <a href="https://youtu.be/aqS9bAMECh0?t=24m" target="_blank">YouTube</a><br/>
+ Werner Almesberger; <em>Chaos Communication Camp 2015, Zehdenick, 14.08.2015</em></li>
<li><strong>Neo900: Crafting The Private Phone</strong> - <a href="http://neo900.org/stuff/ohsw2014/ohsw2014.pdf" target="_blank">PDF</a>, <a href="http://neo900.org/stuff/ohsw2014/OHSW14%20-%20Neo900-ahPFCFooBv0.mp4" target="_blank">MP4</a>, <a href="/ohsw2014" target="_blank">YouTube</a><br/>
Sebastian Krzyszkowiak; <em>OpenPhoenux Hard &amp; Software Workshop, Garching, 29.11.2014</em></li>
+ <li><strong>Free Mobile - when Android is not enough</strong> - <a target="_blank" href="http://neo900.org/stuff/piwo/piwo.pdf">PDF</a>, <a target="_blank" href="http://neo900.org/stuff/piwo/wolne-mobilne-gdy-android-to-za-malo.ogg">OGG Vorbis (Polish)</a><br/>
+ Sebastian Krzyszkowiak; <em>Poznańska Impreza Wolnego Oprogramowania, Poznań, 17.05.2014</em></li>
+ <li><strong>Neo900 - the next N900</strong> - <a target="_blank" href="http://neo900.org/stuff/Neo900_the_next_N900_-_Dr_H_Nikolaus_Schaller.pdf">PDF</a>, <a target="_blank" href="http://neo900.org/stuff/Neo900_the_next_N900_-_Dr_H_Nikolaus_Schaller.mp4">MP4</a>, <a target="_blank" href="/ohsw2013">YouTube</a><br/>
+ Dr. H. Nikolaus Schaller; <em>OpenPhoenux Hard &amp; Software Workshop, Garching, 30.11.2013</em></li>
</ul>
<h4>Videos</h4>
diff --git a/content/ublog/1441119040.html b/content/ublog/1441119040.html
new file mode 100644
index 0000000..de762ef
--- /dev/null
+++ b/content/ublog/1441119040.html
@@ -0,0 +1,13 @@
+<html>
+<head>
+<title>Microblog: 2015-09-01 16:50:40</title>
+<meta name="date" content="2015-09-01 16:50:40" />
+<meta name="url" content="category/ublog" />
+<meta name="save_as" content="ublog/1441119040.html" />
+<meta name="author" content="Joerg" />
+</head>
+<body>
+PayPal payment presumably back to normal during next 72h. Sorry for inconvenience. jOERG
+
+</body>
+</html>
diff --git a/content/ublog/1441376565.html b/content/ublog/1441376565.html
new file mode 100644
index 0000000..2c5e61d
--- /dev/null
+++ b/content/ublog/1441376565.html
@@ -0,0 +1,13 @@
+<html>
+<head>
+<title>Microblog: 2015-09-04 16:22:45</title>
+<meta name="date" content="2015-09-04 16:22:45" />
+<meta name="url" content="category/ublog" />
+<meta name="save_as" content="ublog/1441376565.html" />
+<meta name="author" content="Joerg" />
+</head>
+<body>
+PayPal payment is possible again. Please, if feasible at all, use bank transfer SEPA/SWIFT nevertheless. Sorry for the inconvenience.jOERG
+
+</body>
+</html>
diff --git a/content/ublog/1441377291.html b/content/ublog/1441377291.html
new file mode 100644
index 0000000..afe7320
--- /dev/null
+++ b/content/ublog/1441377291.html
@@ -0,0 +1,13 @@
+<html>
+<head>
+<title>Microblog: 2015-09-04 16:34:51</title>
+<meta name="date" content="2015-09-04 16:34:51" />
+<meta name="url" content="category/ublog" />
+<meta name="save_as" content="ublog/1441377291.html" />
+<meta name="author" content="Joerg" />
+</head>
+<body>
+We gonna order N900 mech parts 1st batch next week. Please place your preorder *now* if you want to be part of 1st batch. jOERG
+
+</body>
+</html>
diff --git a/theme/templates/index.html b/theme/templates/index.html
index 05ecd15..da49ee4 100644
--- a/theme/templates/index.html
+++ b/theme/templates/index.html
@@ -25,13 +25,14 @@
</div>
<h1 style="display: inline-block; color: #555">News</h1>
<div style="display: inline-block; padding-left:15px">
- <h4 style="font-weight: bold"><a href="{{ SITEURL }}/{{ category[1][0].url }}">{{ category[1][0].title }}</a></h4>
- <p class="text-muted" style="font-size: 0.75em">{{ category[1][0].locale_date }}</p>
+ <h4 style="font-weight: bold">Neo900 on Chaos Communication Camp 2015</h4>
+ <p class="text-muted" style="font-size: 0.75em">Aug 31, 2015</p>
</div>
<div style="height: 450px; max-height: 400px; overflow: hidden; position: relative">
<p class="lead" style="margin: 1em 0 0.5em">
- The Neo900 project will be present at <a href="https://events.ccc.de/camp/2015/wiki/Main_Page">CCCamp2015</a> next week near Berlin. If you happen to be there, feel invited to join us at <a href="https://events.ccc.de/camp/2015/wiki/Village:Neo">the Neo village</a>!
+ The Neo900 project was present at <a href="https://events.ccc.de/camp/2015/wiki/Main_Page">CCCamp2015</a> at <a href="https://events.ccc.de/camp/2015/wiki/Village:Neo">the Neo village</a>.
+ Check out the talks we were giving there at our <a href="/resources">resources page</a>!
</p>
<p style="text-align: center">