Commit Graph

1461 Commits

Author SHA1 Message Date
Matias Alejo Garcia 64072f83bc rebased! 2014-09-15 14:25:09 -03:00
Matias Alejo Garcia 5cf4fe0b66 ALL TEST PASSING!!! 2014-09-15 14:23:02 -03:00
Matias Alejo Garcia ad22b24d83 more tests 2014-09-15 14:21:49 -03:00
Matias Alejo Garcia c3574ae57f refactor WalletFactory test to use sinon instead of mocks WIP 2014-09-15 14:18:10 -03:00
Matias Alejo Garcia 9f30c9ade5 fix more tests en wallet f 2014-09-15 14:17:52 -03:00
Matias Alejo Garcia f48898033f more tests fixes 2014-09-15 14:17:52 -03:00
Matias Alejo Garcia f1e6d6cfc6 fix walletLock test 2014-09-15 14:17:20 -03:00
Matias Alejo Garcia b3ed2a2ea8 start fixing tests 2014-09-15 14:17:20 -03:00
Matias Alejo Garcia e0db19a40a rebased 2014-09-15 14:17:20 -03:00
Matias Alejo Garcia 9ad326cd30 working! 2014-09-15 14:17:20 -03:00
Matias Alejo Garcia f2cc272f16 working! 2014-09-15 14:17:20 -03:00
Matias Alejo Garcia 6efa4f86de wallet listing working 2014-09-15 14:13:20 -03:00
Matias Alejo Garcia bbd762a1fe rm encrypted to storage 2014-09-15 14:08:42 -03:00
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