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
..
backupRequest.js	Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/onboarding_last_steps	2016-09-29 14:51:12 -04:00
backupWarning.js	Ref ionicPopup. Clear amount view after send	2016-09-27 16:01:15 -03:00
collectEmail.js	add news and updates checkbox in onboarding	2016-09-16 14:40:55 -03:00
disclaimer.js	added conditional to show back button when no backup has been saved	2016-09-29 14:50:33 -04:00
notifications.js	onboarding - disable scroll - skip notification view on android	2016-09-13 17:12:17 -03:00
terms.js	add home tip when onboarding is finished	2016-09-19 12:06:46 -03:00
tour.js	remove params from the url	2016-09-02 11:20:33 -03:00
welcomeController.js	Ref ionicPopup. Clear amount view after send	2016-09-27 16:01:15 -03:00