129 commits

Author	SHA1	Message	Date
Zach Fox	31f7d747c8	Bugfixes; enable purchase asset from marketplace screen raise	2018-11-26 15:48:49 -08:00
Zach Fox	e80468e423	Remove URL logging from JS and QML	2018-11-06 15:09:24 -08:00
Howard Stearns	03ac18ab74	Merge pull request #14299 from davidkelly/dk/19591 ... Don't attempt purchase of sold out items	2018-11-05 16:20:02 -08:00
howard-stearns	8ad8398ef3	remove 'purchase' from login notice.	2018-11-04 11:17:56 -08:00
Zach Fox	402c23e359	Use useragent instead of queryparam to determine limitedCommerce	2018-11-02 16:07:29 -07:00
Zach Fox	4a56f769e5	Re-add some code I shouldn't have removed	2018-11-01 11:04:59 -07:00
Zach Fox	34fb849536	Cleanup FIXME	2018-10-31 13:53:18 -07:00
Zach Fox	b6344acc1d	Big checkpoint. be aware - things may be broken	2018-10-30 15:08:13 -07:00
David Kelly	015b5fa681	Don't attempt purchase of sold out items	2018-10-30 08:01:22 -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	e1e9b78427	filter priced items from marketplace	2018-10-24 12:22:03 -07:00
Howard Stearns	8ee6a0ceff	disable priced items	2018-10-24 11:37:02 -07:00
Howard Stearns	95b86bf5b7	initial limited commerce for oculus store prototype	2018-10-23 13:08:39 -07:00
John Conklin II	3bbc01477e	Merge pull request #14055 from davidkelly/dk/18147 ... Do not have active buy button on invalidated items	2018-10-01 16:50:53 -07:00
Howard Stearns	940db4f112	fix recently introduced bug	2018-09-26 15:01:30 -07:00
David Kelly	fe9b972c80	Do not have active buy button on invalidated items	2018-09-21 15:46:57 -07:00
Zach Fox	9e50904376	Merge branch 'master' of github.com:highfidelity/hifi into discovery_appUi	2018-09-14 14:36:22 -07:00
howard-stearns	685b2978ce	Text tuning for wallet setup call to action	2018-09-14 08:26:25 -07:00
Zach Fox	01073ca18d	Lots of changes; marketplaces.js working now	2018-09-12 15:46:17 -07:00
Zach Fox	6d345e506b	Marketplaces.js WIP	2018-09-11 19:42:12 -07:00
Zach Fox	a5ef3fa729	Fix MS14129: Prevent Marketplace buttons from getting stuck on hover state	2018-06-11 12:00:51 -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	98cdbbb3e6	Small update to dot before merging in filterBar	2018-03-14 09:45:42 -07:00
Zach Fox	e2326a3733	Initial work for 'messages waiting' light	2018-03-13 17:05:16 -07:00
Zach Fox	7b6b08fd26	Upgrade specific edition	2018-03-13 13:51:10 -07:00
Zach Fox	08b2be85d2	Don't pass isUpdating around	2018-03-07 11:44:54 -08:00
Zach Fox	d07d02b2bc	Take certID from backend instead of query params; Better loading; Uninstall app before updating	2018-03-07 11:10:47 -08:00
Zach Fox	35b23cc954	It's working!	2018-03-05 15:54:17 -08:00
Zach Fox	4046c873bd	Still need to send correct thing to metaverse	2018-03-05 11:24:59 -08:00
Zach Fox	f10f9aa939	Continued progress	2018-03-05 10:01:40 -08:00
Zach Fox	f53aba2a32	Initial progress	2018-03-02 15:53:06 -08:00
Zach Fox	47a209dc4c	Make things slightly better?	2018-01-02 13:11:00 -08:00
Zach Fox	25e76c668b	Fix marketplacesInject.js for local Metaverse	2018-01-02 12:22:40 -08:00
Zach Fox	618e5c9032	Commerce Data Tracking: Iteration 3 (Purchases)	2017-12-21 15:46:01 -08:00
Zach Fox	5da49d156e	Commerce: Fix the behavior of the 'cancel' button in Wallet Setup	2017-12-19 16:26:58 -08:00
Zach Fox	ed5da4f83b	Fix bug preventing 'get' buttons from working in marketplace	2017-12-19 15:07:50 -08:00
David Kelly	4fc69f8067	Merge pull request #11988 from davidkelly/dk/soldOut ... Handle sold out items a bit better	2017-12-19 07:43:57 -07:00
Zach Fox	74a5f0881f	Fix broken Buy buttons on Marketplace	2017-12-14 11:56:36 -08:00
David Kelly	a49ee46f54	Handle sold out items a bit better	2017-12-14 11:52:56 -07:00
Alexander Ivash	c007c6d00f	10108 marketplace category cannot scroll	2017-12-06 02:47:19 +03:00
Alexander Ivash	78d89d886f	9264 dismiss keyboard after user finished typing in marketplace search bar and hit search or return key	2017-11-16 00:13:46 +03:00
Zach Fox	33b6a13a4d	Revert 11728 and fix marketplace JS injection - should revisit	2017-11-08 15:21:36 -08:00
howard-stearns	76e06a6214	Update to stable-v-staging metaverse switching, to handle marketplace ... injection.	2017-11-01 15:28:28 -07:00
Zach Fox	f9a410de87	Change 'GET' to 'BUY' when hovering over costed items	2017-10-31 14:53:37 -07:00
Zach Fox	7998984d8e	Missed tons of spots!	2017-10-24 14:30:47 -07:00
Zach Fox	aa48215933	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_OctoberFixes2	2017-10-19 10:54:31 -07:00
Zach Fox	6c7096b0d7	Fix login button injection on individual item page	2017-10-18 14:53:39 -07:00
Zach Fox	17a0dd2a76	Elide long usernames in injected code	2017-10-13 13:32:55 -07:00
Zach Fox	8d0d9a159f	Bugfixes	2017-10-10 10:38:19 -07:00