19800 commits

Author	SHA1	Message	Date
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
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
David Kelly	870e003311	Scattered X glyphs around the letterbox and combo dialogs	2017-04-07 11:12:54 -07: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
Andrew Meadows	b9c7d6351f	Merge pull request #10135 from samcake/ambient ... Rename render::PendingChanges to render::Transaction	2017-04-07 09:54:10 -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
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
Howard Stearns	67f2cc3567	Merge pull request #10148 from davidkelly/dk/3936 ... pal selection changes	2017-04-06 14:58:46 -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
Seth Alves	3c6429cdf3	Merge pull request #10103 from vladest/master-qml-bugfixes ... Master qml bugfixes	2017-04-06 14:22:06 -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	46a7d28e16	Merge pull request #10144 from howard-stearns/notice-login-change-in-pal ... notice login/logout change in pal	2017-04-06 12:57:22 -07:00
David Kelly	e0a1422345	pal selection changes	2017-04-06 12:07:51 -07:00
samcake	19d080c4cc	Merging	2017-04-06 11:33:41 -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
Vladyslav Stelmakhovskyi	16fa7988f6	TabletWebView redesigned to single WebView instance	2017-04-06 17:53:46 +02:00
David Kelly	06bd9c97bf	remove info button from avatar image	2017-04-05 18:21:54 -07:00
David Kelly	61ece265f4	now you can forget connections	2017-04-05 18:16:16 -07:00
samcake	1a9005ed8b	Avoid unexpected changes	2017-04-05 13:57:40 -07:00
samcake	8356e5495f	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient	2017-04-05 13:12:21 -07:00
samcake	6122155880	Renaming the PendingCHanges class to Transaction	2017-04-05 13:10:31 -07:00
Dante Ruiz	34f3c4abee	removed mousearea	2017-04-05 18:08:03 +01:00
Dante Ruiz	de8b7eeb27	removed commented code	2017-04-05 18:02:55 +01:00
Dante Ruiz	24b89275f2	fix new model dialog textInput	2017-04-05 18:00:43 +01:00
kunalgosar	8749428ede	dont assume no query tags	2017-04-04 13:51:34 -07:00
howard-stearns	6f79b2eaeb	send initial path in location update (e.g., on login)	2017-04-04 12:05:43 -07:00
kunalgosar	cc81bcab66	updating url check from hifi master	2017-04-04 11:58:38 -07:00
Kunal Gosar	e5c075f107	fix typo and namespace	2017-04-04 11:54:58 -07:00
kunalgosar	8e4229b211	dont redirect people from webentity	2017-04-04 11:54:58 -07:00
kunalgosar	3b88553699	check scripts	2017-04-04 11:54:58 -07:00
kunalgosar	9d0667cb31	add url tag to web entities	2017-04-04 11:54:58 -07:00
kunalgosar	19ab7526d3	apply profile to relevant entities	2017-04-04 11:54:21 -07:00
kunalgosar	9b758dbdba	updated headers	2017-04-04 11:54:21 -07:00
kunalgosar	a0f0879087	added file type filter and interceptor	2017-04-04 11:54:21 -07:00
Howard Stearns	b0fa784267	Merge pull request #10108 from davidkelly/dk/PalImprovementsMostlyZach ... Dk/pal improvements mostly zach	2017-04-04 10:03:10 -07:00
David Kelly	08ac25473f	wording change	2017-04-04 09:53:09 -07:00
Vladyslav Stelmakhovskyi	367555acdb	Fixed BasicTableView.qml:610:17: QML Item: Binding loop detected for property width. width must be explicitly set	2017-04-04 16:35:21 +02:00
Vladyslav Stelmakhovskyi	332f9bb283	Fixed TabletMenuStack.qml:56: Error: Cannot assign [undefined] to QString. Fixed keyboardRaised undefined error	2017-04-04 16:22:40 +02:00
Vladyslav Stelmakhovskyi	072e024d9a	Fixed warning in JSConsole	2017-04-04 16:10:37 +02:00
Thijs Wenker	2b85563413	Merge pull request #10115 from sethalves/fix-fast-talking ... Fix fast talking	2017-04-04 02:13:09 +02:00
David Kelly	4d6886d1f4	cr feedback, plus changed 'People' to 'Connections' in a couple places	2017-04-03 17:03:14 -07:00
Seth Alves	cb787c2862	Merge pull request #10104 from druiz17/tablet-webView3.0 ... Remove unnecessary prints and code for tabletWebView.qml	2017-04-03 16:10:54 -07:00