Merge pull request #235 from bitjson/feature/new-qrscanner

Feature: New QRScanner
This commit is contained in:
Jason Dreyzehner 2016-09-30 21:44:44 -04:00 committed by GitHub
commit 521e5f3618
27 changed files with 568 additions and 512 deletions

View file

@ -134,7 +134,7 @@
<i class="icon big-icon-svg">
<div class="bg icon-bitpay-card"></div>
</i>
<span translate>Add BitPay Card</span>
<span translate>Add BitPay Visa&reg; Card</span>
<i class="icon nav-item-arrow-right"></i>
</a>
<a ng-show="!externalServices.BuyAndSell && (coinbaseEnabled || glideraEnabled)" ui-sref="tabs.buyandsell" class="item item-icon-left item-big-icon-left item-icon-right next-step">
@ -154,9 +154,5 @@
</div>
</div>
<p class="padding" style="text-align:center; color:#999">
{{name}} v{{version}}
</p>
</ion-content>
</ion-view>