David Rowe 2d070e630b Merge branch 'master' into fix/jsdoc-fixes ... # Conflicts: # interface/resources/qml/hifi/avatarapp/MessageBoxes.qml # interface/resources/qml/hifi/commerce/checkout/Checkout.qml # interface/resources/qml/hifi/commerce/purchases/Purchases.qml # interface/src/Application.cpp		2020-04-26 20:38:43 +12:00
..
+android_interface	Use the new property	2019-12-07 08:29:21 +13:00
+webengine	Various URL updates + window title update.	2020-02-05 15:25:51 -05:00
androidAppForce
controller
controls	cr round 2	2019-07-25 15:42:25 -07:00
controls-uit
controlsUit	Update interface/resources/qml/controlsUit/PermissionPopup.qml	2019-07-25 15:47:48 -07:00
desktop
dialogs	Re-branding of help dialogs and tablet login	2020-01-14 00:33:29 +00:00
hifi	Merge branch 'master' into fix/jsdoc-fixes	2020-04-26 20:38:43 +12:00
js
LoginDialog	Merge remote-tracking branch 'hifi/master' into merge-hifi-master	2020-04-09 16:46:27 +12:00
styles
styles-uit
stylesUit
windows	Fix up scrollbars and separators	2020-01-23 11:25:48 +13:00
AnimStats.qml	Disable handTouch.js to prevent finger twitching	2019-06-20 15:52:36 -07:00
AudioScopeUI.qml
AvatarInputsBar.qml
Browser.qml
BrowserWebView.qml
BubbleIcon.qml
ConnectionFailureDialog.qml
CurrentAPI.qml
ForceLoad.qml
InfoView.qml
InteractiveWindow.qml	Added extra attempt to parent interactive window content on creation	2019-10-29 11:20:14 -07:00
LoginDialog.qml	Updated interface login page	2020-01-08 16:21:25 +00:00
OverlayLoginDialog.qml
OverlayWindowTest.qml
QmlWebWindow.qml
QmlWebWindowView.qml
QmlWindow.qml
Stats.qml	Use the new property	2019-12-07 08:29:21 +13:00
StatText.qml	use bold monospace font for debug stats	2019-07-22 12:38:24 -07:00
TabletBrowser.qml
Tooltip.qml
UpdateDialog.qml
Web3DSurface.qml	Steps closer...	2019-11-06 17:16:21 -08:00