173 commits

Author	SHA1	Message	Date
David Kelly	058a5b14a4	damn linter didn't run - vimrc work ahead...	2017-04-12 10:22:40 -07:00
David Kelly	9376ac646f	offline people sort change	2017-04-12 08:41:36 -07:00
David Kelly	082d0964d2	oops	2017-04-10 11:08:45 -07:00
David Kelly	3ea6cac45a	HMD.mounted instead of HMD.isMounted	2017-04-10 08:05:01 -07:00
David Kelly	948a821824	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/3995	2017-04-07 14:30:22 -07:00
Howard Stearns	57d8ec883e	Merge pull request #10163 from davidkelly/dk/3938 ... updated availability combo dialog	2017-04-07 13:57:17 -07:00
David Kelly	870e003311	Scattered X glyphs around the letterbox and combo dialogs	2017-04-07 11:12:54 -07:00
David Kelly	12b5b91754	Merge pull request #10161 from howard-stearns/fix-pal-connections-help ... fix pal connections-tab help trigger	2017-04-07 09:34:11 -07:00
Howard Stearns	468cc7f19b	Merge pull request #10150 from davidkelly/dk/3930 ... friends checkbox speedup	2017-04-07 09:27:39 -07:00
David Kelly	cb092d67dd	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/3995	2017-04-07 09:01:59 -07:00
Howard Stearns	03013ecb3a	fix pal connections-tab help trigger	2017-04-07 07:30:36 -07:00
David Kelly	d64a803451	no need to set checked	2017-04-06 16:08:48 -07:00
David Kelly	a1c211395b	Merge pull request #10152 from howard-stearns/fix-sort-by-connections-friend-column ... fix sorting by pal connections-tab friends column	2017-04-06 15:43:21 -07:00
David Kelly	179a445f59	updated connection instructions	2017-04-06 15:21:10 -07:00
howard-stearns	9577102c22	fix sorting by pal connections-tab friends column	2017-04-06 14:45:08 -07:00
David Kelly	331f2da4f8	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/3936	2017-04-06 14:22:08 -07:00
David Kelly	726395ac3e	friends checkbox speedup	2017-04-06 14:07:07 -07:00
Howard Stearns	f7ef587c61	Merge pull request #10138 from davidkelly/dk/3935 ... Now you can forget connections	2017-04-06 14:05:25 -07:00
David Kelly	e0a1422345	pal selection changes	2017-04-06 12:07:51 -07:00
howard-stearns	1d60a55d5f	notice login/logout change in pal	2017-04-06 11:20:08 -07:00
David Kelly	85c78da839	updated, plus fixed some annoying errors in logs from Pal.qml	2017-04-06 11:16:51 -07:00
David Kelly	61ece265f4	now you can forget connections	2017-04-05 18:16:16 -07:00
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
Zach Fox	f148bca1c0	More progress on ComboDialog	2017-03-31 17:12:41 -07:00
Zach Fox	fd3167ca9c	'PEOPLE' back to 'CONNECTIONS'	2017-03-31 16:41:25 -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
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
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
Howard Stearns	c795d2ca3b	Four-way discoverability. (Needs testing.)	2017-03-28 18:31:08 -07:00
Zach Fox	3f95982f34	Fix bug due to incorrect merge...	2017-03-23 14:00:50 -07:00
Zach Fox	98ee02f84f	Use OpacityMask instead of hack; fix connectionsTab	2017-03-23 10:49:31 -07:00
Zach Fox	a7623dcac8	Use OpacityMask instead of hack; fix connectionsTab	2017-03-23 10:48:44 -07:00
Zach Fox	692ef369c7	Attempted Stale PAL fix - hard to test!	2017-03-22 15:14:11 -07:00
Zach Fox	bf191eabb7	Some new stale PAL behavior	2017-03-22 13:35:48 -07:00
Zach Fox	058faa8c0f	Row color bugfix	2017-03-21 10:03:51 -07:00
Zach Fox	29e97381eb	PAL open, user leaves, gray out row	2017-03-20 17:20:28 -07:00
Zach Fox	d16acc5a7f	Stale PAL Notification	2017-03-20 15:24:49 -07:00
Zach Fox	fc2a501474	Cleanup JS<->QML messaging	2017-03-16 15:38:39 -07:00
Zach Fox	05fec328c0	Make tablet popups work like they should	2017-03-16 10:38:46 -07:00
Zach Fox	786180291b	Bugfixes and improvements	2017-03-15 11:46:33 -07:00
Zach Fox	0a6bcd7fca	Massive performance boost	2017-03-14 16:24:06 -07:00
Zach Fox	5da0dfc4ac	Merging from Pal_v2_Zach	2017-03-14 14:05:50 -07:00
Zach Fox	e3d0842ddc	Implement browser in PAL	2017-03-13 18:39:47 -07:00
Zach Fox	d04b1da1c2	Merging from PAL_v2_Zach	2017-03-13 12:54:01 -07:00