300 commits

Author	SHA1	Message	Date
Zach Fox	d481f081bb	Fix four bugs; truncate some logs	2018-11-01 10:29:38 -07:00
Zach Fox	448be8847f	Notifications are working!	2018-10-31 13:23:58 -07:00
Zach Fox	b6344acc1d	Big checkpoint. be aware - things may be broken	2018-10-30 15:08:13 -07:00
Howard Stearns	9095df4641	fix getting inventory back after showing my items	2018-10-25 12:59:49 -07:00
Howard Stearns	e3b1e14db6	nix "buy" where possible.	2018-10-25 12:37:08 -07:00
Howard Stearns	8b79795247	nix the word "purchase" where possible	2018-10-25 12:31:01 -07:00
Howard Stearns	6284c902be	use the switch	2018-10-25 11:29:10 -07:00
Howard Stearns	7707d92a95	connect wiring on purchases	2018-10-23 16:07:35 -07:00
Howard Stearns	95b86bf5b7	initial limited commerce for oculus store prototype	2018-10-23 13:08:39 -07:00
Howard Stearns	30971cd766	make room for keyboard and help in SendAsset	2018-10-10 15:43:20 -07:00
Howard Stearns	75de305ec3	remove dead code	2018-09-27 16:37:07 -07:00
Howard Stearns	7616639a40	Merge branch 'master' of github.com:highfidelity/hifi into account-managed-wallet-punchlist2	2018-09-27 16:12:21 -07:00
Howard Stearns	e1659ed520	fix old bad merge, and if told referrer while already setup, follow ... immediately	2018-09-26 14:57:47 -07:00
Howard Stearns	391128ef77	Merge branch 'followWalletSetupReferrer' of github.com:zfox23/hifi into account-managed-wallet-punchlist2	2018-09-19 16:46:09 -07:00
Zach Fox	55a0f77697	Notifications for MARKET	2018-09-18 14:45:14 -07:00
Zach Fox	68e6142f8b	Follow wallet setup referrer when autogenerating new wallet	2018-09-14 15:34:00 -07:00
Zach Fox	ea04ee6d35	Wallet now uses AppUi	2018-09-11 12:37:53 -07:00
Zach Fox	dddb2141f0	Implement Wallet Security feature - Auto Logout checkbox	2018-08-23 15:45:29 -07:00
Zach Fox	a1d88a8588	Merge howard/wallet-locker2 into my branch	2018-08-23 14:45:16 -07:00
Zach Fox	67528cb646	Fix MS17215: Auto-show Confirmed txns in Recent Activity when many Pending txns present	2018-08-01 15:49:53 -07:00
howard-stearns	0a47672d64	machinery for fetching next page of inifinite scroll before it really ... needed, and use in our infinite scrolls	2018-07-18 13:00:03 -07:00
Zach Fox	3ceb9ddee9	Merge pull request #13444 from zfox23/MS16074_16076_banklinks ... Fix MS16074, MS16076: Fix links to Go To BankOfHighFidelity	2018-06-25 13:47:08 -07:00
Zach Fox	6fce6431a3	Fix MS16088: Prevent long usernames from overlapping HFC logo in Wallet Home	2018-06-22 16:09:49 -07:00
Zach Fox	25f22326a8	Fix MS16074, MS16076: Fix links to Go To BankOfHighFidelity	2018-06-22 15:43:16 -07:00
Zach Fox	ad1da3e225	Fix MS16012: Correct the criteria used to determine empty txn history	2018-06-18 14:26:46 -07:00
howard-stearns	421edbfa1e	PSFListModel isa ListModel instead of hasa	2018-06-09 16:03:45 -07:00
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	8185d1b5f5	cleanup and consistently don't getNextPage at beginning	2018-06-06 15:24:54 -07:00
howard-stearns	6aa551b35c	Don't getNextPage when at beginning (even if that is also the end).	2018-06-05 17:04:29 -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	17be460adf	checkpoint	2018-05-25 16:37:06 -07:00
howard-stearns	235971f8bf	checkpoint	2018-05-24 15:23:45 -07:00
Zach Fox	bc590f556a	Get first page	2018-05-16 14:43:43 -07:00
Zach Fox	97bb014734	Almost working for Purchases!	2018-05-16 13:20:23 -07:00
Zach Fox	154d70866f	It's working	2018-05-16 12:17:17 -07:00
Zach Fox	ccab2dd641	Starting the work	2018-05-15 11:48:33 -07:00
Zach Fox	53fe0bc616	MS14699: Prevent Wallet passcode from being sticky in certain cases	2018-05-04 14:08:21 -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	a2f5891a0b	Cleanup 'Private' HMD Preview State Machine Logic	2018-04-10 16:00:18 -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	56150f8962	Merge branch 'master' into move_to_qqc2	2018-03-24 15:34:49 +01:00
Zach Fox	e2326a3733	Initial work for 'messages waiting' light	2018-03-13 17:05:16 -07:00
vladest	fe5d7463fe	Merge branch 'master' into move_to_qqc2	2018-03-10 14:42:51 +01:00
John Conklin II	6969f014fc	Merge pull request #12601 from howard-stearns/clear-wallet-when-picking-a-new-one ... clear wallet when picking a new one	2018-03-09 10:09:41 -08:00
howard-stearns	9d805283d1	clear wallet when picking a new one	2018-03-08 14:24:44 -08:00
Zach Fox	086431d0e7	Merge branch 'master' of github.com:highfidelity/hifi into fixFontsAgain	2018-03-08 13:50:19 -08:00