anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity
8,717 commits 154 branches 37 tags 83 MiB
Commit graph

8,717 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jason Dreyzehner
15836bb817 build(cordova): Begin basing cordova build on more standard config.xml 
This completes the installations of cordova-plugin-qrscanner, including
required changes to config.xml. Where possible, other plugins are now
included with versioning in config.xml.
 2016-09-30 21:22:37 -04:00
Jason Dreyzehner
34197b4ae2 chore(package): add cordova-plugin-qrscanner to dependencies 2016-09-29 21:49:44 -04:00
Gustavo Maximiliano Cortez
583e0a560c Merge pull request #222 from cmgustavo/ref/design-62 
Fix receive and copayers views
 2016-09-29 19:54:02 -03:00
Gustavo Maximiliano Cortez
f57383e2cf
 		Fix receive and copayers views 2016-09-29 19:52:26 -03:00
Gustavo Maximiliano Cortez
88b25257ae Merge pull request #221 from cmgustavo/ref/design-61 
Fix nextStep js error
 2016-09-29 19:24:53 -03:00
Gustavo Maximiliano Cortez
464c2acd45
 		Fix nextStep js error 2016-09-29 19:24:33 -03:00
Gustavo Maximiliano Cortez
8ad3828ddf Merge pull request #220 from cmgustavo/ref/design-60 
Improves performance on tab-home, refactor of walletDetails, bug fixes
 2016-09-29 19:09:58 -03:00
Gustavo Maximiliano Cortez
152660d6b3 Merge pull request #219 from gabrielbazan7/fix/condition 
fix condition when there is not wallet created
 2016-09-29 19:06:00 -03:00
Gustavo Maximiliano Cortez
6aa7b81c81 Merge pull request #218 from jamal-jackson/feature/onboarding_last_steps 
Add Back Button to Disclaimer view
 2016-09-29 19:05:49 -03:00
Gustavo Maximiliano Cortez
28a53ea0c6
 		Improves performance on tab-home, refactor of walletDetails, bug fixes 2016-09-29 19:04:52 -03:00
Jamal Jackson
c06a811bd3 fix bottom being cut off issue when back button present with check for if header is present 2016-09-29 15:41:33 -04:00
Jamal Jackson
845bf1063f added wallet id to disclaimer route params 2016-09-29 15:21:43 -04:00
Gabriel Bazán
d774d8bc8e remove console log 2016-09-29 16:17:13 -03:00
Gabriel Bazán
cc752ec580 fix condition when there is not wallet created 2016-09-29 16:16:27 -03:00
Jamal Jackson
19a3e9afdc Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/onboarding_last_steps 
# Conflicts:
#	src/js/controllers/backup.js
 2016-09-29 14:51:12 -04:00
Jamal Jackson
7f813ba396 added conditional to show back button when no backup has been saved 2016-09-29 14:50:33 -04:00
Gustavo Maximiliano Cortez
4069998930 Merge pull request #217 from gabrielbazan7/fix/loadingTrans 
show loading label if progress > 5
 2016-09-29 13:00:32 -03:00
Gabriel Bazán
3662f5c66b show loading label if progress > 5 2016-09-29 12:58:07 -03:00
Gustavo Maximiliano Cortez
c305c10374 Merge pull request #216 from gabrielbazan7/fix/recentTrans 
experimental feature disabled by default
 2016-09-29 12:08:51 -03:00
Gabriel Bazán
0798c6ed1e experimental feature disabled by default 2016-09-29 11:20:38 -03:00
Gustavo Maximiliano Cortez
ec31e5ddec Merge pull request #214 from cmgustavo/ref/design-59 
Ref/design 59
 2016-09-29 10:24:34 -03:00
Gustavo Maximiliano Cortez
ec58b42f3e
 		Fix gravatar on amount/confirm views 2016-09-29 10:10:53 -03:00
Gustavo Maximiliano Cortez
104209de5d
 		Enable cache for bitpay card 2016-09-29 09:42:38 -03:00
Gustavo Maximiliano Cortez
da931600e2
 		Fix main view of the bitpay card 2016-09-29 09:42:38 -03:00
