2522 commits

Author	SHA1	Message	Date
David Kelly	08ac25473f	wording change	2017-04-04 09:53:09 -07:00
David Kelly	4d6886d1f4	cr feedback, plus changed 'People' to 'Connections' in a couple places	2017-04-03 17:03:14 -07:00
David Kelly	4629accc9c	style updates	2017-04-03 15:35:53 -07:00
David Kelly	2f1b6be24d	Merge branch 'PAL_v2_Zach_new' of https://github.com/zfox23/hifi	2017-04-03 10:55:55 -07:00
Chris Collins	cc8b52fff4	Merge pull request #10095 from druiz17/tablet-webView2.0 ... Tablet webview now uses mobile format	2017-04-01 08:33:09 -07:00
Dante Ruiz	7ca7ad5e0b	removed junk file	2017-04-01 01:53:00 +01:00
Zach Fox	f148bca1c0	More progress on ComboDialog	2017-03-31 17:12:41 -07:00
Zach Fox	8a96969471	Merge pull request #9873 from highfidelity/PAL_v2 ... PAL v2.0	2017-03-31 17:00:41 -07:00
Dante Ruiz	b10f491c6e	Merge branch 'master' of github.com:highfidelity/hifi into tablet-webView2.0	2017-04-01 00:58:37 +01:00
Dante Ruiz	d1bf3e4bf2	fixed webview mobile view	2017-04-01 00:58:09 +01:00
Zach Fox	fd3167ca9c	'PEOPLE' back to 'CONNECTIONS'	2017-03-31 16:41:25 -07:00
Seth Alves	cec02bbf6f	Merge pull request #10011 from humbletim/fix-rightclick-menu-again ... Fix right-click popup menus in web views	2017-03-31 15:48:11 -07:00
David Kelly	8ceb6a20f0	friend/unfriend working	2017-03-31 15:05:21 -07:00
Zach Fox	6a4c2c5e12	Fix issues; checkpoint on new ComboDialog	2017-03-31 14:56:42 -07:00
Dante Ruiz	70d2d69557	Merge branch 'master' of github.com:highfidelity/hifi into tablet-webView	2017-03-31 19:29:31 +01:00
Dante Ruiz	9658e1b8ac	better web view handling	2017-03-31 19:25:03 +01:00
Dante Ruiz	b6901bba3e	added tabletWebView.qml	2017-03-31 18:48:08 +01:00
Dante Ruiz	8f402c73b0	saving work 2.0	2017-03-31 01:18:31 +01:00
Zach Fox	05c34fb3ee	Move some things around so ComboBox works (and layout improves)	2017-03-30 15:19:19 -07:00
Zach Fox	c24b8b47a9	Minor layout changes	2017-03-30 14:08:29 -07:00
Howard Stearns	0edbf1fbd9	Merge pull request #10044 from howard-stearns/pal-backend-integration ... Pal backend integration	2017-03-30 12:55:11 -07:00
David Kelly	e66c075f8e	Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2	2017-03-30 10:14:29 -07:00
Dante Ruiz	cb8660c699	saving work	2017-03-30 01:34:14 +01:00
Zach Fox	4887081e2c	New PAL colors; slight layout changes	2017-03-29 16:30:24 -07:00
Zach Fox	a6ff3fcdb7	Tablet PAL bugfix; Connections help text v1	2017-03-29 15:47:19 -07:00
Anthony J. Thibault	332dfa098f	Fix for disappearing toolbar after reload all scripts	2017-03-29 14:10:26 -07:00
Howard Stearns	b8f557ca54	Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into pal-backend-integration	2017-03-29 13:30:15 -07:00
Howard Stearns	c795d2ca3b	Four-way discoverability. (Needs testing.)	2017-03-28 18:31:08 -07:00
Zach Fox	b776f25b3b	Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2	2017-03-28 18:09:17 -07:00
Zach Fox	81264c998b	Revert "Merge from upstream/master" ... This reverts commit b5ba4a109d.	2017-03-28 17:39:45 -07:00
Zach Fox	b5ba4a109d	Merge from upstream/master	2017-03-28 17:37:34 -07:00
Dante Ruiz	a76e5ef8d9	improve the design of the tablet goto	2017-03-28 23:02:23 +01:00
Seth Alves	b50a02ea19	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-28 08:16:59 -07:00
Zach Fox	fce2049630	Trivial removal of commented code	2017-03-27 16:45:03 -07:00
Dante Ruiz	018138f422	fixed some issues with tablet help	2017-03-27 22:46:06 +01:00
Seth Alves	48ea9acfb3	Merge pull request #10016 from druiz17/tablet-goto ... Porting goto to the tablet	2017-03-27 10:04:11 -08:00
Zach Fox	e1a880a5d4	Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2	2017-03-27 09:10:12 -07:00
Dante Ruiz	b8eac7abef	revoming useless code	2017-03-27 16:17:50 +01:00
humbletim	59008e4a40	remove old ../../qml/menus import	2017-03-25 18:37:36 -04:00
Seth Alves	3abd6b3948	Merge pull request #10006 from druiz17/tablet-help ... Ported help into the tablet	2017-03-25 08:33:41 -08:00
Vladyslav Stelmakhovskyi	edb66ae704	Merge branch 'tablet-ui' into tablet-ui-audio-screen	2017-03-25 13:20:43 +01:00
Vladyslav Stelmakhovskyi	fc23c348cb	Implemented Audio settings screen for Tablet UI	2017-03-25 13:17:38 +01:00
Zach Fox	e88895935b	Revert "Actually merge from master" ... This reverts commit 056d6fbe4f.	2017-03-24 17:56:48 -07:00
Dante Ruiz	2a59139c76	trying to fix focus issue	2017-03-25 01:17:37 +01:00
Dante Ruiz	9e2768cc84	saving work	2017-03-25 01:06:21 +01:00
Dante Ruiz	3e98b2273c	help in the tablet	2017-03-25 00:52:41 +01:00
Dante Ruiz	6178a86a46	Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-help	2017-03-24 23:56:33 +01:00
Dante Ruiz	119a71d0d1	Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-goto	2017-03-24 23:55:18 +01:00
Dante Ruiz	d9046a1982	goto on the tablet	2017-03-24 23:54:54 +01:00
Stephen Birarda	3985354ff4	update graphic for oculus touch help with correct buttons	2017-03-24 13:45:56 -07:00