Merge pull request #3677 from bitpay/v1.6

Updates master with v1.6
This commit is contained in:
Matias Alejo Garcia 2015-12-15 19:10:16 -03:00
commit 151cb7cf7a
107 changed files with 3177 additions and 2378 deletions

View file

@ -7,6 +7,7 @@
<div class="content preferences" ng-controller="preferencesAdvancedController as preferences">
<h4></h4>
<ul class="no-bullet m0">
<li ng-click="$root.go('information')">
@ -26,14 +27,21 @@
<li ng-click="$root.go('preferencesBwsUrl')">
<i class="icon-arrow-right3 size-24 right text-gray"></i>
<span>Wallet Service URL</span>
<div>Wallet Service URL</div>
</li>
<li ng-click="$root.go('preferencesHistory')">
<i class="icon-arrow-right3 size-24 right text-gray"></i>
<div translate>Transaction History</div>
</li>
<li ng-click="$root.go('delete')">
<i class="icon-arrow-right3 size-24 right text-gray"></i>
<i class="icon-arrow-right3 size-24 right text-gray"></i>
<div translate>Delete Wallet</div>
</li>
</ul>
</div>
<div class="extra-margin-bottom"></div>