summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhellekin <hellekin@dyne.org>2017-01-15 18:07:02 (GMT)
committerhellekin <hellekin@dyne.org>2017-01-15 18:07:02 (GMT)
commite6e3f73b1797cfb58a63250e08682dce1f6c0452 (patch)
tree4e11aaf35bcbb3f8b7bba478721dbc742ed894cb
parentdf25af4baee04bd1d5fea0985bd8c7b7c7227939 (diff)
parente9c14f35b8d3267d9f1164cdead8d7e7af5e4c59 (diff)
downloadwww-e6e3f73b1797cfb58a63250e08682dce1f6c0452.zip
www-e6e3f73b1797cfb58a63250e08682dce1f6c0452.tar.gz
www-e6e3f73b1797cfb58a63250e08682dce1f6c0452.tar.bz2
Merging master
-rw-r--r--README.md (renamed from README)0
-rw-r--r--content/ublog/1482654859.html15
-rw-r--r--content/weekly/2016-w52.md4
-rw-r--r--theme/templates/index.html6
4 files changed, 20 insertions, 5 deletions
diff --git a/README b/README.md
index 85de6db..85de6db 100644
--- a/README
+++ b/README.md
diff --git a/content/ublog/1482654859.html b/content/ublog/1482654859.html
new file mode 100644
index 0000000..e257530
--- /dev/null
+++ b/content/ublog/1482654859.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <title> Microblog: 2016-12-25 09:34:19 </title>
+ <meta charset="UTF-8">
+ <meta name="date" content="2016-12-25 09:34:19">
+ <meta name="url" content="category/ublog">
+ <meta name="save_as" content="ublog/1482654859.html">
+ <meta name="author" content="">
+</head>
+<body>
+It's Krampus time! <a href="https://neo900.org/news/2016-week-52" target="_blank">https://neo900.org/news/2016-week-52</a>
+
+</body>
+</html>
diff --git a/content/weekly/2016-w52.md b/content/weekly/2016-w52.md
index 4dc86f7..e55cb6d 100644
--- a/content/weekly/2016-w52.md
+++ b/content/weekly/2016-w52.md
@@ -67,8 +67,8 @@ the following changes:
[ir]: /stuff/papers/ir.pdf
-Finally, Joerg is reverse-engineering the Enhanced Interface Control
-(ECI) of N900 (which is also present in Neo900) and started
+Finally, Joerg is reverse-engineering the Enhancement Interface
+Control (ECI) of N900 (which is also present in Neo900) and started
[documenting] it. The device's jack can be used to implement a
multibutton-headset control protocol and support headsets with volume
control, play/pause functionality, etc. That means we can have free
diff --git a/theme/templates/index.html b/theme/templates/index.html
index e9e3c4e..6e02a41 100644
--- a/theme/templates/index.html
+++ b/theme/templates/index.html
@@ -30,11 +30,11 @@
<div style="height: 450px; max-height: 400px; overflow: hidden; position: relative">
<p class="lead" style="margin: 1em 0 0.5em">
- <small>2016-11-19</small>
- Last chance to <strong>peer review <em>proto_v2</em> schematics</strong>!
+ <small>2016-12-25</small>
+ It's Krampus time! Enjoy!
</p>
<p style="text-align: center">
- <a href="/news/2016-week-47" class="btn btn-lg btn-default">Read more</a>
+ <a href="/news/2016-week-52" class="btn btn-lg btn-default">Read more</a>
</p>
<hr/>