Commit graph

92 commits

Author SHA1 Message Date
Matias Alejo Garcia
0ca9bbe86b Merge pull request #1062 from cmgustavo/feature/01-delete
Add delete wallet from the intermediate screen
2014-08-06 18:38:23 -03:00
Matias Alejo Garcia
cc164af28b Merge pull request #1045 from cmgustavo/feature/01-version
Feature/01 version
2014-08-06 18:34:03 -03:00
Gustavo Maximiliano Cortez
e264aa66a2 Add delete wallet from the intermediate screen (it was lost in migration to new design) 2014-08-06 16:51:45 -03:00
bechi
0831f60845 fix scann wallet secret 2014-08-05 15:38:11 -03:00
Gustavo Maximiliano Cortez
0a388c73ca Added version and networkName label bellow Copay logo 2014-08-05 11:52:51 -03:00
Gustavo Maximiliano Cortez
a5544d08db Merge pull request #1040 from yemel/feature/improve-1-of-1
Remove Name field and copayer list on 1-of-1 wallets
2014-08-05 10:29:46 -03:00
Yemel Jardi
6a3e109f39 Sort copayer list at Tx proposal by creator 2014-08-04 16:43:45 -03:00
Yemel Jardi
523a48b056 Remove Name field and copayer list on 1-of-1 wallets 2014-08-04 16:27:58 -03:00
Gustavo Maximiliano Cortez
94047a77ae Merge pull request #1030 from yemel/feature/replace-you-with-me
Replace You with Me
2014-08-04 15:27:42 -03:00
Yemel Jardi
698bd3f616 Fix typo, closes #1015 2014-08-04 10:22:02 -03:00
Yemel Jardi
125c99320b Replace You with Me 2014-08-04 10:14:03 -03:00
Yemel Jardi
3ab1510051 Android update 0.4.2 2014-08-04 09:49:22 -03:00
Yemel Jardi
64d5eb7577 Change tooltip placement 2014-08-01 15:16:07 -03:00
Gustavo Maximiliano Cortez
a3baab397c Fix Conflicts:
css/main.css
	views/modals/qr-address.html
2014-08-01 13:14:10 -03:00
Gustavo Maximiliano Cortez
85e78f2797 Merge pull request #995 from bechi/bugs/re-size-qr
fix qr size
2014-08-01 13:09:39 -03:00
Gustavo Maximiliano Cortez
313e3e4fcd Merge pull request #998 from yemel/fix/browser-extensions
Fix/browser extensions
2014-08-01 11:54:41 -03:00
bechi
2d3fdbe6fb fix conflict 2014-08-01 11:38:07 -03:00
Gustavo Maximiliano Cortez
1cd1ad2ff8 Fix Conflicts:
views/modals/qr-address.html
2014-08-01 11:28:16 -03:00
Yemel Jardi
c2345fa77c Merge pull request #996 from cmgustavo/feature/02-join
Added invalid message if I paste a wrong wallet secret
2014-08-01 11:20:16 -03:00
Gustavo Maximiliano Cortez
d68f0b366f Merge pull request #994 from yemel/fix/qr-code-schema
Fix address QR code, now it use proper bitcoin: schema
2014-08-01 11:17:23 -03:00
Gustavo Maximiliano Cortez
b94f66f32e Fixed Conflicts:
bower.json
	js/directives.js
	views/includes/sidebar.html
2014-08-01 11:12:35 -03:00
bechi
1a6585a358 fix conflict qr modal 2014-08-01 10:55:47 -03:00
Gustavo Maximiliano Cortez
2784e19cb2 Merge pull request #988 from yemel/fix/open-external
Fix open external in new tab and fix typo
2014-08-01 10:23:26 -03:00
Gustavo Maximiliano Cortez
09286ec37d Merge pull request #986 from yemel/feature/ui-locked-balance
Change available balance to locked
2014-08-01 10:16:00 -03:00
Yemel Jardi
59a03c1f25 Change available balance to locked 2014-08-01 10:09:26 -03:00
bechi
771c0e4a8d fix qr on modal 2014-08-01 09:39:41 -03:00
Gustavo Maximiliano Cortez
f9161ed8f2 Fix Conflicts:
css/main.css
2014-07-31 23:10:38 -03:00
Gustavo Maximiliano Cortez
96116c14fd Added invalid message if I paste a wrong wallet secret 2014-07-31 21:58:35 -03:00
Yemel Jardi
30505ebb49 Fix title position on join wallet screen 2014-07-31 21:20:43 -03:00
Matias Alejo Garcia
1f691d8a2f Merge pull request #993 from yemel/feature/action-icons-tx
Feature/action icons tx
2014-07-31 20:47:31 -03:00
Yemel Jardi
1232b28f0f Fix address QR code, now it use proper bitcoin: schema 2014-07-31 20:39:08 -03:00
Yemel Jardi
9c633f1918 Add icons for user actions at transaction proposal 2014-07-31 20:34:21 -03:00
Gustavo Maximiliano Cortez
8b2ae3cb8f Fixes: tooltips position. copy peerId from sidebar 2014-07-31 17:54:33 -03:00
Gustavo Maximiliano Cortez
87f196ebf4 Implemented icon for copy to clipboard in join, address book, transactions and addresses. 2014-07-31 16:40:26 -03:00
bechi
ccd537751b fix icon-status 2014-07-31 15:46:20 -03:00
Yemel Jardi
aa8211a40e Move tooltip to top, it was out of screen on mobile devices 2014-07-31 14:11:01 -03:00
Yemel Jardi
e5fd3c38f4 Fix open external in new tab and fix typo 2014-07-31 14:06:55 -03:00
bechi
25bedef1fc fix conflict 2014-07-31 12:17:50 -03:00
bechi
ac7e8af991 tx item fix 2014-07-30 17:59:48 -03:00
bechi
c7dfda45a1 tooltips comments 2014-07-30 16:16:54 -03:00
bechi
010c13fa4f QR style changes 2014-07-30 11:41:55 -03:00
Matias Alejo Garcia
d62883e88f Merge pull request #969 from yemel/feature/address-external-link
Open bitcoin url in external app
2014-07-30 09:55:33 -03:00
Yemel Jardi
45f4352ec4 Add qr code to wallet secret and qr scanner at join page 2014-07-30 02:55:59 -03:00
Yemel Jardi
037b6e9d01 Open bitcoin url in external app 2014-07-30 00:51:38 -03:00
bechi
f7e01c477f transaction item 2014-07-29 18:09:09 -03:00
Yemel Jardi
e3eeab0eb6 Change routes to old hastag mode 2014-07-29 14:13:21 -03:00
bechi
b98f1091ab layout bugs 2014-07-25 15:41:34 -03:00
bechi
1e85511c3c signout button 2014-07-25 11:23:06 -03:00
Gustavo Maximiliano Cortez
fc3d5e3157 fixes: layout of transactions, addresses and backups. Icon for qr-address. Hide box with shipping information 2014-07-24 19:57:42 -03:00
Gustavo Maximiliano Cortez
4c190c1132 Fixes: notifications 2014-07-24 17:33:21 -03:00