From 9ff30babbc11c56be6d1df37448c4c3dc517fcb2 Mon Sep 17 00:00:00 2001
From: Ian Coleman <coleman.ian@gmail.com>
Date: Wed, 20 Sep 2017 11:39:06 +1000
Subject: [PATCH] Release v0.2.6

---
 bip39-standalone.html | 22 ++++++++++++++++++++--
 changelog.md          | 10 ++++++++++
 src/index.html        |  2 +-
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/bip39-standalone.html b/bip39-standalone.html
index 5f2a8c0..b17cea6 100644
--- a/bip39-standalone.html
+++ b/bip39-standalone.html
@@ -118,7 +118,7 @@
         <div class="container">
 
             <h1 class="text-center">Mnemonic Code Converter</h1>
-            <p class="version">v0.2.5</p>
+            <p class="version">v0.2.6</p>
             <hr>
             <div class="row">
                 <div class="col-md-12">
@@ -167,7 +167,14 @@
                             <div class="form-group">
                                 <label for="entropy" class="col-sm-2 control-label" data-translate>Entropy</label>
                                 <div class="col-sm-7">
-                                    <textarea id="entropy" rows="2" class="entropy form-control" placeholder="Accepts binary, base 6, 6-sided dice, base 10, hexadecimal, cards" data-translate-placeholder></textarea>
+                                    <textarea id="entropy" rows="2" class="entropy form-control" placeholder="Accepts either binary, base 6, 6-sided dice, base 10, hexadecimal or cards" data-translate-placeholder></textarea>
+                                    <div class="row filter-warning text-danger hidden">
+                                        <p class="col-sm-12">
+                                        <strong>
+                                        Some characters have been discarded
+                                        </strong>
+                                        </p>
+                                    </div>
                                     <div class="row">
                                         <label class="col-sm-3 control-label" data-translate><span class="more-info" data-translate-title title="Based on estimates from zxcvbn using Filtered Entropy">Time To Crack</span></label>
                                         <div class="crack-time col-sm-3 form-control-static"></div>
@@ -46167,6 +46174,7 @@ window.Entropy = new (function() {
     DOM.entropyWordCount = DOM.entropyContainer.find(".word-count");
     DOM.entropyBinary = DOM.entropyContainer.find(".binary");
     DOM.entropyMnemonicLength = DOM.entropyContainer.find(".mnemonic-length");
+    DOM.entropyFilterWarning = DOM.entropyContainer.find(".filter-warning");
     DOM.phrase = $(".phrase");
     DOM.passphrase = $(".passphrase");
     DOM.generateContainer = $(".generate-container");
@@ -47190,6 +47198,16 @@ window.Entropy = new (function() {
         DOM.entropyWordCount.text(wordCount);
         DOM.entropyBinary.text(entropy.binaryStr);
         DOM.entropyBitsPerEvent.text(bitsPerEvent);
+        // detect and warn of filtering
+        var rawNoSpaces = DOM.entropy.val().replace(/\s/g, "");
+        var cleanNoSpaces = entropy.cleanStr.replace(/\s/g, "");
+        var isFiltered = rawNoSpaces.length != cleanNoSpaces.length;
+        if (isFiltered) {
+            DOM.entropyFilterWarning.removeClass('hidden');
+        }
+        else {
+            DOM.entropyFilterWarning.addClass('hidden');
+        }
     }
 
     function getEntropyTypeStr(entropy) {
diff --git a/changelog.md b/changelog.md
index 13ecc3c..a2ff24a 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,13 @@
+# 0.2.6
+
+* Detect and warn when entropy is filtered / discarded
+* Reword entropy text to indicate using a single source only
+* Add BIP49 to More Info section
+* Update compile script to work across python 2 and 3
+* QR Codes use correctLevel 3 instead of 2
+* Source map removed from zxcvbn
+* Tidy up code with consistent use of commas and semicolons
+
 # 0.2.5
 
 * Rename variables for clarity between BIP49 and P2WPKH Nested In P2SH
diff --git a/src/index.html b/src/index.html
index 7507a35..18f2952 100644
--- a/src/index.html
+++ b/src/index.html
@@ -114,7 +114,7 @@
         <div class="container">
 
             <h1 class="text-center">Mnemonic Code Converter</h1>
-            <p class="version">v0.2.5</p>
+            <p class="version">v0.2.6</p>
             <hr>
             <div class="row">
                 <div class="col-md-12">
-- 
2.41.0