Commit Graph

1498 Commits

Author SHA1 Message Date
Matias Alejo Garcia b9881c1147 add LocalStorage plugin 2014-09-15 14:08:18 -03:00
Matias Alejo Garcia c0360e7beb plugin system v0 2014-09-15 14:07:43 -03:00
Matias Alejo Garcia 2849f773e2 change name to Encrypted 2014-09-15 14:07:43 -03:00
Matias Alejo Garcia 1ce3f82d0a add angular-load 2014-09-15 14:06:56 -03:00
Gustavo Maximiliano Cortez d4ec48aadd Merge pull request #1371 from matiaspando/error/informPasswordNotMatching
Error/inform password not matching
2014-09-15 11:06:16 -03:00
Gustavo Maximiliano Cortez d85fcbfe07 Remove forceNetwork 2014-09-15 10:16:40 -03:00
Esteban Ordano 027043bd6f JSDocs generated by grunt 2014-09-13 23:49:56 -03:00
Matias Pando a599251b39 Fixed 2014-09-13 09:24:20 -03:00
Matias Pando de43990882 Conflicts fixed 2014-09-13 09:20:21 -03:00
Matias Pando 0698c70cce Conflicts fixed 2014-09-12 14:56:19 -03:00
Matias Pando 873f854eb8 Skip avoid waiting for other copayers 2014-09-12 13:29:41 -03:00
Matias Pando b7373367a1 Skip avoid waiting for other copayers 2014-09-12 13:25:52 -03:00
Matias Pando 2b540264a5 Conflicts solved 2014-09-12 12:55:36 -03:00
Matias Pando ecea1a654d If the copayer upload a backup it does not wait for others 2014-09-12 12:55:36 -03:00
Matias Pando 84dbcb038a Fixed 2014-09-12 12:55:36 -03:00
Ivan Socolsky 8d7e420524 No copayer nickname on 1-1 wallets 2014-09-12 11:10:45 -03:00
Ivan Socolsky 81a73e6f2a resolved 2014-09-12 10:40:47 -03:00
Ivan Socolsky 1f83f85189 separated subscribeToAddresses from getAddressesInfo 2014-09-12 10:25:38 -03:00
Manuel Araoz fc793e558e settings: fix angular error on logout 2 2014-09-11 11:45:31 -07:00
Manuel Araoz 2f545239d5 settings: fix angular error on logout 2014-09-11 11:41:42 -07:00
Manuel Araoz 03e4b49bd0 settings: fix updateTx 2014-09-11 11:29:45 -07:00
Manuel Araoz 91d6ceefe3 settings: fix insight link to tx 2014-09-11 11:25:32 -07:00
Manuel Araoz c47318c728 settings: fix send in livenet 2014-09-11 11:19:19 -07:00
Manuel Araoz 63423d92ed settings: fix tests 2014-09-11 10:15:00 -07:00
Manuel Araoz 89c74aa6e4 settings: remove console.log 2014-09-11 09:29:35 -07:00
Manuel Araoz 3aa82c3e8a settings: indexof fix 2014-09-11 09:29:11 -07:00
Matias Pando e819073003 Conflicts solved 2014-09-11 10:28:56 -03:00
Matias Pando 63cffcc921 If the copayer upload a backup it does not wait for others 2014-09-11 10:24:22 -03:00
Matias Pando 7618488bc3 Fixed 2014-09-11 10:24:22 -03:00
Manuel Araoz f2f5179b0a settings: fix tests 6 2014-09-10 14:06:54 -07:00
Manuel Araoz d57e5e73e7 settings: fix tests 3 2014-09-10 14:01:10 -07:00
Manuel Araoz 28dff691fd settings: fix tests 2 2014-09-10 13:56:49 -07:00
Manuel Araoz 6152227668 settings: change Async.js opts 2014-09-10 13:44:55 -07:00
Manuel Araoz 997c061b1a settings: change Insight.js opts 2014-09-10 13:43:58 -07:00
Manuel Araoz 423348f5ec settings: simple insight config controller and view 2014-09-10 13:43:58 -07:00
Manuel Araoz 4cfe87490f settings: show wallet network on sidebar 2014-09-10 13:43:58 -07:00
Manuel Araoz 76f3b1c321 settings: maintain livenet and testnet simultainously 2014-09-10 13:43:58 -07:00
Manuel Araoz b2fb486839 settings: remove _checkNetwork in WalletFactory 2014-09-10 13:43:58 -07:00
Manuel Araoz 7159cdb712 settings: added test for new secret scheme 2014-09-10 13:43:58 -07:00
Manuel Araoz 520fd762ba settings: added network to wallet secret 2014-09-10 13:42:08 -07:00
Manuel Araoz fc1d098135 settings: start adding network config at create 2014-09-10 13:42:08 -07:00
Manuel Araoz 048664b4af fix some karma tests after rebase 2014-09-10 13:42:08 -07:00
Manuel Araoz 7a86b1edf3 fix typo 2014-09-10 13:42:08 -07:00
Manuel Araoz 2a976d2673 settings: fix angular test 4 2014-09-10 13:41:40 -07:00
Manuel Araoz 6bdeaadb94 settings: fix angular test 1 2014-09-10 13:40:20 -07:00
Manuel Araoz 296ddf3625 settings: fix test 3 2014-09-10 13:40:20 -07:00
Manuel Araoz 4dffcccf19 settings: works with 2-3 wallet 2014-09-10 13:39:22 -07:00
Manuel Araoz 3effa3d0b1 settings: it works 2014-09-10 13:39:22 -07:00
Manuel Araoz a048f8eed5 settings: fix references to alternativeIsoCode 2014-09-10 13:39:22 -07:00
Manuel Araoz 7c582f4bd5 settings: fix references to unitToSatoshi 2014-09-10 13:39:22 -07:00
Manuel Araoz 0fe4778637 settings: fix references to unitName 2014-09-10 13:39:21 -07:00
Manuel Araoz 53869531c2 settings: fix balance bug 2 2014-09-10 13:33:15 -07:00
Manuel Araoz 3691bd5ee0 settings: fix balance bug 2014-09-10 13:33:15 -07:00
Manuel Araoz e3afce6a9f settings: Insight.js refactor 3 2014-09-10 13:28:10 -07:00
Manuel Araoz 3e9328f951 settings: Insight.js refactor 2014-09-10 13:26:00 -07:00
Manuel Araoz c1d8103374 fix settings.js 2014-09-10 13:21:35 -07:00
Manuel Araoz c9cb2aae57 settings: small refactor 2014-09-10 13:19:27 -07:00
Manuel Araoz cff9f567bb settings: no settings model after all 2014-09-10 13:19:27 -07:00
Manuel Araoz f443843d49 settings: change old settings controller 2014-09-10 13:19:27 -07:00
Manuel Araoz f9a31ce9aa settings: nuke verbose 2 2014-09-10 13:19:27 -07:00
Manuel Araoz ecceb668e3 settings: nuke verbose 2014-09-10 13:19:27 -07:00
Manuel Araoz d2861d9c2a settings: create new model 2014-09-10 13:19:27 -07:00
Manuel Araoz 921cb8dd90 settings: refactor controllers 2014-09-10 13:19:27 -07:00
Manuel Araoz e992b976e0 settings: refactor views 2014-09-10 13:19:27 -07:00
Gustavo Maximiliano Cortez 6193824fb8 Merge pull request #1351 from isocolsky/fix/multiple_notifications
Only check for new version once
2014-09-10 16:02:39 -03:00
Ivan Socolsky 0962271633 only check for new version on first include 2014-09-10 15:39:36 -03:00
Ivan Socolsky baf92d4c1b resolved conflict 2014-09-10 15:09:11 -03:00
Matias Alejo Garcia 676863f192 Merge pull request #1329 from matiaspando/error/fullWallet
Adding full wallet message
2014-09-10 12:01:14 -03:00
Esteban Ordano 00774b62fd Revert "Delete BuilderMockV0"
This is a combination of 3 commits:
* Revertion of commit b39a683339.
* Revertion of commit 61aea8db3d.
* Revertion of commit 5f666aef66.
2014-09-10 10:02:57 -03:00
Matias Alejo Garcia 04dbbc0b45 add ts to p2p sync 2014-09-09 23:00:24 -03:00
Matias Alejo Garcia 3aca85e268 log fixes 2014-09-09 22:41:55 -03:00
Matias Alejo Garcia 489dc2ccff fix log 2014-09-09 22:33:31 -03:00
Matias Alejo Garcia d838a29d02 fix some wallet tests 2014-09-09 22:33:31 -03:00
Matias Alejo Garcia 74593fe778 fix signed message 2014-09-09 22:33:31 -03:00
Matias Alejo Garcia 45fd46e3bc fix reconnect to insight 2014-09-09 22:33:31 -03:00
Matias Alejo Garcia dd8fcaa1b1 refacor blockchain handlers 2014-09-09 22:33:30 -03:00
Matias Alejo Garcia 1c5b59a263 fix addr 2014-09-09 22:33:30 -03:00
Matias Alejo Garcia db5505b1e3 fix received 2014-09-09 22:33:30 -03:00
Matias Alejo Garcia 6944b9119b move blockchain event handles to wallet 2014-09-09 22:33:30 -03:00
Matias Alejo Garcia 7706a17416 fix typo 2014-09-09 22:31:29 -03:00
Matias Alejo Garcia b516e844a8 lazy connect 2014-09-09 22:31:29 -03:00
Matias Alejo Garcia fb05586c32 fix addr 2014-09-09 22:30:21 -03:00
Matias Alejo Garcia 255affe382 fix received 2014-09-09 22:30:21 -03:00
Matias Alejo Garcia b5b7acd5a4 move blockchain event handles to wallet 2014-09-09 22:30:21 -03:00
Matias Alejo Garcia bd78c758aa fix typo 2014-09-09 22:30:21 -03:00
Matias Alejo Garcia c45495eeff lazy connect 2014-09-09 22:30:21 -03:00
Ivan Socolsky 0917fcd7da Merge pull request #1328 from cmgustavo/ux/01-copayers
hide delete and backup wallets on the intermediate screen
2014-09-09 18:28:14 -03:00
Matias Pando ee9fbc6654 Adding full wallet message 2014-09-09 15:07:36 -03:00
Gustavo Maximiliano Cortez 022dec727e hide delete and backup wallets on the intermediate screen 2014-09-09 14:46:22 -03:00
Gustavo Maximiliano Cortez c9bc512227 Fix: copayers list 2014-09-09 12:59:27 -03:00
Gustavo Maximiliano Cortez 2bfa83a8e5 Fixes: delete wallet on the intermediate screen 2014-09-09 11:47:42 -03:00
Gustavo Maximiliano Cortez f811f91952 Merge pull request #1322 from matiu/builderOpts2
Builder opts2
2014-09-09 10:55:20 -03:00
Matias Alejo Garcia 7bcf35f6d0 fix no fore opts 2014-09-09 10:43:29 -03:00
Matias Alejo Garcia 740be93836 fix fee / feeSat opts 2014-09-09 10:43:13 -03:00
Gustavo Maximiliano Cortez ea91c603f9 Merge pull request #1315 from isocolsky/fix/insight_down
Catching errors when trying to create new TXP
2014-09-09 10:38:52 -03:00
Matias Alejo Garcia 765d3dd658 fix sighash opts + add tests 2014-09-09 08:42:32 -03:00
Matias Alejo Garcia f87030c6cb Merge pull request #1317 from isocolsky/fix/all_funds
Fixed 'Use all funds' link for amounts below fee
2014-09-09 07:37:15 -03:00
Christopher Jeffrey 125b8a807b test: fix Wallet test pertaining to null/0 fees. 2014-09-08 18:47:42 -07:00
Christopher Jeffrey 0a1fab8e2a paypro: fix failing paypro test. 2014-09-08 17:52:22 -07:00
Christopher Jeffrey 98db768924 paypro: fix tx broadcasting with domains as paypro addresses. 2014-09-08 17:36:47 -07:00
Christopher Jeffrey 953ff985d8 paypro: implement short merchant names in address box and side box. 2014-09-08 17:07:21 -07:00
Christopher Jeffrey 49d362a238 paypro: improve PaymentRequest verification using the latest bitcore. 2014-09-08 17:00:38 -07:00
Christopher Jeffrey 4ce1c113e5 Revert "paypro: temporarily disable, with comments."
This reverts commit b6fa32dcfa.
2014-09-08 17:00:38 -07:00
Ivan Socolsky 9ee04fe45f Fixed 'Use all funds' link for amounts below fee 2014-09-08 17:35:55 -03:00
Matias Alejo Garcia 65e054c247 hide QR scanner if not supported 2014-09-08 17:07:43 -03:00
Matias Alejo Garcia 1ec279cd83 remove copy & paste button if not flash 2014-09-08 16:47:10 -03:00
Ivan Socolsky cef93325f4 Catch error when creating new TXP 2014-09-08 16:37:33 -03:00
Ivan Socolsky 152ab7aa44 Refactored Wallet#createTx 2014-09-08 15:50:20 -03:00
Matias Alejo Garcia a0eded69af Merge pull request #1300 from cmgustavo/feature/multilanguage-support
Feature/multilanguage support
2014-09-08 15:48:34 -03:00
Matias Alejo Garcia 906c964116 Merge pull request #1273 from yemel/mobile/cordova
Mobile - Cordova + IOS
2014-09-08 15:18:07 -03:00
Gustavo Maximiliano Cortez 550d82cacd rebased 2014-09-08 15:15:57 -03:00
Matias Alejo Garcia b15ddf23c4 Merge pull request #1299 from matiaspando/error/fixLostMessages
Subscribe again to receive messages
2014-09-08 15:13:17 -03:00
Matias Alejo Garcia c7f4770449 Merge pull request #1305 from isocolsky/ux/seen_icon
Calling setSeen on incoming tx proposal
2014-09-08 15:12:58 -03:00
Matias Alejo Garcia ff7b6d6ad8 Merge pull request #1265 from eordano/fix/1052
Remove BuilderMockV0
2014-09-08 15:08:12 -03:00
Matias Alejo Garcia 3124124ad2 Merge pull request #1302 from cmgustavo/bug/01-camera
Fix: camera when joining
2014-09-08 15:04:13 -03:00
Ivan Socolsky 664c02dc84 Set seen on incoming tx proposal 2014-09-08 14:27:58 -03:00
Gustavo Maximiliano Cortez 5ac5aa3c69 Merge pull request #1297 from eordano/beauty/Wallet
JSDoc for wallet.js
2014-09-08 13:00:34 -03:00
Yemel Jardi b1ed0f1656 Switch to cordova framework - IOS support 2014-09-08 12:39:05 -03:00
Matias Pando d96d9b8d61 Delete commented line 2014-09-08 12:12:23 -03:00
Matias Pando 6fa1005615 Subscribe again to receive messages 2014-09-08 12:12:23 -03:00
Gustavo Maximiliano Cortez bd2035eac9 Merge pull request #1287 from eordano/beauty/WalletFactory
JSDoc for WalletFactory
2014-09-08 12:00:42 -03:00
Esteban Ordano 9543fa851d JSDocs and beautifycation for HDPath 2014-09-08 11:48:21 -03:00
Gustavo Maximiliano Cortez 42df9aa409 Merge pull request #1285 from eordano/beauty/PublicKeyRing
JSDoc and beautified the code fro PublicKeyRing
2014-09-08 11:38:24 -03:00
Gustavo Maximiliano Cortez 323bc2bde0 Fixes camera when joining 2014-09-08 10:25:16 -03:00
Gustavo Maximiliano Cortez 3981ed3288 show default language below copay icon 2014-09-05 17:23:03 -03:00
Gustavo Maximiliano Cortez 6a855b7ac1 Fix Conflicts:
views/addresses.html
	views/send.html
	views/transactions.html
