Commit graph

2,616 commits

Author SHA1 Message Date
Manuel Araoz
ce975ed0ab wording fix 2014-09-12 11:23:44 -07:00
Gustavo Maximiliano Cortez
c9ccc4f085 Merge pull request #1369 from isocolsky/rename_backup
Added copayer nickname to backup name
2014-09-12 12:02:25 -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
Matias Alejo Garcia
94221a312f Merge pull request #1370 from cmgustavo/bug/02-ux
Fix address list for small devices
2014-09-12 10:36:23 -03:00
Matias Alejo Garcia
bf3840f77c Merge pull request #1356 from isocolsky/bug/subscribe
Separated subscribeToAddresses from getAddressesInfo
2014-09-12 10:35:57 -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
Gustavo Maximiliano Cortez
6e5e0846d0 Fix indentation 2014-09-11 22:09:43 -03:00
Gustavo Maximiliano Cortez
d02a159f76 Fix address list for small screen 2014-09-11 22:04:11 -03:00
Matias Alejo Garcia
9b8ecea1bd Merge pull request #1355 from bechi/bugs/01-ui
fix column on send section
2014-09-11 20:32:19 -03:00
Matias Alejo Garcia
3cd4b9c1b0 Merge pull request #1368 from cmgustavo/feature/01-grunt
Added config.js to grunt watch, also mobile.js and init.js
2014-09-11 20:28:47 -03:00
Matias Alejo Garcia
d358330d1d Merge pull request #1281 from maraoz/refactor/settings
Refactor settings
2014-09-11 20:28:21 -03:00
Manuel Aráoz
bd734dfe31 Merge pull request #4 from bechi/temp
fix with tony's feedback
2014-09-11 15:07:38 -07:00
bechi
187db9c49b fix with tony's feedback 2014-09-11 19:01:31 -03:00
Manuel Aráoz
36cdc057a6 Merge pull request #3 from maraoz/revert-2-temp
Revert "fix layout style"
2014-09-11 14:39:11 -07:00
Manuel Aráoz
4711558d76 Revert "fix layout style" 2014-09-11 14:39:04 -07:00
Manuel Aráoz
2465c838d1 Merge pull request #2 from bechi/temp
fix layout style
2014-09-11 14:32:45 -07:00
bechi
6be87a440f fix layout style 2014-09-11 16:44:05 -03:00
Gustavo Maximiliano Cortez
fb297f7f72 Added config.js to grunt watch, also mobile.js and init.js 2014-09-11 16:09:45 -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
dcb78847d2 settings: bump version for config compatibility 2014-09-11 10:27:40 -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
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
56db2bebcf settings: change default config 2014-09-10 13:44:56 -07:00
Manuel Araoz
4931f08b5f settings: change default config 2014-09-10 13:44:55 -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
2aa2d89f92 settings: simple insight config 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
566b746ffd settings: one network config per bitcoin network 2014-09-10 13:43:58 -07:00
Manuel Araoz
a619970b48 settings: view refactor 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