14 commits

Author	SHA1	Message	Date
Dante Ruiz	a45bea2c90	fixed merge conflicts	2017-05-27 00:57:09 +01:00
Dante Ruiz	4365907462	drop down puck configuration for gernal settings	2017-05-10 22:12:11 +01:00
Dante Ruiz	4e94aaa9e8	finished allowing to go back to previous app	2017-04-10 20:58:10 +01:00
druiz17	92bb7f2329	saving work	2017-04-09 18:55:53 -07:00
David Rowe	f1947769d6	Fix tablet settings dialogs' titles and make QML consistent	2017-03-17 11:15:56 +13:00
David Rowe	4dd7667fd7	Merge branch 'tablet-ui' into 21209 ... # Conflicts: # interface/resources/qml/hifi/tablet/tabletWindows/TabletPreferencesDialog.qml # interface/src/ui/overlays/Web3DOverlay.cpp	2017-03-14 08:50:01 +13:00
David Rowe	6a8d0b1064	Refactor some tablet dialog headers	2017-03-11 16:55:22 +13:00
Dante Ruiz	b63ab05eec	improved general settting coloring	2017-03-10 19:33:14 +00:00
David Rowe	0333122b23	Make Save and Cancel buttons close preferences dialog	2017-03-04 15:27:31 +13:00
David Rowe	53cfad65cd	Add keyboard to preferences dialogs	2017-03-04 13:01:02 +13:00
David Rowe	ebe41bb443	Add a title to the tablet settings dialogs	2017-03-02 14:11:56 +13:00
Dante Ruiz	948352cdb6	general preferences work on tablet	2017-02-14 07:46:33 -08:00
Dante Ruiz	888d4ff706	basic prefreneces done	2017-02-14 07:46:32 -08:00
Dante Ruiz	46cfa7cf13	saving work	2017-02-14 07:46:31 -08:00