RanchiMall/flosight-api
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #372 from matiu/npm-version.0.1.2

Browse Source 
Npm version.0.1.2
This commit is contained in:
Ryan X. Charles 2014-02-18 13:21:16 -05:00
commit f9b94c9f9f
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "insight-bitcore", "name": "insight-bitcore",
"description": "An open-source bitcoin blockchain API. The Insight API provides you with a convenient, powerful and simple way to query and broadcast data on the bitcoin network and build your own services with it.", "description": "An open-source bitcoin blockchain API. The Insight API provides you with a convenient, powerful and simple way to query and broadcast data on the bitcoin network and build your own services with it.",
"version": "0.1.1", "version": "0.1.2",
"author": { "author": {
"name": "Ryan X Charles", "name": "Ryan X Charles",
"email": "ryan@bitpay.com" "email": "ryan@bitpay.com"
@ -25,7 +25,7 @@
"email": "cmgustavo83@gmail.com" "email": "cmgustavo83@gmail.com"
}, },
{ {
"name": "Juan Sosa", "name": "Juan Ignacio Sosa Lopez",
"email": "bechilandia@gmail.com" "email": "bechilandia@gmail.com"
} }
], ],

7
public/views/transaction/tx.html
View File

@ -100,15 +100,8 @@
<div data-ng-repeat="vout in tx.vout" data-ng-show="itemsExpanded"> <div data-ng-repeat="vout in tx.vout" data-ng-show="itemsExpanded">
<div class="col-md-12 transaction-vin-vout"> <div class="col-md-12 transaction-vin-vout">
<div class="text-muted pull-right btc-value"><small>{{$root.currency.getConvertion(vout.value)}} <div class="text-muted pull-right btc-value"><small>{{$root.currency.getConvertion(vout.value)}}
<<<<<<< HEAD
<span class="text-success" data-ng-show="!vout.spentTxId" tooltip="Output is unspent" tooltip-placement="left">(U)</span> <span class="text-success" data-ng-show="!vout.spentTxId" tooltip="Output is unspent" tooltip-placement="left">(U)</span>
<a class="glyphicon glyphicon-chevron-right" data-ng-show="vout.spentTxId" href="/#!/tx/{{vout.spentTxId}}" title="Spent at: {{vout.spentTxId}},{{vout.spentIndex}}"></a>&nbsp;&nbsp; <a class="glyphicon glyphicon-chevron-right" data-ng-show="vout.spentTxId" href="/#!/tx/{{vout.spentTxId}}" title="Spent at: {{vout.spentTxId}},{{vout.spentIndex}}"></a>&nbsp;&nbsp;
=======
<span class="text-success" data-ng-show="!vout.spendTxId" tooltip="Output is unspent" tooltip-placement="left">(U)</span>
<a class="glyphicon glyphicon-chevron-right" data-ng-show="vout.spendTxId" href="/#!/tx/{{vout.spendTxId}}" title="Spent at: {{vout.spendTxId}},{{vout.spendIndex}}"></a>&nbsp;&nbsp;
>>>>>>> 8e733340d31053254750053c5ca686eac87c5139
</small> </small>
</div> </div>