roll v1.1.4

AUTHORS.md

@@ -3,3 +3,5 @@
 * tz <[email protected]>
 * Alasdair Mercer <[email protected]>
 * Alexandre Perrin <[email protected]>
+* Michael Mason
+* Benjamin Besse

CHANGES.md

@@ -1,3 +1,9 @@
+## Version 1.1.4, 2015.11.11
+
+* [#2](https://github.com/neocotic/qr.js/issues/2): Fix padding issues
+* [#35](https://github.com/neocotic/qr.js/pull/35): Make the QR-code center-aligned
+* [#38](https://github.com/neocotic/qr.js/pull/38): Update node-canvas dependency version to support Node.js v4 and above
+
 ## Version 1.1.3, 2014.09.01
 
 * [#23](https://github.com/neocotic/qr.js/issues/23): Revert back to [GPL License][]

LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (C) 2014 Alasdair Mercer, http://neocotic.com
+Copyright (C) 2015 Alasdair Mercer, http://neocotic.com
 
 This program is free software: you can redistribute it and/or modify  
 it under the terms of the GNU General Public License as published by  

README.md

@@ -247,7 +247,7 @@ This is really just intended for use within a browser.
 The current version of `qr`.
 
 ``` javascript
-console.log(qr.VERSION); // "1.1.3"
+console.log(qr.VERSION); // "1.1.4"
 ```
 
 ## Canvas Support

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "qr-js",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "Library for QR code generation using canvas",
   "homepage": "http://neocotic.com/qr.js",
   "authors": [
@@ -20,7 +20,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "git://github.com/neocotic/qr.js.git"
+    "url": "https://github.com/neocotic/qr.js.git"
   },
   "main": "qr.min.js",
   "ignore": [

docs/docco.css

@@ -21,11 +21,11 @@
 }
 
 @font-face {
-    font-family: 'novecento-bold';
-    src: url('public/fonts/novecento-bold.eot');
-    src: url('public/fonts/novecento-bold.eot?#iefix') format('embedded-opentype'),
-         url('public/fonts/novecento-bold.woff') format('woff'),
-         url('public/fonts/novecento-bold.ttf') format('truetype');
+    font-family: 'roboto-black';
+    src: url('public/fonts/roboto-black.eot');
+    src: url('public/fonts/roboto-black.eot?#iefix') format('embedded-opentype'),
+         url('public/fonts/roboto-black.woff') format('woff'),
+         url('public/fonts/roboto-black.ttf') format('truetype');
     font-weight: normal;
     font-style: normal;
 }
@@ -67,14 +67,17 @@ h1, h2, h3, h4, h5, h6 {
   color: #112233;
   line-height: 1em;
   font-weight: normal;
-  font-family: "novecento-bold";
+  font-family: "roboto-black";
   text-transform: uppercase;
   margin: 30px 0 15px 0;
 }
 
 h1 {
   margin-top: 40px;
 }
+h2 {
+  font-size: 1.26em;
+}
 
 hr {
   border: 0;
@@ -180,9 +183,18 @@ ul.sections > li > div {
   display: block;
 }
 
+#jump_page_wrapper{
+  position: fixed;
+  right: 0;
+  top: 0;
+  bottom: 0;
+}
+
 #jump_page {
   padding: 5px 0 3px;
   margin: 0 0 25px 25px;
+  max-height: 100%;
+  overflow: auto;
 }
 
 #jump_page .source {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "qr-js",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "Library for QR code generation using canvas",
   "homepage": "http://neocotic.com/qr.js",
   "bugs": {
@@ -11,12 +11,7 @@
     "email": "[email protected]",
     "url": "http://neocotic.com"
   },
-  "licenses": [
-    {
-      "type": "GPL-3.0",
-      "url": "https://github.com/neocotic/qr.js/raw/master/LICENSE.md"
-    }
-  ],
+  "license": "GPL-3.0",
   "keywords": [
     "qr",
     "code",
@@ -26,16 +21,17 @@
   ],
   "repository": {
     "type": "git",
-    "url": "git://github.com/neocotic/qr.js.git"
+    "url": "https://github.com/neocotic/qr.js.git"
   },
   "dependencies": {
-    "canvas": "~1.2.9"
+    "canvas": "^1.3.1"
   },
   "devDependencies": {
-    "grunt": "~0.4.5",
-    "grunt-contrib-jshint": "~0.10.0",
-    "grunt-contrib-uglify": "~0.5.1",
-    "grunt-docco": "~0.3.3"
+    "grunt": "^0.4.5",
+    "grunt-cli": "^0.1.13",
+    "grunt-contrib-jshint": "^0.11.3",
+    "grunt-contrib-uglify": "^0.10.0",
+    "grunt-docco": "^0.4.0"
   },
   "main": "qr.js",
   "scripts": {

qr.js

@@ -1,5 +1,5 @@
 // [qr.js](http://neocotic.com/qr.js)  
-// (c) 2014 Alasdair Mercer  
+// (c) 2015 Alasdair Mercer  
 // Licensed under the GPL Version 3 license.  
 // Based on [jsqrencode](http://code.google.com/p/jsqrencode/)  
 // (c) 2010 [email protected]  
@@ -1003,7 +1003,7 @@
     // ---------
 
     // Current version of `qr`.
-    VERSION: '1.1.3',
+    VERSION: '1.1.4',
 
     // QR functions
     // ------------