58714 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
David Kelly	90316e275a	Merge branch 'commerce_walletPassphraseModal' of https://github.com/zfox23/hifi into commerce_walletPassphraseModal	2017-09-01 13:33:23 -07:00
Liv	7eab80e494	change message when permissions to replace domain content are not present	2017-09-01 13:17:37 -07:00
David Kelly	9fe6ce0337	working change passphrase. some cleanup to come	2017-09-01 13:11:56 -07:00
Zach Fox	3cf0df518f	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_walletPassphraseModal	2017-09-01 11:53:47 -07:00
Zach Fox	51699c9a6a	Minor changes to fonts and colors	2017-09-01 11:44:46 -07:00
David Kelly	d8bb3c7915	Merge pull request #11289 from davidkelly/dk/penniesAndStuff ... Display hfc in "pennies"	2017-09-01 11:39:30 -07:00
MandatoryMania	8c6bbb4968	Merge pull request #11295 from MandatoryMania/walletImgSwitch ... Wallet img switch	2017-09-01 10:27:04 -07:00
David Kelly	655dc61ff2	doh	2017-09-01 10:16:45 -07:00
Menithal	5506520226	Fixed missing semi colon	2017-09-01 08:20:54 +03:00
Liv	8d21b286b4	string fix	2017-08-31 19:34:01 -07:00
Hisham Qayum	ff6217069b	reverting some unneeded code changes	2017-08-31 17:30:24 -08:00
David Kelly	451936214d	initial stab at changing passphrase	2017-08-31 17:05:55 -07:00
Zach Fox	8fcdfa171d	Add debug button to clear passphrase	2017-08-31 16:51:39 -07:00
David Kelly	1eb503f526	we are qt5.6 on mac	2017-08-31 16:49:12 -07:00
Zach Fox	1bfc767daf	Quick fixes	2017-08-31 16:42:14 -07:00
Zach Fox	fa25c434ca	Messages to marketplaces.js	2017-08-31 15:50:42 -07:00
Zach Fox	0a9e3e8967	Remove unnecessary code	2017-08-31 15:46:37 -07:00
Zach Fox	2c2500875f	Fixes and improvements	2017-08-31 15:39:58 -07:00
Hisham Qayum	6f1bb6abe2	wallet icon now has white background, diff design	2017-08-31 14:29:03 -08:00
Hisham Qayum	d47b29f0aa	Merge branch 'master' of https://github.com/highfidelity/hifi	2017-08-31 14:16:36 -08:00
Zach Fox	eab2947d40	Auth flow	2017-08-31 15:16:29 -07:00
Brad Davis	65b49a958f	Merge branch 'master' into 21484	2017-08-31 14:59:30 -07:00
Menithal	0e3fc64f63	Fixed Inverse logic and Cleanup	2017-09-01 00:35:56 +03:00
Zach Fox	ce32d2d420	Checkout and Purchases	2017-08-31 14:12:05 -07:00
Menithal	663e8514de	Found the culprit. Was overriding the value	2017-09-01 00:00:24 +03:00
David Kelly	cdadaa8c9c	missed one	2017-08-31 13:41:53 -07:00
David Kelly	f8341ce1da	warning	2017-08-31 13:24:07 -07:00
David Kelly	de2ce1cd5f	warning	2017-08-31 13:23:38 -07:00
Zach Fox	21a73b2f39	Changes in what I think are the right direction	2017-08-31 13:16:10 -07:00
druiz17	98b1fe6138	Merge pull request #11266 from ElderOrb/case6819 ... 6819 - Create button not disabled	2017-08-31 12:36:08 -07:00
David Kelly	396f108182	forgot this the first time	2017-08-31 12:18:46 -07:00
Zach Fox	914a6bae00	Commerce: Wallet Passphrase Modal	2017-08-31 12:18:38 -07:00
David Kelly	8fbdd207c8	display hfc in "pennies"	2017-08-31 12:10:12 -07:00
Brad Davis	71a403f03f	Update BUILD_WIN.md	2017-08-31 11:56:27 -07:00
Brad Davis	984503ce29	Update build instructions for vcpkg usage	2017-08-31 11:55:53 -07:00
Zach Fox	4643a6bf5f	Merge pull request #11286 from zfox23/commerce_fixAdminMarketplaceButtons ... Fix the duplicated buy buttons for admins on Marketplace	2017-08-31 10:53:48 -07:00
Bradley Austin Davis	fb79ba2c6c	Migrate to vcpkg version of OpenSSL	2017-08-31 10:49:49 -07:00
Zach Fox	164eeaae64	Fix the duplicated buy buttons for admins on Marketplace	2017-08-31 10:41:44 -07:00
vladest	6faab9fb1c	Switch flickable on by default for list and grid tabs	2017-08-31 19:21:38 +02:00
Chris Collins	f41ca5ab6f	Merge pull request #11277 from Atlante45/new-master ... Update master from stable	2017-08-31 09:48:20 -07:00
Zach Fox	9bbcf3e1ae	Merge pull request #11232 from zfox23/SelectionScriptingInterface ... Selection Scripting Interface	2017-08-31 08:57:24 -07:00
vladest	a80d9a22df	Added option to disable flickable for web view	2017-08-31 12:20:20 +02:00
Hisham Qayum	a446851e90	Merge branch 'master' of https://github.com/highfidelity/hifi	2017-08-30 20:03:56 -08:00
Seth Alves	41b51804dc	fix comment	2017-08-30 17:53:55 -07:00
Seth Alves	3f0a95d8db	remove unneeded line	2017-08-30 17:53:20 -07:00
Seth Alves	ca86ce59c2	fix a bug that cuased dynamic children to wink in and out and then vanish	2017-08-30 17:44:42 -07:00
Zach Fox	913618ded5	Merge branch 'master' of https://github.com/highfidelity/hifi into SelectionScriptingInterface	2017-08-30 16:13:50 -07:00
David Kelly	84e13c84ae	Merge pull request #11273 from howard-stearns/reset-wallet ... reset wallet	2017-08-30 16:10:26 -07:00
David Kelly	962d1fc81d	Merge branch 'master' of https://github.com/highfidelity/hifi into reset-wallet	2017-08-30 15:30:29 -07:00
Zach Fox	dbb7023fc1	Fix warnings	2017-08-30 15:26:25 -07:00