167 commits

Author	SHA1	Message	Date
Zach Fox	f14673bc50	Fixup Checkout for apps	2018-02-22 16:38:38 -08:00
Zach Fox	4d2d7fa51f	lots of fun initial progress!	2018-02-22 13:56:46 -08:00
Zach Fox	90f05f4db7	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1	2018-02-22 09:23:49 -08:00
Zach Fox	b548567f5a	Apps protection	2018-02-21 11:17:47 -08:00
Zach Fox	f08c66e3ac	Remove debug code	2018-02-20 14:16:55 -08:00
Zach Fox	11f897beb0	Initial app support	2018-02-20 10:39:36 -08:00
Zach Fox	811ecf9db8	Fix	2018-02-15 14:44:33 -08:00
Zach Fox	95e9eb8e4a	Lots of progress	2018-02-12 17:06:57 -08:00
David Rowe	b1f49be790	Merge branch 'master' into 21742 ... # Conflicts: # scripts/system/libraries/entitySelectionTool.js	2018-02-13 10:04:32 +13:00
Zach Fox	ffea8104fc	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1	2018-02-09 15:59:38 -08:00
Zach Fox	abdd50fb45	it's a start	2018-02-09 15:56:28 -08:00
Zach Fox	a92e614aff	Bugfix.	2018-02-08 10:35:34 -08:00
Zach Fox	7f0915f6ab	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_inspectionCertRedesign_v2	2018-02-07 15:14:33 -08:00
Zach Fox	e01e88d4ae	This works, but is it correct?	2018-02-07 15:13:22 -08:00
John Conklin II	40851b097f	Merge pull request #12324 from ElderOrb/FB11844 ... Fix the issue with not re-enabling preview after it was auto-disabled by wallet/marketplace	2018-02-07 14:31:20 -08:00
David Rowe	adb6f66a05	Handle tablet entities and overlays not being available	2018-02-08 09:51:48 +13:00
Alexander Ivash	151f20a92f	define onWalletScreen in this marketplaces.js scope	2018-02-06 21:25:41 +03:00
Alexander Ivash	46bace97cf	FB11844 - Disable Preview enabled some time after unchecking the Display >Disable Preview option.	2018-02-02 19:08:50 +03:00
Zach Fox	89e52561e3	Silly bugfix	2018-02-01 11:56:54 -08:00
Zach Fox	c5a5bddbc9	More progress	2018-01-10 12:21:12 -08:00
Zach Fox	e5abdc77d9	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1	2018-01-10 10:02:56 -08:00
Zach Fox	5469025113	More more more	2018-01-09 15:53:25 -08:00
Alexander Ivash	7e87cb38e1	adjusted code to PR comments	2018-01-09 11:10:23 +03:00
Alexander Ivash	9a63fc94f0	5648 play audio notification to confirm purchase upon rezzing	2018-01-08 21:14:44 +03:00
Seth Alves	897b96d092	Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3	2017-12-22 07:36:26 -08:00
Zach Fox	08edc52932	Merge pull request #12025 from zfox23/commerce_fixWalletSetupCancel ... Commerce: Fix the behavior of the 'cancel' button in Wallet Setup	2017-12-20 09:18:10 -08:00
Zach Fox	5da49d156e	Commerce: Fix the behavior of the 'cancel' button in Wallet Setup	2017-12-19 16:26:58 -08:00
Seth Alves	2cd64ccd2c	merge from upstream	2017-12-11 10:14:30 -08:00
Zach Fox	b81cdf49ef	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-12-11 09:52:32 -08:00
Zach Fox	a99072622a	Fix Create mode :|	2017-12-08 15:41:47 -08:00
Zach Fox	be737af79d	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_fixEditDependencies	2017-12-08 14:08:35 -08:00
Zach Fox	a81a981676	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-12-08 09:44:52 -08:00
Seth Alves	4659d22021	work around a crash when closing CREATE	2017-12-07 21:32:18 -08:00
Seth Alves	c4b2422f53	Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3	2017-12-07 19:40:52 -08:00
MandatoryMania	f1808ee126	Merge pull request #11943 from MandatoryMania/returnToMarketplace ... return to main mktplace page from rez page	2017-12-07 19:14:37 -08:00
H Q	72ed3b077d	Addressed PR change requests	2017-12-07 11:28:40 -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
Seth Alves	86f58c1353	Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3	2017-12-07 08:50:50 -08:00
H Q	ed76ca8018	return to main mktplace page from rez page	2017-12-06 15:37:19 -08:00
Zach Fox	5f3b148baa	Fix marketplace icon incorrectly appearing active	2017-12-06 13:01:23 -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
Seth Alves	3642d6cfdf	fix includes	2017-12-05 11:26:36 -08:00
Seth Alves	c4e5c53eee	jshint cleanups	2017-12-05 11:17:31 -08:00
Seth Alves	5b908dbf51	import zach's edit.js dependency fixes	2017-12-05 11:14:59 -08:00
Seth Alves	26cb275b89	adjust wearables with saved offsets after WEAR IT	2017-12-05 11:11:56 -08:00
Zach Fox	5261434b6a	Further remove dependencies of marketplaces.js on edit.js	2017-12-04 09:45:36 -08:00
Zach Fox	f47f259816	Turn Commerce on by default	2017-11-17 15:12:49 -08:00
Zach Fox	93c3d53144	Fix marketplaces.js URLs	2017-11-15 16:46:00 -08:00