Commit Graph

602 Commits

Author SHA1 Message Date
Matias Pando db7d33682e Solving conflicts 2014-09-12 12:55:36 -03:00
Matias Pando 2b540264a5 Conflicts solved 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 7cf2a474dd removed old test 2014-09-12 10:41:17 -03:00
Ivan Socolsky 81a73e6f2a resolved 2014-09-12 10:40:47 -03:00
Ivan Socolsky 19a8733a9c resolved conflicts 2014-09-12 10:28:16 -03:00
Ivan Socolsky 1f83f85189 separated subscribeToAddresses from getAddressesInfo 2014-09-12 10:25:38 -03: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 f2f5179b0a settings: fix tests 6 2014-09-10 14:06:54 -07:00
Manuel Araoz 85af562350 settings: fix tests 5 2014-09-10 14:02:11 -07:00
Manuel Araoz d4f7401e23 settings: fix tests 4 2014-09-10 14:01:40 -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 91033f3fcb settings: fix tests 1 2014-09-10 13:46:20 -07:00
Manuel Araoz 7159cdb712 settings: added test for new secret scheme 2014-09-10 13:43:58 -07:00
Manuel Araoz b36564fcb7 settings: fix angular test 6 2014-09-10 13:41:40 -07:00
Manuel Araoz 0a531a47f9 settings: fix angular test 5 2014-09-10 13:41:40 -07:00
Manuel Araoz 2a976d2673 settings: fix angular test 4 2014-09-10 13:41:40 -07:00
Manuel Araoz 7277d29965 settings: fix angular test 3 2014-09-10 13:40:52 -07:00
Manuel Araoz 258ae5c79c settings: fix angular test 2 2014-09-10 13:40:52 -07:00
Manuel Araoz 6bdeaadb94 settings: fix angular test 1 2014-09-10 13:40:20 -07:00
Manuel Araoz 69b70d7d2b settings: fix tests 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 6a9ad9c01e settings: fix test 2 2014-09-10 13:39:22 -07:00
Manuel Araoz aba883ed2d settings: fix test spelling 2014-09-10 13:39:22 -07:00
Manuel Araoz 1d0f12f4cb settings: fix test 1 2014-09-10 13:39:22 -07:00
Manuel Araoz 09ec6f04bb settings: fix references to alternativeName 2014-09-10 13:39:22 -07:00
Manuel Araoz 08db6831ce settings: Insight.js refactor 2 2014-09-10 13:27:16 -07:00
Manuel Araoz f9a31ce9aa settings: nuke verbose 2 2014-09-10 13:19:27 -07:00
Ivan Socolsky baf92d4c1b resolved conflict 2014-09-10 15:09:11 -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 38ed6e2df6 fix karma tests 2014-09-09 22:33:31 -03:00
Matias Alejo Garcia 194913c561 fix insight tests 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 c45495eeff lazy connect 2014-09-09 22:30:21 -03:00
Gustavo Maximiliano Cortez 43c0a0bb32 tests for copayers controller 2014-09-09 12:59:48 -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 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
Ivan Socolsky 9ee04fe45f Fixed 'Use all funds' link for amounts below fee 2014-09-08 17:35:55 -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 ff7b6d6ad8 Merge pull request #1265 from eordano/fix/1052
Remove BuilderMockV0
2014-09-08 15:08:12 -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
Ivan Socolsky 48a4e8b555 Test 2014-09-04 17:38:09 -03:00
Ivan Socolsky ace301d1f8 Only remove pending txps 2014-09-04 17:37:38 -03:00
Ivan Socolsky e9e36020fe Add method to FakeWallet 2014-09-03 18:06:58 -03:00
Matias Pando 89dba4c616 Added secret number feature 2014-09-03 16:51:02 -03:00