Anthony J. Thibault c2af948e25 Merge branch 'master' into feature/handheld-marketplace		2016-08-24 16:07:04 -07:00
..
controller
controls	Merge branch 'master' into feature/handheld-marketplace	2016-08-24 16:07:04 -07:00
controls-uit	Merge pull request #8372 from elisa-lj11/zip_project	2016-08-24 15:53:58 -07:00
desktop	Add basic implementation of customPrompt	2016-07-15 17:35:55 -07:00
dialogs	login UI first draft	2016-08-08 15:39:25 -07:00
hifi	Merge pull request #8372 from elisa-lj11/zip_project	2016-08-24 15:53:58 -07:00
js
LoginDialog	Fix Asset Browser dialog	2016-08-18 09:37:26 +12:00
menus	Remove highlight animation duration on menus	2016-07-14 10:30:36 -07:00
styles
styles-uit	Fix Asset Browser dialog	2016-08-18 09:37:26 +12:00
windows	Add OverlayWebWindow resized, moved, and closed signals	2016-08-02 12:40:01 +12:00
AddressBarDialog.qml	Scale the activity card back up to match the window being scaled down, so	2016-08-23 09:44:28 -07:00
AssetServer.qml	removed extraneous debug prints	2016-08-19 11:32:13 -07:00
AvatarInputs.qml
Browser.qml	Fixed browser.qml 'onNewViewRequested'	2016-08-22 16:04:55 -07:00
ForceLoad.qml
InfoView.qml
LoginDialog.qml	UI wiring	2016-08-08 15:39:25 -07:00
MarketplaceComboBox.qml	Fixed browser.qml 'onNewViewRequested'	2016-08-22 16:04:55 -07:00
QmlWebWindow.qml	Add OverlayWebWindow resized, moved, and closed signals	2016-08-02 12:40:01 +12:00
QmlWindow.qml	CR changes	2016-08-10 10:26:58 -07:00
Stats.qml	Add asset server bandwidth to stats	2016-08-11 11:06:36 -07:00
Tooltip.qml
ToolWindow.qml	PR comments	2016-06-29 10:28:55 -07:00
UpdateDialog.qml	fixed errors in Browser.qml and UpdateDialog.qml	2016-07-07 14:06:57 -07:00