Commit graph

24 commits

Author SHA1 Message Date
howard-stearns
01d90ea1a5 Introduce safeLoading. 2018-04-03 13:49:09 -07:00
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
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
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