Commit graph

1,407 commits

Author SHA1 Message Date
Matias Alejo Garcia
fb18487b4f Merge pull request #1428 from isocolsky/ux/conversion_rate
Ux/conversion rate
2014-09-22 09:54:36 -03:00
Matias Alejo Garcia
9a38828b85 Merge pull request #1427 from isocolsky/fix/notification
Removed 'funds received' notification for change addresses
2014-09-22 09:51:30 -03:00
Ivan Socolsky
6b891418d3 Added conversion rate to send controller 2014-09-18 11:07:07 -03:00
Ivan Socolsky
e0263cf594 Removed 'funds received' notification for change addresses 2014-09-17 17:39:53 -03:00
Gustavo Maximiliano Cortez
9f821dcf19 removed default language ISO code below Copay logo 2014-09-17 09:36:15 -03:00
Gustavo Maximiliano Cortez
4a91729121 added translation attribute to controllers files. 2014-09-17 09:26:28 -03:00
Gustavo Maximiliano Cortez
205cd39599 Fix typos and translated message 2014-09-17 09:26:28 -03:00
Matias Alejo Garcia
e2af5ac782 Merge pull request #1418 from matiaspando/test/addingCoverage
Test added on Wallet.js
2014-09-17 06:30:46 -03:00
Matias Alejo Garcia
912c57eee4 Merge pull request #1400 from cmgustavo/antifeature/forcenetwork
Remove forceNetwork
2014-09-17 05:38:18 -03:00
Matias Pando
a316d04474 Test added 2014-09-16 15:58:23 -03:00
Christopher Jeffrey
aa5e90786b paypro: fix - check for merchant_data existence. 2014-09-15 16:39:30 -07:00
Christopher Jeffrey
20bc1ecbb5 paypro: fix $root.merchant clearing on tab change. see #1406 - gustavo's comment. 2014-09-15 15:49:52 -07:00
Christopher Jeffrey
03c3eefd0d paypro: fix xhr error messages. remove comments. 2014-09-15 11:43:39 -07: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