Jamal Jackson 794e0a304e Merge branch 'ref/design' of https://github.com/bitpay/bitpay-wallet into feature/external_link_open_system_browser ... # Conflicts: # www/views/tab-settings.html		2016-10-13 11:57:24 -04:00
..
backupRequest.js	disable hardware backbutton (android) and back swipe (ios) and more fixes	2016-10-10 17:53:11 -03:00
backupWarning.js	fix onboarding	2016-10-11 16:24:59 -03:00
collectEmail.js	disable hardware backbutton (android) and back swipe (ios) and more fixes	2016-10-10 17:53:11 -03:00
disclaimer.js	perf(startupService): remove timers, control splashscreen and statusbar from startupService	2016-10-11 22:46:07 -04:00
notifications.js	disable hardware backbutton (android) and back swipe (ios) and more fixes	2016-10-10 17:53:11 -03:00
terms.js	added additional options to external service to provide custom message. disabled confirm dialog where needed	2016-10-12 15:29:06 -04:00
tour.js	add scope apply to onboarding rate values	2016-10-12 16:22:02 -03:00
welcomeController.js	perf(startupService): remove timers, control splashscreen and statusbar from startupService	2016-10-11 22:46:07 -04:00