96 commits

Author	SHA1	Message	Date
howard-stearns	d68415c47c	code feedback	2018-06-08 16:47:06 -07:00
howard-stearns	d9daa3495a	remove comments / dead code	2018-06-08 15:36:10 -07:00
howard-stearns	e8e12eef8f	checkpoint	2018-05-31 14:42:52 -07:00
howard-stearns	bdd38cef7a	checkpoint	2018-05-30 17:09:13 -07:00
howard-stearns	235971f8bf	checkpoint	2018-05-24 15:23:45 -07:00
Zach Fox	071bf35683	Merge branch 'master' of github.com:highfidelity/hifi into discovery_April2018	2018-04-16 10:11:44 -07:00
Seth Alves	46a741be7b	Merge pull request #12068 from vladest/move_to_qqc2 ... Move to qqc2	2018-04-12 11:26:55 -07:00
Zach Fox	a9b9a1cb10	Commerce: Gifts	2018-04-10 15:54:19 -07:00
Zach Fox	f20eddefc8	Fix 'Private' HMD preview texture enable/disable...again	2018-04-03 13:46:02 -07:00
vladest	fe5d7463fe	Merge branch 'master' into move_to_qqc2	2018-03-10 14:42:51 +01:00
howard-stearns	9d805283d1	clear wallet when picking a new one	2018-03-08 14:24:44 -08:00
Zach Fox	04a230c20f	Merge pull request #12491 from ElderOrb/FB12523 ... fix for not re-enabling preview on leaving security-sensitive pages in marketplace	2018-03-06 16:19:39 -08:00
Alexander Ivash	53e1a0cae5	forward 'maybeEnableHmdPreview' if control is not visible	2018-03-06 22:25:35 +03:00
vladest	531c4dc41d	Merge branch 'master' into move_to_qqc2	2018-02-28 11:40:46 +01:00
Zach Fox	0802bd2c21	Fix going to marketplace main page from WalletChoice	2018-02-26 14:27:59 -08:00
Zach Fox	8223ebf393	Correctly handle referrer from WalletChoice	2018-02-26 12:44:41 -08:00
howard-stearns	dee3df5299	remove debugging	2018-02-25 15:26:18 -08:00
howard-stearns	300f611c47	working, with soft reset	2018-02-25 14:06:06 -08:00
howard-stearns	726c1ed816	receiveAt with new key	2018-02-23 17:05:46 -08:00
howard-stearns	53614a1d9f	almost working	2018-02-23 16:12:01 -08:00
howard-stearns	34253082d4	always reset when asked	2018-02-23 15:11:08 -08:00
howard-stearns	050df2ac2a	merge	2018-02-23 14:46:13 -08:00
Zach Fox	9b54ab1080	UI changes, V1	2018-02-23 14:42:05 -08:00
howard-stearns	09091d29f7	more logic framework	2018-02-23 14:35:30 -08:00
howard-stearns	84f9bff330	basic element, but not pretty and not functioning	2018-02-23 13:56:56 -08:00
howard-stearns	1aaae94cc1	checkpoint	2018-02-22 17:04:27 -08:00
vladest	b947504849	Merge conflicts	2018-01-22 21:42:32 +01:00
vladest	c235deb6f0	Merge branch 'master' into move_to_qqc2	2018-01-19 23:01:04 +01:00
Zach Fox	6b5389a167	go go go go go	2018-01-18 17:37:26 -08:00
Zach Fox	8cc5a0a7cb	Add UserInfoViewer	2018-01-16 15:06:51 -08:00
Zach Fox	c216144015	Remove unnecessary comments	2018-01-11 16:21:59 -08:00
Zach Fox	1e608b13b2	Show username when admin (this probably isn't the way to get username	2018-01-11 14:45:43 -08:00
Zach Fox	c5a5bddbc9	More progress	2018-01-10 12:21:12 -08:00
Zach Fox	530df5447d	Even more proress	2018-01-09 15:19:50 -08:00
Zach Fox	40a3f8b31b	Progress	2018-01-09 14:13:36 -08:00
Zach Fox	a6259a5ef5	Initial progress	2018-01-09 13:39:28 -08:00
vladest	2fbd0a41b1	Move Slider	2017-12-28 15:39:22 +01:00
Zach Fox	18d5be147c	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-12-19 09:48:15 -08:00
Zach Fox	6fc58b713e	Merge pull request #12009 from zfox23/commerce_dataTracking2 ... Commerce: Add Passphrase Auth Status data tracking	2017-12-18 16:26:59 -08:00
Zach Fox	afd3cf7045	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-12-18 14:08:09 -08:00
Zach Fox	e075cd79fb	Add Passphrase Auth Status data tracking	2017-12-18 11:51:12 -08:00
Zach Fox	89795272c7	More security images!	2017-12-15 16:26:13 -08:00
vladest	2770650b65	Merge branch 'master' into move_to_qqc2	2017-12-12 18:48:41 +01:00
Zach Fox	2225352b1e	Fix wallet setup	2017-12-11 17:15:15 -08:00
Zach Fox	b2bafed2bb	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-12-07 11:21:24 -08:00
Zach Fox	3183a1a8b9	Add setupAttemptID to every step (thanks Dave)	2017-12-05 16:48:30 -08:00
Zach Fox	c807fc80e3	Add marketplace cta referrer	2017-12-05 15:25:05 -08:00
Zach Fox	7521e4870e	Bugfixes	2017-12-05 14:56:47 -08:00
Zach Fox	668f6d50b5	Add data tracking for wallet setup	2017-12-05 14:13:48 -08:00
Zach Fox	1507620fd5	Merge pull request #11921 from ElderOrb/FB10024 ... 10024 Wallet: TextField Focus Problems	2017-12-05 10:52:08 -08:00