Commit graph

773 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
53869531c2 settings: fix balance bug 2 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
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
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
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