3388 commits

Author	SHA1	Message	Date
Seth Alves	11df5a447e	Merge pull request #11310 from ElderOrb/case6718 ... 6718 PR11082: Help text cannot be dismissed by clicking on the text i…	2017-09-14 11:17:48 -07:00
Melissa Brown	49ab8af428	Merge pull request #11344 from Menithal/21536 ... 21536: Clap App!	2017-09-13 12:54:31 -07:00
Menithal	ca2d22a192	Updated Scripts	2017-09-12 21:22:40 +03:00
vladest	92a83328c0	Follow naming convention	2017-09-12 19:17:49 +02:00
vladest	08deba35ae	Take in account current WebEngine profile to make sure all features are in place, like download	2017-09-12 16:22:53 +02:00
vladest	17a923b9de	Temporarily disable WebView flickable until new solution will be investigated	2017-09-12 15:48:47 +02:00
Menithal	30c979bd31	Added Clap App to Repository ... Addede Clap App Icons to tablet icons (there needs to be another way to do this than link directly to link or use this method!) Added module as valid global to eslintrc	2017-09-11 23:48:30 +03:00
Howard Stearns	54deef8f32	Merge pull request #11329 from davidkelly/dk/walletSSLFix ... fix wallet for new openssl	2017-09-11 10:07:12 -07:00
Andrew Meadows	a9feca18ca	Merge pull request #11317 from vladest/fix_flickable_on_wheel ... Add flickable on mouse wheel to web pages	2017-09-11 09:32:31 -07:00
David Kelly	1903f65e45	oops	2017-09-08 16:58:12 -07:00
David Kelly	0a3958f743	cr feedback	2017-09-08 16:06:30 -07:00
David Kelly	99cdbbe306	and lets fix the purchases flow too	2017-09-08 14:00:09 -07:00
David Kelly	db0ecb61fd	Merge pull request #11325 from davidkelly/dk/UserHfcAccountRework ... Use new hfc account endpoint	2017-09-08 09:03:53 -07:00
David Kelly	45c8dd9dd4	cr feedback	2017-09-08 05:28:41 -07:00
David Kelly	efdc340c5c	Use new hfc account endpoint	2017-09-07 18:15:04 -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
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
vladest	31a23acb1a	Add flickable on mouse wheel to web pages	2017-09-06 23:04:58 +02: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
beholder	41d014ca0c	6718 PR11082: Help text cannot be dismissed by clicking on the text inside the box.	2017-09-06 02:11:40 +03: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	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	b5faa8ac56	7382 Create Menu does not Work on Tablet	2017-09-02 18:20:00 +03: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
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
Zach Fox	8fcdfa171d	Add debug button to clear passphrase	2017-08-31 16:51:39 -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
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	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
vladest	6faab9fb1c	Switch flickable on by default for list and grid tabs	2017-08-31 19:21:38 +02:00
vladest	a80d9a22df	Added option to disable flickable for web view	2017-08-31 12:20:20 +02:00