Commit Graph

121 Commits

Author SHA1 Message Date
Matias Alejo Garcia 6b0782f3a0 Merge pull request #1102 from yemel/fix/ui-issues
Fix/ui issues
2014-08-15 16:30:40 -04:00
Matias Alejo Garcia 352185e66c Merge pull request #1082 from yemel/feature/mobile-clipboard
Feature/mobile clipboard
2014-08-15 16:06:31 -04:00
Yemel Jardi 818c01bf52 Remove 1-2-3 image from creation/join at Android version 2014-08-15 15:47:26 -03:00
Yemel Jardi 236e7b91be Make only the address icon clickable 2014-08-15 13:16:06 -03:00
Yemel Jardi 5a79256b0c Disable select of #signatures for only 1 copayer 2014-08-15 12:22:34 -03:00
Christopher Jeffrey ea7948f420 paypro: better error display on no unspent outputs. 2014-08-14 09:52:43 -04:00
Manuel Araoz 324dfbc36a finished refactor 2014-08-14 09:52:43 -04:00
Manuel Araoz 967457764c refactor controller code to controller from directive 2014-08-14 09:52:42 -04:00
Christopher Jeffrey fcb0484828 paypro: ui - move merchant data into its own element. 2014-08-14 09:52:42 -04:00
Christopher Jeffrey 5ebb344cd2 send: lower btc send limit - dust. 2014-08-14 09:52:42 -04:00
Christopher Jeffrey aed815f5cd paypro: angularize the markup and address directive. 2014-08-14 09:52:41 -04:00
Yemel Jardi b60e8ed407 Add copy to clipboard button 2014-08-13 13:34:47 -03:00
Yemel Jardi 815c98f7e8 Merge pull request #1076 from matiu/bug/02-open-wallet
Bug/02 open wallet
2014-08-13 12:33:46 -03:00
Matias Alejo Garcia 35ab711846 refactor lock warning and add tests 2014-08-12 15:26:15 -04:00
bechi 21a32c213c add tooltips 2014-08-11 10:15:24 -03:00
bechi 41ee5edfc0 fix left bar 2014-08-08 11:22:12 -03:00
bechi 86e4c0cea9 fix scann button 2014-08-08 10:36:25 -03:00
Gustavo Maximiliano Cortez 801e746d11 Show a warning if trying to open same wallet in same browser. Fix redirect to receive. 2014-08-07 18:57:19 -03:00
Gustavo Maximiliano Cortez fe53f1b87c Merge pull request #1059 from yemel/feature/change-menu
Refactor menu, split transactions tab into send and history
2014-08-07 10:26:40 -03:00
Matias Alejo Garcia bb9406be01 Merge pull request #1033 from cmgustavo/bug/01-url-handler
Fixes: url handler
2014-08-07 00:58:08 -03:00
Matias Alejo Garcia 35f379f8c8 Merge pull request #1042 from yemel/feature/add-limit-feedback
WIP: Add comment about #copayers and #signatures limits
2014-08-07 00:57:11 -03:00
Gustavo Maximiliano Cortez fd030ecbfb Fix Conflicts:
js/controllers/join.js
2014-08-06 18:55:44 -03:00
Gustavo Maximiliano Cortez 0c2141c380 Fix Conflicts:
views/unsupported.html
2014-08-06 18:51:04 -03:00
Matias Alejo Garcia 8e2802e1e7 Merge pull request #1064 from cmgustavo/feature/01-setup
add steps to creation process
2014-08-06 18:45:26 -03:00
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 c588d97fc3 add steps to creation process 2014-08-06 18:21:14 -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
Yemel Jardi 2ba794fc47 Change url to /receive and /history 2014-08-06 15:34:56 -03:00
Yemel Jardi ad75265e93 Refactor menu, split transactions tab into send and history 2014-08-06 13:59:33 -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 4c4f20afb6 Add comment about #copayers and #signatures limits 2014-08-04 17:27:59 -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
Gustavo Maximiliano Cortez ee031849b2 Fixes: url handler 2014-08-04 11:27:46 -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