237 commits

Author	SHA1	Message	Date
Sam Gondelman	b690faeb12	Merge branch 'master' into NOverlays	2018-12-06 11:29:06 -08:00
Zach Fox	31f7d747c8	Bugfixes; enable purchase asset from marketplace screen raise	2018-11-26 15:48:49 -08:00
SamGondelman	079d1dcbd6	convert clientOnly to entityHost and add local entities	2018-11-14 11:25:37 -08:00
Howard Stearns	66ae01e0c3	Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging	2018-11-12 12:55:20 -08:00
Dante Ruiz	501746b156	3D Keyboard	2018-11-08 09:58:53 -08:00
Zach Fox	e80468e423	Remove URL logging from JS and QML	2018-11-06 15:09:24 -08:00
Zach Fox	515ff016a4	Fix seven bugs	2018-11-05 13:03:34 -08:00
Zach Fox	402c23e359	Use useragent instead of queryparam to determine limitedCommerce	2018-11-02 16:07:29 -07:00
Zach Fox	2b50c40224	Minor changes found by Chang	2018-11-02 09:33:06 -07:00
Zach Fox	b6344acc1d	Big checkpoint. be aware - things may be broken	2018-10-30 15:08:13 -07:00
Howard Stearns	6284c902be	use the switch	2018-10-25 11:29:10 -07:00
Howard Stearns	1ff50bc05e	updates notification applies to assets, and there is no wallet activity ... notification	2018-10-24 12:45:17 -07:00
Howard Stearns	ce20b82408	fix view this item in my purchases	2018-10-24 10:41:14 -07:00
Kerry Ivan Kurian	a1bb685176	Remove cruft	2018-10-22 14:00:08 -07:00
Zach Fox	f5a5c0dad3	Attempt to fix wearable bug?	2018-10-22 14:00:06 -07:00
Zach Fox	f9cc4f5a69	Count unique source and url pairs	2018-10-22 14:00:01 -07:00
Zach Fox	de93bbb08b	Only show unique resources	2018-10-22 13:59:59 -07:00
Zach Fox	d44f9e2ccc	Tons of improvements	2018-10-22 13:59:57 -07:00
Kerry Ivan Kurian	3b15548ea3	Display resource-access events in marketplace item tester ... Includes refactoring marketplace item tester into a single-page app.	2018-10-18 01:04:47 -07:00
Howard Stearns	053f22182a	fix inspection case	2018-09-28 11:57:36 -07:00
howard-stearns	b45677cd02	additionally handle item urls (marketplace links from cert inspections)	2018-09-27 19:42:01 -07:00
howard-stearns	a6ef25f662	just whitespace and varname changes	2018-09-27 18:14:16 -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	ad676b14a1	doh - return with a newline (and no semicolon) does not continue. Don't ... need extra handler in marketplace any more.	2018-09-27 16:06:55 -07:00
Howard Stearns	4cf5b51124	works, using additional handler from wallet.js	2018-09-27 15:34:16 -07:00
Howard Stearns	da5f77afcd	Merge branch 'master' of github.com:highfidelity/hifi into account-managed-wallet-punchlist2	2018-09-26 15:26:52 -07:00
Howard Stearns	6e2a7c280e	bottleneck opening our marketplace, and make sure it sets up wallet ... first	2018-09-26 15:21:53 -07:00
Zach Fox	6a3fa28fad	Merge branch 'master' of github.com:highfidelity/hifi into notificationsForFourApps	2018-09-26 15:12:04 -07:00
Kerry Ivan Kurian	e6249e690e	Remove duplicate line	2018-09-25 15:52:26 -07:00
Kerry Ivan Kurian	ff83713365	Use persistent object id counter	2018-09-25 00:58:01 -07:00
Kerry Ivan Kurian	ca1da9c830	Implement delete-from-list functionality in marketplace item tester	2018-09-25 00:57:59 -07:00
Kerry Ivan Kurian	505e08b841	Resolve merge conflicts	2018-09-25 00:57:43 -07:00
Kerry Ivan Kurian	697f556a60	Persist list of marketplace items in test ... The list of resources between runs of the marketplace item tester now persist between runs of the tester.	2018-09-24 16:30:49 -07:00
Zach Fox	a76c3f028d	Small bugfixes	2018-09-24 14:46:00 -07:00
Zach Fox	6284074ff9	Don't show banner when app is open but continue updating data	2018-09-21 10:47:59 -07:00
Zach Fox	33c04631ea	Comments on Confluence doc	2018-09-20 14:37:46 -07:00
Kerry Ivan Kurian	ae4352f450	Rez entity in marketplace item tester	2018-09-20 13:55:22 -07:00
Zach Fox	ed84b49ece	Small bugfixes and using original endpoints	2018-09-19 16:15:59 -07:00
Howard Stearns	d644a63990	consistent/usefull checkout flow when you don't have enough money.	2018-09-19 16:00:40 -07:00
Zach Fox	55a0f77697	Notifications for MARKET	2018-09-18 14:45:14 -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
Dante Ruiz	d78c571df6	revert to use overlays instead of entities for tablet highlighting	2018-08-07 10:56:53 -07:00
Dante Ruiz	6685fbbfc4	Merge branch 'master' of github.com:highfidelity/hifi into tablet-imporvments	2018-06-11 13:56:54 -07:00
Dante Ruiz	59c50b7f26	remove highlight overlay in favor of materialEntity	2018-06-06 08:38:58 -07:00
howard-stearns	e8e12eef8f	checkpoint	2018-05-31 14:42:52 -07:00
howard-stearns	235971f8bf	checkpoint	2018-05-24 15:23:45 -07:00
Zach Fox	a881d07e59	MS15090: Fix gifting when running marketplaces.js separately	2018-05-14 13:12:58 -07:00
Zach Fox	646c0ec987	MS14878: Prevent wallet passphrase leak in specific case	2018-05-07 11:56:47 -07:00
Zach Fox	bbc15cdc63	Finalize work on MS14295 and MS14559	2018-04-27 11:04:46 -07:00