122 commits

Author	SHA1	Message	Date
David Kelly	1903f65e45	oops	2017-09-08 16:58:12 -07:00
David Kelly	0a3958f743	cr feedback	2017-09-08 16:06:30 -07:00
David Kelly	99cdbbe306	and lets fix the purchases flow too	2017-09-08 14:00:09 -07:00
David Kelly	45c8dd9dd4	cr feedback	2017-09-08 05:28:41 -07:00
David Kelly	efdc340c5c	Use new hfc account endpoint	2017-09-07 18:15:04 -07:00
David Kelly	89cda8d306	oops -- === not ==	2017-09-05 17:15:25 -07:00
David Kelly	1fd30b1e0f	fix passphrase reset	2017-09-05 17:03:11 -07:00
David Kelly	350cee5f35	Wallet cleanup	2017-09-05 16:33:16 -07:00
David Kelly	3bc45aefb1	Reset passphrase fix	2017-09-05 10:04:16 -07:00
David Kelly	90316e275a	Merge branch 'commerce_walletPassphraseModal' of https://github.com/zfox23/hifi into commerce_walletPassphraseModal	2017-09-01 13:33:23 -07:00
David Kelly	9fe6ce0337	working change passphrase. some cleanup to come	2017-09-01 13:11:56 -07:00
Zach Fox	3cf0df518f	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_walletPassphraseModal	2017-09-01 11:53:47 -07:00
Zach Fox	51699c9a6a	Minor changes to fonts and colors	2017-09-01 11:44:46 -07:00
Zach Fox	8fcdfa171d	Add debug button to clear passphrase	2017-08-31 16:51:39 -07:00
Zach Fox	1bfc767daf	Quick fixes	2017-08-31 16:42:14 -07:00
Zach Fox	fa25c434ca	Messages to marketplaces.js	2017-08-31 15:50:42 -07:00
Zach Fox	0a9e3e8967	Remove unnecessary code	2017-08-31 15:46:37 -07:00
Zach Fox	2c2500875f	Fixes and improvements	2017-08-31 15:39:58 -07:00
Zach Fox	eab2947d40	Auth flow	2017-08-31 15:16:29 -07:00
Zach Fox	ce32d2d420	Checkout and Purchases	2017-08-31 14:12:05 -07:00
David Kelly	cdadaa8c9c	missed one	2017-08-31 13:41:53 -07:00
Zach Fox	21a73b2f39	Changes in what I think are the right direction	2017-08-31 13:16:10 -07:00
Zach Fox	914a6bae00	Commerce: Wallet Passphrase Modal	2017-08-31 12:18:38 -07:00
David Kelly	8fbdd207c8	display hfc in "pennies"	2017-08-31 12:10:12 -07:00
David Kelly	962d1fc81d	Merge branch 'master' of https://github.com/highfidelity/hifi into reset-wallet	2017-08-30 15:30:29 -07:00
David Kelly	988ee8c8d1	fix image provider, couple other things	2017-08-30 15:23:54 -07:00
Zach Fox	17d999e721	Fixes	2017-08-30 13:25:34 -07:00
Zach Fox	580865fa5a	Add skeleton for infinite scroll	2017-08-30 12:54:26 -07:00
Zach Fox	7a7d7f95d7	Polish transaction history and prepare for whatever new design	2017-08-30 12:45:13 -07:00
Zach Fox	fb4b0f60fa	Remove most dependencies on 'onVisibleChanged'	2017-08-30 11:55:29 -07:00
howard-stearns	b8da08ca42	reset wallet	2017-08-30 11:29:43 -07:00
Zach Fox	f366743be7	Login; punctuationMode; new images	2017-08-30 11:07:03 -07:00
Zach Fox	6ee634b90a	Lock overlay on top of security image	2017-08-29 17:19:34 -07:00
Zach Fox	5d1170c5d6	Only make message appear after inventory received	2017-08-29 16:17:59 -07:00
Zach Fox	a9c99854f9	Haven't purchased anything yet UI	2017-08-29 15:39:07 -07:00
Zach Fox	c7ad875485	Virtual keyboard and logic	2017-08-29 15:27:53 -07:00
Zach Fox	50241078ae	Buncha punchlist items checked off	2017-08-29 14:30:00 -07:00
David Kelly	84126d8f95	cr feedback	2017-08-29 08:46:13 -07:00
David Kelly	67f25adac0	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/transactionHistoryDisplay	2017-08-29 08:02:53 -07:00
David Kelly	a7af114144	fix wallet, use text from server in history (for now)	2017-08-28 17:04:19 -07:00
Zach Fox	37b6099f36	Hook up root_file_url	2017-08-28 12:46:01 -07:00
Zach Fox	1c1b841a86	Fix security images; actually do the right thing when wallet not set up	2017-08-28 12:18:53 -07:00
Zach Fox	ceb38e261d	HMD Keyboard for purchases filterBar	2017-08-28 10:45:08 -07:00
Zach Fox	ea00668725	Again to Another	2017-08-28 10:04:26 -07:00
Zach Fox	67f3b5c027	Remove quantity	2017-08-28 09:58:45 -07:00
Zach Fox	52cb1dd893	Correctly handle non-JSON items	2017-08-28 09:54:51 -07:00
Zach Fox	e293d122b1	Add security image to Checkout and Purchases	2017-08-28 09:33:30 -07:00
Zach Fox	4c16366562	Ints aren't floats, silly!	2017-08-25 16:55:50 -07:00
Zach Fox	50f7f91d4e	Close the loop.	2017-08-25 16:49:02 -07:00
Zach Fox	a03f9592c1	Inventory to Purchases	2017-08-25 16:34:48 -07:00