2425 commits

Author	SHA1	Message	Date
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
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
Stephen Birarda	5e1decb02b	Merge branch 'master' of github.com:highfidelity/hifi into feat/auto-bake	2017-09-07 12:06:53 -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
vladest	e17f05a337	Correct UI	2017-09-06 14:52:08 +02:00
vladest	57643bd904	Merge branch 'master' into audio_devices_split	2017-09-06 14:20:41 +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	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
Atlante45	28402be37c	Fix status glyphs	2017-09-01 14:17:28 -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
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
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
Atlante45	9b857eb53b	Ensure "enabled" binding stays in place	2017-08-31 16:16:43 -07:00
Atlante45	2fd2bb1e92	Auto reload after changing baking enabled	2017-08-31 16:00:55 -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
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
Atlante45	a9cfc01df3	Set Baking Enabled API	2017-08-31 13:11:27 -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
David Kelly	962d1fc81d	Merge branch 'master' of https://github.com/highfidelity/hifi into reset-wallet	2017-08-30 15:30:29 -07:00
David Kelly	988ee8c8d1	fix image provider, couple other things	2017-08-30 15:23:54 -07:00
vladest	46ce512e3d	Merge branch 'master' into flickable_web_pages	2017-08-30 23:17:05 +02:00
vladest	b547b2573e	Added logged in property	2017-08-30 23:15:39 +02:00
Zach Fox	17d999e721	Fixes	2017-08-30 13:25:34 -07:00
vladest	903036a709	Merge branch 'master' into tablet_login_button	2017-08-30 22:12:03 +02:00
Zach Fox	580865fa5a	Add skeleton for infinite scroll	2017-08-30 12:54:26 -07:00
Zach Fox	7a7d7f95d7	Polish transaction history and prepare for whatever new design	2017-08-30 12:45:13 -07:00
Zach Fox	fb4b0f60fa	Remove most dependencies on 'onVisibleChanged'	2017-08-30 11:55:29 -07:00
howard-stearns	b8da08ca42	reset wallet	2017-08-30 11:29:43 -07:00
vladest	88b045e3a9	Switched off overboundings. More accurate calculate height	2017-08-30 20:17:11 +02:00
Zach Fox	f366743be7	Login; punctuationMode; new images	2017-08-30 11:07:03 -07:00
Zach Fox	1b48319a3f	Merge pull request #11267 from zfox23/commerce_zachsPunchlist1 ... Commerce: Zachs Punchlist 01	2017-08-30 10:10:56 -07:00
Zach Fox	6ee634b90a	Lock overlay on top of security image	2017-08-29 17:19:34 -07:00
druiz17	2a97257698	Merge pull request #11140 from ElderOrb/case6788 ... 6788: You can deselect your current view mode	2017-08-29 17:15:51 -07:00
Zach Fox	5d1170c5d6	Only make message appear after inventory received	2017-08-29 16:17:59 -07:00
Zach Fox	a9c99854f9	Haven't purchased anything yet UI	2017-08-29 15:39:07 -07:00
Zach Fox	c7ad875485	Virtual keyboard and logic	2017-08-29 15:27:53 -07:00
Zach Fox	50241078ae	Buncha punchlist items checked off	2017-08-29 14:30:00 -07:00
beholder	180acbc188	6819 - Create button not disabled	2017-08-29 23:49:44 +03:00
beholder	a0a43ebf26	show checkbox or radiobutton dependently on exclusiveGroup presence	2017-08-29 23:23:16 +03:00
vladest	fe44abdb62	Merge branch 'master' into flickable_web_pages	2017-08-29 20:49:39 +02:00
David Kelly	84126d8f95	cr feedback	2017-08-29 08:46:13 -07:00
David Kelly	67f25adac0	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/transactionHistoryDisplay	2017-08-29 08:02:53 -07:00
David Kelly	a7af114144	fix wallet, use text from server in history (for now)	2017-08-28 17:04:19 -07:00
Zach Fox	22d3857501	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_checkoutAndInventory	2017-08-28 15:10:17 -07:00
Zach Fox	37b6099f36	Hook up root_file_url	2017-08-28 12:46:01 -07:00
Zach Fox	1c1b841a86	Fix security images; actually do the right thing when wallet not set up	2017-08-28 12:18:53 -07:00
Atlante45	ca62e7168c	Merge branch 'master' of https://github.com/highfidelity/hifi into feat/auto-bake	2017-08-28 11:41:23 -07:00
Zach Fox	ceb38e261d	HMD Keyboard for purchases filterBar	2017-08-28 10:45:08 -07:00
David Kelly	3955624e63	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/transactionHistoryDisplay	2017-08-28 10:13:21 -07:00
Zach Fox	ea00668725	Again to Another	2017-08-28 10:04:26 -07:00
Zach Fox	67f3b5c027	Remove quantity	2017-08-28 09:58:45 -07:00
Zach Fox	52cb1dd893	Correctly handle non-JSON items	2017-08-28 09:54:51 -07:00
Zach Fox	e293d122b1	Add security image to Checkout and Purchases	2017-08-28 09:33:30 -07:00
vladest	d8fb7300c3	Merge branch 'master' into tablet_login_button	2017-08-28 16:59:35 +02:00
vladest	e38075f7ba	Disable web engine scrollbars	2017-08-28 16:27:33 +02:00
vladest	9baf518c6a	Merge branch 'master' into flickable_web_pages	2017-08-27 12:00:05 +02:00
vladest	d4332e7776	Adopting according comments from designers	2017-08-26 20:55:16 +02:00
vladest	7796946343	Merge branch 'master' into audio_devices_split	2017-08-26 20:00:00 +02:00
Zach Fox	4c16366562	Ints aren't floats, silly!	2017-08-25 16:55:50 -07:00
Zach Fox	50f7f91d4e	Close the loop.	2017-08-25 16:49:02 -07:00
Zach Fox	a03f9592c1	Inventory to Purchases	2017-08-25 16:34:48 -07:00
druiz17	06ab8ddbb2	Merge pull request #11251 from elisa-lj11/blocks ... Blocks app accommodates updated Blocks website	2017-08-25 16:32:14 -07:00
Zach Fox	b1378816d5	Revert "MUCH faster filter!" ... This reverts commit 5173774db0.	2017-08-25 16:23:36 -07:00
Zach Fox	5173774db0	MUCH faster filter!	2017-08-25 16:15:07 -07:00
Zach Fox	ee8f5d6e7b	Filter	2017-08-25 16:08:32 -07:00
Zach Fox	d19377d2d4	Saving	2017-08-25 15:56:30 -07:00
Zach Fox	153c131482	Initial inventory progress	2017-08-25 15:28:35 -07:00
Atlante45	8a291f16ff	Merge branch 'master' of https://github.com/highfidelity/hifi into feat/auto-bake	2017-08-25 15:26:38 -07:00
Zach Fox	5487179a79	So much progress	2017-08-25 15:06:14 -07:00