Skip to content

Commit

Permalink
merge and squash dev into master
Browse files Browse the repository at this point in the history
  • Loading branch information
willpatera committed Jun 1, 2017
2 parents ea6d42d + f805f3f commit 81f320f
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ document.addEventListener("DOMContentLoaded", function(event) {
$(document).ready(function() {
$.ajax({
type: 'GET',
url: "https://api.github.com/repos/pupil-labs/pupil/releases/tag/v0.9.10",
url: "https://api.github.com/repos/pupil-labs/pupil/releases/tags/v0.9.10",
dataType: "jsonp",
success: function(data, textStatus,jaXHR){
var converter = new showdown.Converter();
Expand Down
27 changes: 27 additions & 0 deletions contents/articles/2017-05_pupil-v0912-release-notes/index.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
---
title: Pupil Capture, Player, and Service Release v0.9.12
date: Fri May 23 2017 17:34:00 GMT+0700 (ICT)
author: Pupil Dev Team
subtitle: "We are pleased to announce the latest release of the Pupil Platform v0.9.12..."
tag: {"caption":"v0.9.12","icon":"local_offer"}
---

<script src="//cdn.rawgit.com/showdownjs/showdown/1.3.0/dist/showdown.min.js"></script>
<script type="text/javascript">
document.addEventListener("DOMContentLoaded", function(event) {
$(document).ready(function() {
$.ajax({
type: 'GET',
url: "https://api.github.com/repos/pupil-labs/pupil/releases/tags/v0.9.12",
dataType: "jsonp",
success: function(data, textStatus,jaXHR){
var converter = new showdown.Converter();
var text = data.data.body;
var html = converter.makeHtml(text);
html += '<a href="https://github.com/pupil-labs/pupil/releases/tag/v0.9.12">Download v0.9.12</a>'
$('section[class~="content"]').html(html);
}
});
});
});
</script>
2 changes: 1 addition & 1 deletion templates/manifest.jade
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
| "lang": "en-US",
| "orientation": "portrait",
| "theme_color": "#38ea92",
| "start_url": ".",
| "start_url": "/",
| "background_color": "#38ea92",
| "description": "Pupil Labs - Open source eye tracking.",
| "icons": [
Expand Down

0 comments on commit 81f320f

Please sign in to comment.