2014-09-05 17:06:25 -03:00
Gustavo Maximiliano Cortez 302e75228d Multi-language support. English by default 2014-09-05 16:56:47 -03:00
Matias Alejo Garcia d5d1ba59ee Merge pull request #1292 from cmgustavo/bug/05-angular-issues
Fixes parseFloat for compatibility with all browsers
2014-09-05 15:08:43 -03:00
Matias Alejo Garcia 1aa46b6ad0 Merge pull request #1298 from isocolsky/fix/update_balance
Fixed reentrant event updating balance multiple times
2014-09-05 15:07:25 -03:00
Matias Alejo Garcia 281b41d972 Merge pull request #1289 from cmgustavo/bug/02-localstorage
Fixes reading configuration from local storage
2014-09-05 15:06:37 -03:00
Ivan Socolsky 48cbd01686 Fixed reentrant event 2014-09-05 12:03:50 -03:00
Esteban Ordano f397d1f94f JSDoc for wallet.js 2014-09-05 11:49:35 -03:00
Gustavo Maximiliano Cortez db3ca4ceef Merge pull request #1270 from isocolsky/fix/remove_spent
Removed proposals with spent inputs
2014-09-04 18:25:11 -03:00
Matias Alejo Garcia 19eaa12dc8 Merge pull request #1284 from eordano/beauty/PrivateKey
JSDoc and beautified code for PrivateKey
2014-09-04 18:08:41 -03:00
Matias Alejo Garcia daa5fcaf07 Merge pull request #1296 from matiaspando/error/joinfullwallet
Bug found that stops sending messages
2014-09-04 18:07:29 -03:00
Matias Pando 6fc683dcaa Bug found that stops sending message 2014-09-04 17:47:24 -03:00
Ivan Socolsky ace301d1f8 Only remove pending txps 2014-09-04 17:37:38 -03:00
Gustavo Maximiliano Cortez 08024c1c77 Merge pull request #1291 from isocolsky/fix/First_address
Fix 1st address not showing
2014-09-04 14:32:18 -03:00
Matias Alejo Garcia 97390601a4 Merge pull request #1280 from eordano/beauty/HDParams
HDParams beautified and jsdoc'd
2014-09-04 14:11:45 -03:00
Matias Alejo Garcia 50175a8902 Merge pull request #1278 from eordano/beauty/Passphrase
JSDoc and beautify for Passphrase
2014-09-04 14:09:54 -03:00
Ivan Socolsky f9458aa4a1 Remove unnecessary code 2014-09-04 13:23:56 -03:00
Ivan Socolsky eb59a7dce9 Refresh global addresses when joining 2014-09-04 13:16:09 -03:00
Gustavo Maximiliano Cortez b9702dfa3f Fixes parseFloat for compatibility with all browsers 2014-09-04 11:42:21 -03:00
Esteban Ordano d92f0ed0eb JSDoc and beautified code for PrivateKey 2014-09-04 11:42:01 -03:00
Esteban Ordano 64399d7c71 JSDoc and better code for WalletFactory 2014-09-04 11:40:42 -03:00
Esteban Ordano 5a45c66573 JSDoc and beautified the code fro PublicKeyRing 2014-09-04 11:39:29 -03:00
Esteban Ordano 475b20f43f JSDoc and beautify for Passphrase 2014-09-04 11:37:14 -03:00
Esteban Ordano 49e7b2ae5f HDParams beautified and jsdoc'd 2014-09-04 11:36:25 -03:00
Ivan Socolsky cf3703e8ab Add explicit call to updateAddressList 2014-09-04 11:22:08 -03:00
Gustavo Maximiliano Cortez b76a18c295 Fixes reading from local storage configuration 2014-09-04 10:34:22 -03:00