21800 commits

Author	SHA1	Message	Date
Chris Collins	12d720805c	Merge pull request #11319 from jherico/async_qml_load_crash ... Fix potential crash on asynchronous QML loads	2017-09-07 12:03:10 -07:00
Brad Hefta-Gaub	c5098abfb9	Merge pull request #10937 from kencooke/zzmp-audio/peak-values ... Add peak values for all input devices in selection dialog	2017-09-07 11:58:50 -07:00
Brad Davis	cc3beb3d91	Fix potential crash on asynchronous QML loads	2017-09-07 09:53:21 -07:00
Howard Stearns	a0ae9ee747	Merge pull request #11311 from davidkelly/dk/walletCleanup ... wallet cleanup	2017-09-06 14:29:24 -07:00
anshuman64	94e1545e58	Merge pull request #11298 from ElderOrb/case7382 ... 7382 Create Menu does not Work on Tablet	2017-09-06 14:09:41 -07:00
Chris Collins	8563a05431	Merge pull request #11255 from misslivirose/feat/tablet-tutorial ... Removing tutorial paths for first run experience	2017-09-06 09:23:45 -07:00
Dante Ruiz	e216fe51ea	Merge pull request #11221 from vladest/flickable_web_pages ... Flickable web pages	2017-09-05 18:49:57 -07:00
Liv	930243539c	add back first run to false and fix formatting	2017-09-05 17:50:25 -07:00
anshuman64	3a44c6977e	Merge pull request #11300 from ElderOrb/case7196 ... 7196 Mouse pointer no longer visible in HMD mode	2017-09-05 17:42:36 -07:00
David Kelly	89cda8d306	oops -- === not ==	2017-09-05 17:15:25 -07:00
David Kelly	1fd30b1e0f	fix passphrase reset	2017-09-05 17:03:11 -07:00
David Kelly	350cee5f35	Wallet cleanup	2017-09-05 16:33:16 -07:00
Thijs Wenker	08baa96dc9	Merge pull request #11296 from misslivirose/fix-content-message ... More detailed domain replacement message	2017-09-06 00:44:48 +02:00
vladest	85a3771a98	Remove commented out code	2017-09-05 22:19:38 +02:00
vladest	dd6d530853	Merge branch 'master' into flickable_web_pages	2017-09-05 22:14:52 +02:00
Dante Ruiz	ad5b8c438e	Merge pull request #11107 from mnafees/21412 ... CR for Job #21412 - Add "Report a Problem" feature	2017-09-05 13:05:05 -07:00
Dante Ruiz	9f2bdce190	Merge pull request #11005 from Armads/WL21424 ... WL21424 hide head attachments when head joint is hidden	2017-09-05 13:04:14 -07:00
Dante Ruiz	e69227aef8	Merge pull request #11209 from vladest/tablet_login_button ... Added login button to Tablet	2017-09-05 12:59:02 -07:00
David Kelly	3bc45aefb1	Reset passphrase fix	2017-09-05 10:04:16 -07:00
beholder	c62f9007e9	7196 Mouse pointer no longer visible in HMD mode ... The issue was caused by creation of additional instances of 'Cursor::Manager' in plugins, which happened because Cursor::Manager's code is inside static library so every module was getting its own copy of it. As the result cursor-related settings from Application never reached plugins. The fix is based on converting 'Cursor::Manager' into 'Dependency' to avoid additional instances creation in plugins	2017-09-03 15:20:59 +03:00
beholder	b5faa8ac56	7382 Create Menu does not Work on Tablet	2017-09-02 18:20:00 +03:00
David Kelly	47cd47f819	log when no passphrase was set before trying to decrypt	2017-09-01 14:50:45 -07:00
David Kelly	feaa8d3120	Someday, a real rain will come and wash Wallet.cpp ... Till then, this little change will have to do.	2017-09-01 14:06:43 -07:00
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
David Kelly	655dc61ff2	doh	2017-09-01 10:16:45 -07: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
Zach Fox	ce32d2d420	Checkout and Purchases	2017-08-31 14:12:05 -07: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
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