Merge pull request #1134 from matiu/bitcorelib

Bitcorelib
This commit is contained in:
Gustavo Maximiliano Cortez 2014-08-19 17:03:20 -03:00
commit 852eed3439
5 changed files with 4 additions and 4 deletions

View File

@ -18,7 +18,6 @@
"sjcl": "1.0.0", "sjcl": "1.0.0",
"file-saver": "*", "file-saver": "*",
"qrcode-decoder-js": "*", "qrcode-decoder-js": "*",
"bitcore": "0.1.35",
"angular-moment": "~0.7.1", "angular-moment": "~0.7.1",
"socket.io-client": ">=1.0.0", "socket.io-client": ">=1.0.0",
"mousetrap": "1.4.6", "mousetrap": "1.4.6",

View File

@ -70,7 +70,7 @@
<script src="lib/angular-foundation/mm-foundation.min.js"></script> <script src="lib/angular-foundation/mm-foundation.min.js"></script>
<script src="lib/angular-foundation/mm-foundation-tpls.min.js"></script> <script src="lib/angular-foundation/mm-foundation-tpls.min.js"></script>
<script src="lib/peer.js"></script> <!-- TODO Change this on PeerJS version 0.3.9 --> <script src="lib/peer.js"></script> <!-- TODO Change this on PeerJS version 0.3.9 -->
<script src="lib/bitcore-0.1.35-paypro.js"></script> <script src="lib/bitcore.js"></script>
<script src="lib/crypto-js/rollups/sha256.js"></script> <script src="lib/crypto-js/rollups/sha256.js"></script>
<script src="lib/crypto-js/rollups/pbkdf2.js"></script> <script src="lib/crypto-js/rollups/pbkdf2.js"></script>
<script src="lib/crypto-js/rollups/aes.js"></script> <script src="lib/crypto-js/rollups/aes.js"></script>

View File

@ -29,7 +29,7 @@ module.exports = function(config) {
'lib/angular-foundation/mm-foundation.min.js', 'lib/angular-foundation/mm-foundation.min.js',
'lib/angular-foundation/mm-foundation-tpls.min.js', 'lib/angular-foundation/mm-foundation-tpls.min.js',
'lib/peerjs/peer.js', 'lib/peerjs/peer.js',
'lib/bitcore-0.1.35-paypro.js', 'lib/bitcore.js',
'lib/crypto-js/rollups/sha256.js', 'lib/crypto-js/rollups/sha256.js',
'lib/crypto-js/rollups/pbkdf2.js', 'lib/crypto-js/rollups/pbkdf2.js',
'lib/crypto-js/rollups/aes.js', 'lib/crypto-js/rollups/aes.js',

1
lib/bitcore.js Symbolic link
View File

@ -0,0 +1 @@
bitcore-0.1.35-paypro.js

View File

@ -12,7 +12,7 @@
<script src="../node_modules/chai/chai.js"></script> <script src="../node_modules/chai/chai.js"></script>
<script src="../lib/crypto-js/rollups/aes.js"></script> <script src="../lib/crypto-js/rollups/aes.js"></script>
<script>mocha.setup('bdd')</script> <script>mocha.setup('bdd')</script>
<script src="../lib/bitcore-0.1.35-paypro.js"></script> <script src="../lib/bitcore.js"></script>
<script src="../js/copayBundle.js"></script> <script src="../js/copayBundle.js"></script>
<script src="test.blockchain.Insight.js"></script> <script src="test.blockchain.Insight.js"></script>
<script src="test.Message.js"></script> <script src="test.Message.js"></script>