1763 commits

Author	SHA1	Message	Date
Zach Fox	a623ced64e	Fix hover states on back/forward buttons	2017-04-14 12:43:07 -07:00
Zach Fox	0543709081	Focus fix	2017-04-13 16:10:36 -07:00
Zach Fox	520ceebf5b	Small HMD tweaks	2017-04-13 15:52:59 -07:00
Zach Fox	d9dc8ebc41	More improvements	2017-04-13 15:48:51 -07:00
Zach Fox	71caf85a27	Quick fix!	2017-04-12 14:57:44 -07:00
David Kelly	a12407ddda	Merge pull request #10202 from davidkelly/dk/3934 ... Connection sort change	2017-04-12 10:42:04 -07:00
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
Chris Collins	b07ed13023	Merge pull request #10184 from druiz17/snapshot-fix ... snapshot bug fixes	2017-04-11 13:00:46 -07:00
Dante Ruiz	9c79e62004	webview-fix	2017-04-11 18:49:40 +01:00
Dante Ruiz	d823093ddb	fixed merge conflict	2017-04-11 16:58:25 +01:00
Seth Alves	d5f5192954	Merge pull request #10174 from vladest/fix-snapshot-login-cancel ... Check if dialog was opened from StackView and then pop or just go to …	2017-04-11 07:07:29 -07:00
Chris Collins	d8581c1026	Merge pull request #10176 from vladest/snaps_hover ... Added hover to Snaps and Places	2017-04-10 16:09:43 -07:00
Seth Alves	eb281389f5	fix includeActions so places show up in All	2017-04-10 14:46:31 -07:00
Howard Stearns	99ba07dcb2	Merge pull request #10181 from davidkelly/dk/infoButtonFix ... re-enable the info button for user images on nearby tab	2017-04-10 13:27:33 -07:00
Dante Ruiz	e0f19944bc	Merge branch 'master' of github.com:highfidelity/hifi into snapshot-fix	2017-04-10 20:58:46 +01:00
Dante Ruiz	4e94aaa9e8	finished allowing to go back to previous app	2017-04-10 20:58:10 +01:00
Howard Stearns	8682df6bb7	Merge pull request #10154 from davidkelly/dk/3995 ... updated connection instructions	2017-04-10 12:43:20 -07:00
David Kelly	5fc4bbc260	re-enable the info button for user images on nearby tab	2017-04-10 12:26:34 -07:00
David Kelly	082d0964d2	oops	2017-04-10 11:08:45 -07:00
David Kelly	cd55728490	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/4036	2017-04-10 10:09:27 -07:00
David Kelly	46b6903b93	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/3995	2017-04-10 10:08:17 -07:00
Vladyslav Stelmakhovskyi	393b24452d	Added hover to Snaps and Places	2017-04-10 17:07:59 +02:00
David Kelly	3ea6cac45a	HMD.mounted instead of HMD.isMounted	2017-04-10 08:05:01 -07:00
druiz17	92bb7f2329	saving work	2017-04-09 18:55:53 -07:00
Philip Rosedale	c74778116a	Merge pull request #10156 from Triplelexx/21256 ... 21256 - Add packet loss % to stats	2017-04-09 18:00:01 -07:00
Vladyslav Stelmakhovskyi	7628916db6	Check if dialog was opened from StackView and then pop or just go to home menu	2017-04-09 20:09:15 +02:00
Seth Alves	aa89903a9f	Merge pull request #10160 from vladest/tabletwebview-yahoo-fix ... Yahoo, Reddit etc now works correctly	2017-04-08 20:25:18 -07:00
Dante Ruiz	86c67a3017	tablet pages	2017-04-08 02:01:21 +01:00
Chris Collins	8e12f62cbb	Merge pull request #10153 from druiz17/goto-fix ... Ability to toggle goto with the crt-l and enter keys	2017-04-07 16:36:41 -07:00
Chris Collins	1175f65cb0	Merge pull request #10162 from vladest/goto-white-buttons-fix ... Check if offset outside image, set to last image	2017-04-07 15:58:48 -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
David Kelly	174b2978e3	username stays around now when tabbing to connections	2017-04-07 14:01:36 -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
Seth Alves	03065ee6c8	Merge pull request #9938 from kunalgosar/jsRenderBug ... Stop WebEntities Running Files and Commands	2017-04-07 13:44:03 -07:00
Dante Ruiz	cde9310f3e	goto home button fix	2017-04-07 21:35:28 +01:00
Dante Ruiz	909fda98a4	git goto button toggle hightlight	2017-04-07 21:01:53 +01:00
David Kelly	870e003311	Scattered X glyphs around the letterbox and combo dialogs	2017-04-07 11:12:54 -07:00
Vladyslav Stelmakhovskyi	a1892b351f	Cant use underscores outside class internals	2017-04-07 19:40:46 +02:00
David Kelly	ee9bc0bfa4	updated availability combo dialog	2017-04-07 10:25:37 -07:00
Vladyslav Stelmakhovskyi	9a563ba02f	Check if offset outside image, set to last image	2017-04-07 19:17:09 +02:00
Triplelexx	fcfd206e9c	change implict conversions	2017-04-07 17:47:04 +01: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
Vladyslav Stelmakhovskyi	f88ba7bc57	Yahoo, Reddit etc now works correctly	2017-04-07 15:45:33 +02: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