Chris Collins b07ed13023 Merge pull request #10184 from druiz17/snapshot-fix ... snapshot bug fixes		2017-04-11 13:00:46 -07:00
..
controller
controls	webview-fix	2017-04-11 18:49:40 +01:00
controls-uit	cr feedback, plus changed 'People' to 'Connections' in a couple places	2017-04-03 17:03:14 -07:00
desktop	Make tablet popups work like they should	2017-03-16 10:38:46 -07:00
dialogs	fixed merge conflict	2017-04-11 16:58:25 +01:00
hifi	fixed merge conflict	2017-04-11 16:58:25 +01:00
js
LoginDialog	resize the sign up dialog when showing errors	2016-12-12 13:04:14 -08:00
styles
styles-uit	pal selection changes	2017-04-06 12:07:51 -07:00
TabletLoginDialog	Revert "Merge from upstream/master"	2017-03-28 17:39:45 -07:00
windows	Revert "Merge from upstream/master"	2017-03-28 17:39:45 -07:00
AddressBarDialog.qml	fix some fallout from toolbar changes	2017-01-25 16:29:36 -08:00
AssetServer.qml	Revert "Merge from upstream/master"	2017-03-28 17:39:45 -07:00
AvatarInputs.qml	Revert "Actually merge from master"	2017-03-24 17:56:48 -07:00
Browser.qml	apply profile to relevant entities	2017-04-04 11:54:21 -07:00
ConnectionFailureDialog.qml	Add ConnectionFaiureDialog qml	2016-10-24 10:52:46 -07:00
ForceLoad.qml
InfoView.qml	Support toolbar API	2016-06-17 13:06:42 -07:00
LoginDialog.qml	fix resizing of LoginDialog and friends	2016-12-12 11:32:19 -08:00
QmlWebWindow.qml	Handle Clara marketplace downloads	2016-12-20 07:40:28 -08:00
QmlWindow.qml	Provide keyboard in marketplaces window	2016-12-20 07:33:55 -08:00
Stats.qml	change implict conversions	2017-04-07 17:47:04 +01:00
StatText.qml	Add more GPU stats, make stats easier to read	2016-10-22 14:38:46 -07:00
TabletBrowser.qml	Yahoo, Reddit etc now works correctly	2017-04-07 15:45:33 +02:00
Tooltip.qml
ToolWindow.qml	Only raise keyboard if in HMD display mode	2016-10-12 09:43:33 +13:00
UpdateDialog.qml	changed old icon to new icon	2016-11-02 08:23:10 -07:00
Web3DOverlay.qml	Handle Clara marketplace downloads	2016-12-20 07:40:28 -08:00