165 commits

Author	SHA1	Message	Date
Howard Stearns	993cb0cfa0	restore separation of inventory vs proofs.	2018-10-24 12:00:17 -07:00
Howard Stearns	95b86bf5b7	initial limited commerce for oculus store prototype	2018-10-23 13:08:39 -07:00
John Conklin II	3210a4ec39	Merge pull request #14109 from zfox23/purchasesNoSnap ... Fix MS18154: Don't snap to cards in My Purchases	2018-10-18 18:24:23 -07:00
Howard Stearns	30971cd766	make room for keyboard and help in SendAsset	2018-10-10 15:43:20 -07:00
Zach Fox	5b72e17981	Fix MS18154: Don't snap to cards in My Purchases	2018-09-28 11:33:22 -07:00
Zach Fox	6a3fa28fad	Merge branch 'master' of github.com:highfidelity/hifi into notificationsForFourApps	2018-09-26 15:12:04 -07:00
Zach Fox	ed84b49ece	Small bugfixes and using original endpoints	2018-09-19 16:15:59 -07:00
Kerry Ivan Kurian	5bc7d944f9	Remove whitespace	2018-09-19 15:17:13 -07:00
Zach Fox	eea4630d2b	Fix MS16704: Remove worn Avatar/Wearable before updating	2018-07-24 14:29:05 -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	919bfce7ab	Simplify	2018-07-18 09:00:01 -07:00
Zach Fox	ef4265de4b	Fix MS16802: In Purchases, there shouldn't be a glyph associated with the Open button	2018-07-17 16:16:43 -07:00
Zach Fox	04f856019d	Fix MS16701: Uninstall installed app before updating	2018-07-12 16:27:19 -07:00
Zach Fox	bf4954d667	Fix MS16615: Don't early-remove .app.json we JUST installed	2018-07-11 15:27:43 -07:00
howard-stearns	43cba68cd2	test wearables for wear before gifting and wearing	2018-06-25 13:40:45 -07:00
howard-stearns	020d622302	don't depend on matching handlers with overlapping requests	2018-06-09 17:34:49 -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	3ade31bdf6	always show edition	2018-06-08 12:57:40 -07:00
howard-stearns	21ed081eae	proper name for updated type filter of inventory endpoint	2018-06-08 09:52:11 -07:00
howard-stearns	64e466ee7d	snapshot stacks	2018-06-07 21:10:40 -07:00
howard-stearns	348d5fc359	inventory text filter	2018-06-07 17:01:48 -07:00
howard-stearns	2761688d39	Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll	2018-06-07 16:14:57 -07:00
howard-stearns	335aeaeb38	purchases cleanup, wearables, and edition numbers when multiples seen.	2018-06-05 17:06:08 -07:00
Zach Fox	c5ef5cfccb	Fix MS15582: In My Purchases, invisible buttons shouldn't be clickable	2018-06-04 16:13:18 -07:00
howard-stearns	bdd38cef7a	checkpoint	2018-05-30 17:09:13 -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	0021af8714	Merge in in-progress changes from old commerce_paginationAndFiltering branch	2018-05-16 12:28:52 -07:00
Zach Fox	83cae54601	Show 'invalidated' label for valid = false	2018-05-14 13:34:20 -07:00
Zach Fox	2a1c2ba7b1	PurchasedItem logic	2018-05-14 09:54:05 -07:00
Zach Fox	81ebb681bb	Show invalidated items in My Purchases	2018-05-14 09:35:34 -07:00
Zach Fox	e48d39ec38	MS14758: Fix avatar reset when gifting worn avatar	2018-05-04 10:10:48 -07:00
Zach Fox	9b80c500e3	Merge pull request #13039 from zfox23/sideloadAppJson ... Enable sideloading .app.json Apps from local disk	2018-04-30 11:14:24 -07:00
Zach Fox	dbd7d7e2b4	Small cleanup	2018-04-27 14:19:58 -07:00
Zach Fox	ea716f2a1e	Enable sideloading .app.json Apps from local disk	2018-04-27 14:08:53 -07:00
Zach Fox	0f36fb113d	Allow gifting of Pending items; remove PoP verification rescheduling on Pending items	2018-04-27 10:20:55 -07:00
Zach Fox	02aa8ac566	Bugfixes per QA	2018-04-16 11:53:37 -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	db2f3451bd	Support .content.zip content sets	2018-03-26 16:20:29 -07:00
Zach Fox	bf48ecda6d	Fix cert location for content sets	2018-03-26 14:48:05 -07:00
vladest	56150f8962	Merge branch 'master' into move_to_qqc2	2018-03-24 15:34:49 +01:00
Zach Fox	0b810c3aa8	Various fixes	2018-03-19 14:39:50 -07:00
Zach Fox	eb8cfcd8e9	Bugfix	2018-03-16 13:13:38 -07:00
Zach Fox	ad33e775f1	Fix bottom anchor for listView when banner is showing	2018-03-16 11:28:03 -07:00
Zach Fox	eb2f8aa169	New notification flow for item updates	2018-03-15 16:03:49 -07:00
Zach Fox	2d57c444b6	Don't auto apply 'updatable' filter	2018-03-14 16:02:33 -07:00