Gustavo Maximiliano Cortez
1ac78c21a5
 		New send flow for bitpay card. Fix paypro txStatus. Minor bug fixes 2016-09-29 09:42:38 -03:00
Gustavo Maximiliano Cortez
11a7e96c08
 		Fix flow for bitpay card 2016-09-29 09:41:16 -03:00
Gustavo Maximiliano Cortez
046fd92522 Merge pull request #213 from jamal-jackson/feature/address_book 
Added new empty address book design
 2016-09-29 09:40:17 -03:00
Gustavo Maximiliano Cortez
90dece4fc3 Merge pull request #211 from jamal-jackson/feature/recieve_tab_slider 
Fix receive icon slider for tablet
 2016-09-29 09:39:43 -03:00
Jamal Jackson
4d36c7ab27 Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/address_book 2016-09-28 14:53:24 -04:00
Jamal Jackson
8fc4f2d69a added new design for add contact when user has empty address book 2016-09-28 14:53:01 -04:00
Gustavo Maximiliano Cortez
e93da3f391 Merge pull request #212 from gabrielbazan7/fix/scrollResize 
add timeout to resize and fix advanced settings
 2016-09-28 15:50:54 -03:00
Gabriel Bazán
2fdd12a9c2 add timeout to resize and fix advanced settings 2016-09-28 15:45:21 -03:00
Jamal Jackson
7ab4756e78 Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/address_book 2016-09-28 13:46:03 -04:00
Gustavo Maximiliano Cortez
3c706521d5 Merge pull request #210 from gabrielbazan7/feat/join 
go to copayers when join wallet if is not complete
 2016-09-28 14:41:48 -03:00
Jamal Jackson
d1b554a428 Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/recieve_tab_slider 2016-09-28 13:28:37 -04:00
Jamal Jackson
1837d0b7af fix receive tab wallet icon slider on tablet 2016-09-28 13:28:23 -04:00
Gabriel Bazán
8cda873299 go to copayers when join wallet if is not complete 2016-09-28 14:11:09 -03:00
Gustavo Maximiliano Cortez
008eb310e1 Merge pull request #209 from gabrielbazan7/fix/lastState 
Save last state only for onboarding views
 2016-09-28 12:39:57 -03:00
Gabriel Bazán
947a12b996 Save last state only for onboarding views 2016-09-28 12:26:09 -03:00
Gustavo Maximiliano Cortez
8ed5fcf0a9 Merge pull request #208 from gabrielbazan7/feat/pushNotifSettings 
add notifications settings
 2016-09-28 12:00:35 -03:00
Gabriel Bazán
14e941e0f2 switch advanced and about 2016-09-28 11:59:42 -03:00
Gustavo Maximiliano Cortez
c311c978d3 Merge pull request #207 from JDonadio/fix/reverse-timeline 
Reverse timeline
 2016-09-28 11:58:23 -03:00
Gabriel Bazán
fb117ba1ba add notifications settings 2016-09-28 10:50:33 -03:00
Javier
570b16a81a reverse timeline 2016-09-28 10:42:25 -03:00
Gustavo Maximiliano Cortez
37fe2de12b Merge pull request #206 from cmgustavo/ref/design-58 
Minux bug fixes
 2016-09-28 09:44:08 -03:00
Gustavo Maximiliano Cortez
2c3220e041
 		Minux bug fixes 2016-09-28 09:43:19 -03:00
Gustavo Maximiliano Cortez
28df86e6d1 Merge pull request #205 from cmgustavo/ref/design-57 
Ref ionicPopup. Clear amount view after send
 2016-09-27 16:28:44 -03:00
Gustavo Maximiliano Cortez
83a2860ae3 Merge pull request #204 from gabrielbazan7/feat/advancedSettings 
advanced settings and recent transactions
 2016-09-27 16:28:14 -03:00
Gabriel Bazán
a0a9b42f13 adding scss file 2016-09-27 16:25:50 -03:00
Gabriel Bazán
d75af58ddf advanced settings 2016-09-27 16:06:47 -03:00