145 commits

Author	SHA1	Message	Date
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
Brad Davis	bb2e061d77	Fixing global declarations in JS	2017-11-15 12:00:52 -08:00
Brad Davis	26a745be6f	Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet	2017-11-15 11:59:06 -08:00
Brad Davis	1167be4102	Reverting tablet API rename, cleaning up duplicated code	2017-11-15 11:52:55 -08:00
Zach Fox	d6c244d1d5	Remove incorrect logic	2017-11-14 14:54:03 -08:00
Zach Fox	f5994375cf	Remove Marketplace's dependency on Edit.js for rez	2017-11-14 14:29:49 -08:00
Brad Davis	69029b49f3	Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet	2017-11-13 14:29:49 -08:00
Zach Fox	641c4656c4	Fix bug with disappearing certificate info	2017-11-13 10:53:16 -08:00
Brad Davis	7bf1b176d7	Renaming Tablet API to Tablets, supporting dev-mode QML loading from filesystem	2017-11-10 14:21:24 -08:00
Brad Davis	d162e1cff6	Whitelist functionality for tablet apps	2017-11-04 15:14:06 -07:00
Zach Fox	3f0108528d	Remove unnecessary newline	2017-10-25 15:19:56 -07:00
Zach Fox	14150c09ac	Merge branch 'master' of https://github.com/highfidelity/hifi into stagingSetting	2017-10-25 12:59:36 -07:00
Zach Fox	7998984d8e	Missed tons of spots!	2017-10-24 14:30:47 -07:00
Zach Fox	4b50454104	Missed a spot	2017-10-24 14:13:14 -07:00
Zach Fox	ae1b2bd931	'Tis a silly hack	2017-10-20 11:11:23 -07:00
Zach Fox	de50eef9c7	Fix rez certified...	2017-10-18 13:54:46 -07:00
Zach Fox	949da17046	Wear It button for items with category 'Wearables'	2017-10-18 13:51:58 -07:00
Zach Fox	be2b241629	Lots of progress; don't yet have some things	2017-10-10 12:20:48 -07:00
Zach Fox	8d0d9a159f	Bugfixes	2017-10-10 10:38:19 -07:00
Zach Fox	733df8391f	Round 2	2017-10-09 12:27:56 -07:00
Zach Fox	11d0062104	Progress on buy endpoint	2017-10-02 16:57:41 -07:00
Zach Fox	1050d2851d	Modify injected code to add to dropdown menu	2017-10-02 12:37:49 -07:00
Zach Fox	15c0a21e0e	Varied commit - styling changes, beginnings of new Wallet endpoint, etc	2017-10-02 12:19:24 -07:00