Commit graph

4,810 commits

Author SHA1 Message Date
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
Matias Pando
6703652ea9 Showing message only when the copayer may create a backup 2014-09-11 15:22:24 -03: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
Matias Pando
f1a0a5ce91 Merge pull request #3 from bechi/t
fix layout style
2014-09-11 13:06:06 -03:00
bechi
7095750d6f fix style 2014-09-11 13:01:22 -03:00
Matias Pando
bc0790dc3e Merge pull request #2 from bechi/t
fix text color
2014-09-11 11:59:21 -03:00
bechi
7de88f2cc8 fix text color 2014-09-11 11:54:14 -03:00
Matias Pando
2a4b054ba1 Solving conflicts 2014-09-11 11:30:55 -03: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
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
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
3c38a20ac7 fix style 2014-09-10 13:42:08 -07:00
Manuel Araoz
1da67489ea fix sidebar 2014-09-10 13:42:08 -07:00
Manuel Araoz
75dcb73fed fix html 2014-09-10 13:42:08 -07:00
Manuel Araoz
b36564fcb7 settings: fix angular test 6 2014-09-10 13:41:40 -07:00