From 4ab7cbdd2ea02e56e6ddeb288e192743ebf65165 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Mur=C3=A9?= Date: Wed, 21 May 2014 20:40:36 +0200 Subject: [PATCH] =?UTF-8?q?QR=20Code=20recognition=20integration,=20?= =?UTF-8?q?=E2=80=98Wallet=20Details=E2=80=99=20layout=20update.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gruntfile.js | 3 +- README | 2 + images/qrcode.png | Bin 0 -> 552 bytes index.html | 3752 ++++++++++++++++++++++++++++++++++++- src/index.html | 106 +- src/jsqrcode.js | 3546 +++++++++++++++++++++++++++++++++++ src/main.css | 54 +- src/ninja.detailwallet.js | 46 + 8 files changed, 7386 insertions(+), 123 deletions(-) create mode 100644 images/qrcode.png create mode 100644 src/jsqrcode.js diff --git a/Gruntfile.js b/Gruntfile.js index 4d105ae..df6a252 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -23,7 +23,8 @@ module.exports = function (grunt) { { token: "//cryptojs.blockmodes.js", file: "./src/cryptojs.blockmodes.js" }, { token: "//cryptojs.ripemd160.js", file: "./src/cryptojs.ripemd160.js" }, { token: "//crypto-scrypt.js", file: "./src/crypto-scrypt.js" }, - { token: "//doge.js", file: "./src/doge.js" }, + { token: "//jsqrcode.js", file: "./src/jsqrcode.js" }, + { token: "//doge.js", file: "./src/doge.js" }, { token: "//ellipticcurve.js", file: "./src/ellipticcurve.js" }, { token: "//ninja.key.js", file: "./src/ninja.key.js" }, { token: "//ninja.misc.js", file: "./src/ninja.misc.js" }, diff --git a/README b/README index 135983e..25bd277 100644 --- a/README +++ b/README @@ -40,6 +40,8 @@ window.EllipticCurve BSD License window.BigInteger BSD License window.QRCode MIT License window.Bitcoin MIT License +jsqrcode Apache License, 2.0 + The WalletGenerator.net software is available under The MIT License (MIT) Copyright (c) 2014 WalletGenerator.net diff --git a/images/qrcode.png b/images/qrcode.png new file mode 100644 index 0000000000000000000000000000000000000000..68f327d39cc04470ea1049151f1cddb67e5a6375 GIT binary patch literal 552 zcmV+@0@wYCP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qRNAp5A0004(NklGP!Zhs z1#R1X-w`~FcxlDG=W~iN4@D)ZO7eHx>2%udcKiK)v)OF7+xdL%c^>?5IJ{o3<#H*m z*710>^?Ln$KIx$&NZ;@GcszzvB!!&M=f9@MTw}oXdWE5*#25%Wna!ZpYV~+LNEeF* z>0~mo!C-(65kW~O5%j?6bgC2^h}f{gP=nkc1*z(?ae|PwHXIITvsu62htS4=O>ZDr z*z5H$Gn>|EG_vn=Meg@INCO3xZ5ZUk; z3JfrP!AvHDg2Slf^Z8UNB^?Gfe+;2eh!SeOI~t9GL@XA=2?>Y8kw^qo-T1qHzyIey q;8Y=u2nK^bpAQlU1gKDVUH2D64a_s@JN;h(0000