From 6a89198b3814b713f23aba9cd900bdfaf5a91630 Mon Sep 17 00:00:00 2001 From: Will Patera Date: Fri, 21 Apr 2017 17:51:54 +0700 Subject: [PATCH] merge and squash dev into master --- .../2017-03_new-docs-website/index.md | 4 +-- .../2017-04_pupil-v096-release-notes/index.md | 27 +++++++++++++++++++ contents/media | 2 +- package.json | 1 + yarn.lock | 18 ++++++------- 5 files changed, 40 insertions(+), 12 deletions(-) create mode 100644 contents/articles/2017-04_pupil-v096-release-notes/index.md diff --git a/contents/articles/2017-03_new-docs-website/index.md b/contents/articles/2017-03_new-docs-website/index.md index 5f44268e..9b5c91da 100644 --- a/contents/articles/2017-03_new-docs-website/index.md +++ b/contents/articles/2017-03_new-docs-website/index.md @@ -3,10 +3,10 @@ title: New docs website date: Mon Mar 27 2017 17:44:45 GMT+0200 (CEST) author: Pupil Dev Team subtitle: 'We have transitioned docs to docs.pupil-labs.com' -featured_img_thumb: '' +featured_img_thumb: '../../../../media/images/blog/pupil-docs-web.jpg' --- -Pupil Docs Website +Pupil Docs Website All Pupil documentation - user docs, developer docs, and more - are now at [docs.pupil-labs.com](https://docs.pupil-labs.com "Pupil docs"). diff --git a/contents/articles/2017-04_pupil-v096-release-notes/index.md b/contents/articles/2017-04_pupil-v096-release-notes/index.md new file mode 100644 index 00000000..fe9940d3 --- /dev/null +++ b/contents/articles/2017-04_pupil-v096-release-notes/index.md @@ -0,0 +1,27 @@ +--- +title: Pupil Capture, Player, and Service Release v0.9.6 +date: Friday Apr 20 2017 15:34:00 GMT+0700 (ICT) +author: Pupil Dev Team +subtitle: "We are pleased to announce the latest release of the Pupil Platform v0.9.6..." +tag: {"caption":"v0.9.6","icon":"local_offer"} +--- + + + diff --git a/contents/media b/contents/media index ca2d5aa2..28f5e670 160000 --- a/contents/media +++ b/contents/media @@ -1 +1 @@ -Subproject commit ca2d5aa2cd06998ac40106c45e56f43ef5e109d8 +Subproject commit 28f5e670108ace5f45b726525ce3fc67f9ff0806 diff --git a/package.json b/package.json index a9b7e385..f4076fa0 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,7 @@ "author": "Will Patera ", "license": "CC-BY-NC-SA-4.0", "dependencies": { + "global": "^4.3.2", "moment": "^2.17.1", "typogr": "^0.6.6", "underscore": "^1.8.3", diff --git a/yarn.lock b/yarn.lock index 325db93a..f53563a2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1964,9 +1964,9 @@ global-prefix@^0.1.4: is-windows "^0.2.0" which "^1.2.12" -global@~4.3.0: - version "4.3.1" - resolved "https://registry.yarnpkg.com/global/-/global-4.3.1.tgz#5f757908c7cbabce54f386ae440e11e26b7916df" +global@^4.3.2, global@~4.3.0: + version "4.3.2" + resolved "https://registry.yarnpkg.com/global/-/global-4.3.2.tgz#e76989268a6c74c38908b1305b10fc0e394e9d0f" dependencies: min-document "^2.19.0" process "~0.5.1" @@ -4096,7 +4096,7 @@ read@1, read@~1.0.1, read@~1.0.7: dependencies: mute-stream "~0.0.4" -"readable-stream@1 || 2", readable-stream@^2.0.2, readable-stream@^2.1.5, readable-stream@~2.1.4, readable-stream@~2.1.5: +"readable-stream@1 || 2", "readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.2, readable-stream@^2.1.5, readable-stream@~2.1.4, readable-stream@~2.1.5: version "2.1.5" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.1.5.tgz#66fa8b720e1438b364681f2ad1a63c618448c9d0" dependencies: @@ -4126,7 +4126,7 @@ readable-stream@1.1, readable-stream@~1.1.9: isarray "0.0.1" string_decoder "~0.10.x" -"readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.2.2: +readable-stream@^2.2.2: version "2.2.2" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.2.tgz#a9e6fec3c7dda85f8bb1b3ba7028604556fc825e" dependencies: @@ -4260,7 +4260,7 @@ request-progress@~2.0.1: dependencies: throttleit "^1.0.0" -request@2, request@2.78.0, request@^2.65.0, request@^2.74.0: +request@2, request@2.78.0, request@^2.65.0, request@^2.73.0, request@^2.74.0: version "2.78.0" resolved "https://registry.yarnpkg.com/request/-/request-2.78.0.tgz#e1c8dec346e1c81923b24acdb337f11decabe9cc" dependencies: @@ -4285,7 +4285,7 @@ request@2, request@2.78.0, request@^2.65.0, request@^2.74.0: tough-cookie "~2.3.0" tunnel-agent "~0.4.1" -request@^2.73.0, request@^2.79.0, request@~2.79.0: +request@^2.79.0, request@~2.79.0: version "2.79.0" resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de" dependencies: @@ -4462,11 +4462,11 @@ sax@>=0.6.0: version "1.2.1" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.1.tgz#7b8e656190b228e81a66aea748480d828cd2d37a" -"semver@2 >=2.2.1 || 3.x || 4 || 5", "semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", "semver@^2.3.0 || 3.x || 4 || 5", semver@^5.1.0, semver@^5.2.0, semver@^5.3.0, semver@~5.3.0: +"semver@2 >=2.2.1 || 3.x || 4 || 5", "semver@2 || 3 || 4 || 5", "semver@^2.3.0 || 3.x || 4 || 5", semver@^5.1.0, semver@^5.2.0, semver@^5.3.0, semver@~5.3.0: version "5.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" -semver@^4.1.0: +"semver@2.x || 3.x || 4 || 5", semver@^4.1.0: version "4.3.6" resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da"