3.1.0, standard formatting

OakLabsInc · Jun 27, 2017 · 233999e · 233999e
1 parent cdfd54b
commit 233999e
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 2,321 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:7.9.0-slim
+FROM node:7.4.0-slim
 
 ARG DEBIAN_FRONTEND=noninteractive
 ARG NPM_REGISTRY_URL=https://registry.npmjs.org/

diff --git a/build.sh b/build.sh
@@ -1,11 +1,11 @@
 #!/bin/bash -e
 
-OAK_VERSION="3.1.0-rc2";
+OAK_VERSION="3.1.0";
 BASE="oaklabs/oak:$OAK_VERSION";
 
 # our FROM line in the Dockerfile, should ideally match the current electron node version
 FROM="node";
-NODE_VERSION="7.9.0";
+NODE_VERSION="7.4.0";
 FROM_TAG="$NODE_VERSION-slim";
 
 NPM_URL="https://registry.npmjs.org/";

diff --git a/lib/core.js b/lib/core.js
@@ -31,17 +31,17 @@ class Core extends EventEmitter2 {
 
     app.on('certificate-error', (event, webContents, url, error, certificate, cb) => {
       let { host } = parse(url)
+      let isTrusted = false
       if (_.filter(_this.sslExceptions, pat => minimatch(host, pat))) {
         _this.log.debug({
           name: 'ignoring SSL certificate error',
           url,
           host
         })
         event.preventDefault()
-        cb(true)
-      } else {
-        cb(false)
+        isTrusted = true
       }
+      cb(isTrusted)
     })
 
     app.on('window-all-closed', function () {

diff --git a/manifest.yml b/manifest.yml
@@ -1,14 +1,14 @@
-image: oaklabs/oak:3.1.0-rc2
+image: oaklabs/oak:3.1.0
 manifests:
-  - image: oaklabs/oak:3.1.0-rc2-arm
+  - image: oaklabs/oak:3.1.0-arm
     platform:
       architecture: arm
       os: linux
-  - image: oaklabs/oak:3.1.0-rc2-arm64
+  - image: oaklabs/oak:3.1.0-arm64
     platform:
       architecture: arm64
       os: linux
-  - image: oaklabs/oak:3.1.0-rc2-amd64
+  - image: oaklabs/oak:3.1.0-amd64
     platform:
       architecture: amd64
       os: linux
diff --git a/package.json b/package.json
@@ -1,9 +1,9 @@
 {
   "name": "oak",
-  "version": "3.1.0-rc2",
+  "version": "3.1.0",
   "description": "A very opinionated kiosk framework based on Electron",
   "engines": {
-    "node": "7.9.0"
+    "node": "7.4.0"
   },
   "scripts": {
     "coverage": "node node_modules/.bin/istanbul cover node_modules/.bin/tape test/*.js || true",
@@ -28,7 +28,7 @@
   "dependencies": {
     "append-query": "~2.0.1",
     "commander": "~2.9.0",
-    "electron": "1.7.3",
+    "electron": "1.6.11",
     "eventemitter2": "~0.4.14",
     "lodash": "~4.17.2",
     "minimatch": "~3.0.4",

diff --git a/readme.md b/readme.md
@@ -1,5 +1,5 @@
 # Oak
-[![release](https://img.shields.io/badge/release-v3.1.0-rc2-green.svg)](https://github.com/OakLabsInc/oak/releases/tag/3.1.0-rc2)
+[![release](https://img.shields.io/badge/release-v3.1.0-green.svg)](https://github.com/OakLabsInc/oak/releases/tag/3.1.0)
 [![node](https://img.shields.io/badge/node-v7.4.0-green.svg)](https://github.com/nodejs/node/releases/tag/v7.4.0)
 [![electron](https://img.shields.io/badge/electron-v1.6.11-green.svg)](https://github.com/electron/electron/releases/tag/v1.6.11)
 [![Coverage Status](https://coveralls.io/repos/github/OakLabsInc/oak/badge.svg?branch=master&t=zYcBU6)](https://coveralls.io/github/OakLabsInc/oak?branch=master)