155 commits

Author	SHA1	Message	Date
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	b2bafed2bb	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-12-07 11:21:24 -08:00
vladest	74c002d1f5	Merge conflicts. Return back web console messages. For flickable in web engine core its enougth to add timestamp to touch events	2017-11-30 12:52:26 +01:00
Brad Davis	26a745be6f	Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet	2017-11-15 11:59:06 -08:00
Dante Ruiz	b633968865	fix-bringing-up-logs	2017-11-15 10:47:06 -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
beholder	eb4214fb4c	add API for unfocusing input fields in HTML, unfocus WebEngine-based QML items on lowering keyboard	2017-11-10 21:20:00 +03:00
vladest	567a219e9c	Cleanup. Remove unused functionality	2017-10-28 12:01:37 +02:00
vladest	6fb1a9954e	Merge branch 'master' into fix_google_vr_height	2017-10-28 10:35:29 +02:00
Dante Ruiz	92f765fe52	property set echomode for keyboard for wallet and webviews	2017-10-24 13:53:50 -07:00
vladest	f524f8a50f	Remove commented code	2017-10-13 12:56:08 +02:00
vladest	9a92b5635d	Fix too wide web view	2017-10-05 15:17:37 +02:00
vladest	1860a2cb16	Experimentsl CSS injector	2017-09-14 14:40:22 +02:00
vladest	1ccf2ef690	Merge branch 'master' into fix_google_vr_height	2017-09-12 22:51:54 +02:00
vladest	92a83328c0	Follow naming convention	2017-09-12 19:17:49 +02:00
vladest	58c0141f27	Remove unnecessary code	2017-09-12 19:00:00 +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
vladest	00038664a6	Merge branch 'master' into fix_google_vr_height	2017-09-11 19:43:10 +02:00
vladest	c6d3bce704	Switch off Flickable	2017-09-10 18:33:04 +02:00
vladest	31a23acb1a	Add flickable on mouse wheel to web pages	2017-09-06 23:04:58 +02:00
vladest	85a3771a98	Remove commented out code	2017-09-05 22:19:38 +02:00
vladest	a80d9a22df	Added option to disable flickable for web view	2017-08-31 12:20:20 +02:00
vladest	88b045e3a9	Switched off overboundings. More accurate calculate height	2017-08-30 20:17:11 +02:00
vladest	e38075f7ba	Disable web engine scrollbars	2017-08-28 16:27:33 +02:00
vladest	36879f83eb	Added scroll bar. Cleanup	2017-08-25 15:44:07 +02:00
vladest	d6079e70fb	Binding to width to make sure it will follow Tablet with when rotating	2017-08-24 23:44:53 +02:00
vladest	c7fe845403	Move common webview flickable code to separate core file	2017-08-24 21:35:47 +02:00
vladest	43d3544a0d	Fix width of html pages in Create mode	2017-08-21 17:07:24 +02:00
vladest	9fd2a742a9	Fix QML warning. Fix AddressBar info scroll	2017-08-21 16:45:47 +02:00
vladest	3be684b973	Fixed spinner in center. Flicking only vertically	2017-08-21 16:31:25 +02:00
vladest	78e9bb6020	almost works for marketplace	2017-08-20 23:06:23 +02:00
vladest	56dedea66c	1st experimental approach	2017-08-20 17:57:14 +02:00
Howard Stearns	188cbee781	Merge pull request #11212 from howard-stearns/asynchronous-commerce-2 ... Asynchronous Ledger Interactions with Server	2017-08-18 15:40:24 -07:00
howard-stearns	bd37679b65	working	2017-08-18 14:03:40 -07:00
howard-stearns	3d401129fb	checkpoint	2017-08-18 10:03:00 -07:00
Elisa Lupin-Jimenez	6c2bf63392	Back button works	2017-08-10 17:51:19 -07:00
Cain Kilgore	2f857a6d1a	Forgot a file	2017-07-25 06:05:06 +01:00
Bradley Austin Davis	1968ecbc8f	Simplify eventBridge mechanism exposing functionality to web pages	2017-06-12 14:46:37 -07:00
Bradley Austin Davis	995fe11c05	Migrate to single QML engine	2017-06-05 15:14:44 -07:00
David Rowe	bc4af86b57	Display spinner in Web controls when they're loading an HTTP page	2017-05-23 15:40:35 +12:00
David Rowe	116175cf9f	Fix going back from Twitter password recovery page	2017-05-09 09:03:48 +12:00
David Rowe	1b26ba22cb	Fix browser history in goto "i" pages on tablet	2017-05-06 11:13:13 +12:00
David Rowe	88dc6b5f61	Fix tablet Web view "back" button not greying out when disabled	2017-05-05 17:24:36 +12:00
David Rowe	30604ab901	Fix some typos noticed in passing	2017-05-04 16:56:18 +12:00
David Rowe	9d92ed2b9b	Fix keyboard not appearing in social media snapshot sharing dialogs	2017-05-04 16:55:10 +12:00
David Rowe	8ae3d4e8a0	Merge branch 'master' into 21314 ... # Conflicts: # interface/resources/qml/controls/TabletWebView.qml	2017-05-04 13:10:09 +12:00
Zach Fox	affc7fc654	Merge pull request #10369 from druiz17/url-fix ... Fix tablet webview showing incorrect url.	2017-05-03 16:58:06 -07:00
Dante Ruiz	5390a29859	tabletwebview-url-fix	2017-05-03 23:05:05 +01:00
David Rowe	7fdcb9b1f0	Fix numeric keys not displaying in social media sharing dialogs	2017-05-03 14:59:41 +12:00