Commit graph

9,462 commits

Author SHA1 Message Date
Marty Alcala
d4513ba46b fix merge conflicts 2016-10-27 11:44:03 -04:00
Matias Alejo Garcia
2ce9e4bf23 Merge pull request #4931 from gabrielbazan7/ref/txpTimeline1
change complete date format to time ago
2016-10-27 12:41:47 -03:00
Matias Alejo Garcia
a97d1385cb Merge pull request #4919 from bitjson/feature/generate-ico
feat(resources): automatically generate Windows ICO file
2016-10-27 12:41:08 -03:00
Matias Alejo Garcia
070ce0470a Merge pull request #4930 from gabrielbazan7/fix/nextSteps
fix next steps
2016-10-27 12:35:56 -03:00
Gabriel Bazán
c5bc1006a9 refactor 2016-10-27 12:31:28 -03:00
Gabriel Bazán
2f78ae04e8 change complete date format to time ago 2016-10-27 12:26:41 -03:00
Matias Alejo Garcia
9dde74e5cb Merge pull request #4903 from jamal-jackson/feature/send_view_flicker_fix
fix flicker issue
2016-10-27 12:13:34 -03:00
Matias Alejo Garcia
72f3a79457 Merge pull request #4902 from gabrielbazan7/feat/newRealeases
new releases
2016-10-27 11:58:06 -03:00
Matias Alejo Garcia
d2ab77ee2e Merge pull request #4895 from cmgustavo/bug/glidera-settings-details
Changes settings icon. Buy and Sell options as home view
2016-10-27 11:57:09 -03:00
Gabriel Bazán
038a4413d0 fix next steps 2016-10-27 11:45:38 -03:00
Javier Donadío
66389ffbd7 Merge pull request #4929 from gabrielbazan7/ref/txpTimeline
remove created by and add complete date format to timeline
2016-10-27 11:43:53 -03:00
Gabriel Bazán
6b9db450b2 remove created by and add complete date format to timeline 2016-10-27 11:23:10 -03:00
Gustavo Maximiliano Cortez
3fc0ad8c11 Merge pull request #4928 from gabrielbazan7/feat/txp
formatted locked amounts and addressbook backward compatibility
2016-10-27 10:53:36 -03:00
Gustavo Maximiliano Cortez
55741b46ed Merge pull request #4923 from bitjson/master
Update README.md
2016-10-27 10:37:46 -03:00
Gustavo Maximiliano Cortez
a3b756e82a Merge pull request #4913 from gabrielbazan7/feat/explanation
adding explanation to clear cache feature
2016-10-27 10:35:35 -03:00
Gabriel Bazán
014175f1b6 formatted locked amounts and addressbook backward compatibility 2016-10-27 10:28:46 -03:00
Gustavo Maximiliano Cortez
194ff49ef8 Merge pull request #4914 from gabrielbazan7/fix/alertMessage
fix alert messages
2016-10-27 10:23:11 -03:00
Gustavo Maximiliano Cortez
9ad0d49c9b Merge pull request #4922 from bitjson/travis
Fix build
2016-10-27 10:10:53 -03:00
Jason Dreyzehner
2bf0b9e4a7 Update README.md 2016-10-26 21:45:06 -04:00
Jason Dreyzehner
24c2809890 ci(travis): no coverage is currently being generated 2016-10-26 21:25:35 -04:00
Jason Dreyzehner
58f9afa7ce fix(test): remove call to deleted test-coveralls task 2016-10-26 21:18:04 -04:00
Jason Dreyzehner
2a140a7217 ci(travis): use Trusty to allow secp256k1 to install without C++11 errors 2016-10-26 21:06:22 -04:00
Jason Dreyzehner
8115d15675 fix(build): only install the fileicon module on macOS 2016-10-26 20:18:34 -04:00
Jason Dreyzehner
7bf04585a0 build(package): warn if using an unsupported version of node or npm 2016-10-26 20:17:01 -04:00
Jason Dreyzehner
bed35178c9 ci(travis): update travis configuration 2016-10-26 20:05:06 -04:00
Jason Dreyzehner
2eb47a53a4 feat(resources): automatically generate Windows ICO file
Also corrects the location/adds several other resources
2016-10-26 19:52:46 -04:00
Marty Alcala
ccd2870c51 pause preview when handling paypro from scanner 2016-10-26 17:27:25 -04:00
Marty Alcala
291326ad0a treat paypro as a non-url param 2016-10-26 17:21:44 -04:00
Marty Alcala
2b3ec92fd7 remove instances of _paypro variable 2016-10-26 16:36:31 -04:00
Gabriel Bazán
f6806fcdf3 fix alert messages 2016-10-26 17:12:25 -03:00
Marty Alcala
0e5f342198 a little cleanup 2016-10-26 16:09:21 -04:00
Marty Alcala
c0c08eeb59 fetch paypro details before navigating to confirm view for a topup 2016-10-26 16:03:20 -04:00
Gabriel Bazán
d42dd2fdab adding explanation to clear cache feature 2016-10-26 16:48:45 -03:00
Marty Alcala
ffeb8ad612 ensure rate limit errors are handled properly 2016-10-26 15:02:14 -04:00
Gustavo Maximiliano Cortez
e262e29afb Merge pull request #4905 from gabrielbazan7/feat/noWallets
adding no wallets available label
2016-10-26 15:40:46 -03:00
Marty Alcala
08711f1f07 move getPayProDetails method to its own service 2016-10-26 14:36:28 -04:00
Marty Alcala
22d4a92f7d Revert "Revert "Scan handling""
This reverts commit 641091e7d9.
2016-10-26 14:00:43 -04:00
Gabriel Bazán
4f81b1f39b adding no wallets available label 2016-10-26 14:35:44 -03:00
Gustavo Maximiliano Cortez
384201841b Merge pull request #4898 from gabrielbazan7/ref/backupNeeded
remove to show backup needed modal automatically when clicking on receive view
2016-10-26 14:31:08 -03:00
Gustavo Maximiliano Cortez
88d84eca06 Merge pull request #4897 from JDonadio/fix/warning-confirm
Fix warning message on confirm view
2016-10-26 14:30:15 -03:00
Jamal Jackson
a7c1a3ddd3 fix flicker issue 2016-10-26 13:28:08 -04:00
Gabriel Bazán
7fc0bb6fb2 new releases 2016-10-26 12:56:33 -03:00
Gabriel Bazán
e01fd615b0 add dark background 2016-10-26 12:05:52 -03:00
Gabriel Bazán
b82136adf1 fixes 2016-10-26 12:03:55 -03:00
Gabriel Bazán
497a68705a remove to show backup needed modal automatically when clicking on receive view 2016-10-26 11:53:48 -03:00
Javier
ba2d60cfe0 fix warning message on confirm view 2016-10-26 11:20:57 -03:00
Gustavo Maximiliano Cortez
d5ed8ad529
Changes settings icon. Buy and Sell options as home view 2016-10-26 11:11:29 -03:00
Matias Alejo Garcia
1f64c5adaa Merge pull request #4810 from bitpay/bitpay
Simplify user interface & major performance improvements
2016-10-26 10:27:56 -03:00
Matias Alejo Garcia
c44b25a469 Merge pull request #4888 from bitjson/bitpay
Merge latest copay master into bitpay branch
2016-10-26 10:27:36 -03:00
Jason Dreyzehner
f4041f6dbc Merge branch 'master' of github.com:bitpay/copay into bitpay 2016-10-25 17:45:01 -04:00