768 commits

Author	SHA1	Message	Date
Ryan Huffman	a5eb54b1b7	Move DomainServer script location to app data directory	2016-01-15 10:36:09 -08:00
Ryan Huffman	4851def51c	Add status HTTP server to AC Monitor	2016-01-08 10:35:04 -08:00
Ryan Huffman	dac491ef41	Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message	2015-11-24 09:59:22 -08:00
Clément Brisset	5d75fcbfce	Merge pull request #6430 from birarda/unique_linked_data ... use a unique_ptr for linkedData in Node	2015-11-20 15:01:41 -08:00
Stephen Birarda	b34934b849	resolve conflicts on merge with upstream/master	2015-11-20 11:52:53 -08:00
Stephen Birarda	3b40119992	use Agent session UUID to request script	2015-11-20 11:35:24 -08:00
Stephen Birarda	271387f96e	use a unique_ptr for linkedData in Node	2015-11-18 18:03:31 -08:00
Stephen Birarda	3fba1f8445	better variable naming for nodeToKill	2015-11-18 17:46:32 -08:00
Stephen Birarda	f4cf1c0291	only broadcast removed node messages to interested nodes	2015-11-18 17:45:18 -08:00
Ryan Huffman	2a416ebc61	Merge branch 'master' of https://github.com/highfidelity/hifi into received-message	2015-11-18 16:52:23 -08:00
Brad Hefta-Gaub	034debc483	cleanup	2015-11-17 10:59:53 -08:00
Brad Hefta-Gaub	40e69f6946	Merge branch 'master' of https://github.com/highfidelity/hifi into messaging	2015-11-16 15:31:06 -08:00
Brad Hefta-Gaub	d42a1a721f	first cut at messages-mixer	2015-11-16 15:26:17 -08:00
Stephen Birarda	584e35e4ab	have killNodeWithUUID return success to avoid double lookup	2015-11-16 10:58:11 -08:00
Stephen Birarda	e52e9be44c	re-broadcast disconnects from domain-server	2015-11-12 17:23:39 -08:00
Stephen Birarda	1c9396d66e	handle disconnect request in domain-server	2015-11-12 15:43:03 -08:00
Stephen Birarda	6d99a822a3	use a case-insensitive search in allowed editors QStringList	2015-10-28 14:33:50 -07:00
Ryan Huffman	9ddcfdf94d	Cleanup PacketReceier and ReceivedMessage	2015-10-16 09:21:10 -07:00
Ryan Huffman	7682ab00e3	Add ReceivedMessage and receive progress	2015-10-15 14:09:53 -07:00
Stephen Birarda	7987595dcd	set the bearer poll timeout for wlan scan in Qt 5.5	2015-10-08 11:32:10 -07:00
Stephen Birarda	e835b5ccf3	remove old gnutls code from domain-server	2015-10-05 15:30:26 -07:00
Stephen Birarda	030404157e	cleanup Assignment grab from iterator	2015-09-21 11:54:41 -07:00
Stephen Birarda	e21c1cb67c	make sure server/mixers are first in FIFO	2015-09-21 11:51:53 -07:00
Atlante45	449d6a04d8	CR	2015-09-11 14:21:56 +02:00
Atlante45	0037a1f4a7	Win build fix	2015-09-11 14:21:55 +02:00
Atlante45	18a696d88c	Type cleanup	2015-09-11 14:21:54 +02:00
Atlante45	15f7745bcc	JSON stats reliable and ordered	2015-09-11 14:21:54 +02:00
Atlante45	5808658958	Make NodeJSONStats reliable	2015-09-11 14:21:53 +02:00
Stephen Birarda	ed19987b7d	resolve conflicts on merge with upstream/master	2015-09-04 12:31:46 -06:00
Bennett Goble	6f4fc24fb6	NodeConnectionData QDataStream #include	2015-08-30 12:05:56 -04:00
Stephen Birarda	e3e529c4e5	resolve conflicts on merge with origin/protocol	2015-08-27 14:52:29 -07:00
Stephen Birarda	80cf7b6c76	resolve conflicts on merge with upstream/master	2015-08-27 14:50:04 -07:00
Stephen Birarda	1a019187af	Merge branch 'ds-cleanup' into asset-upload	2015-08-26 15:07:43 -07:00
Stephen Birarda	cd7d0f383b	allow editors who can't be verified in the short term	2015-08-26 15:07:29 -07:00
Stephen Birarda	4039c2e3e0	fix for asset-server naming, deadlock in timeout/wait	2015-08-26 14:27:12 -07:00
Stephen Birarda	352f3543c3	resolve conflicts on merge with ds-cleanup	2015-08-26 13:33:50 -07:00
Stephen Birarda	c8545c8aeb	remove an empty line	2015-08-26 12:37:47 -07:00
Stephen Birarda	dc1f726283	don't assign the asset-server in domain by default	2015-08-26 12:36:48 -07:00
Ryan Huffman	aa7d8678e1	Merge branch 'protocol' of github.com:birarda/hifi into atp-server	2015-08-26 12:26:11 -07:00
Atlante45	179ee73e26	Merge branch 'master' of https://github.com/highfidelity/hifi into update_protocol	2015-08-26 16:50:33 +02:00
Ryan Huffman	4e3d0758e5	Remove UNUSED_2	2015-08-25 15:07:07 -07:00
Stephen Birarda	c776f04ab2	don't allow in a user who should have edit but not verified	2015-08-25 14:36:22 -07:00
Stephen Birarda	9940f375ea	repairs for CR comments	2015-08-25 10:02:43 -07:00
Stephen Birarda	d02e5b2450	fix a typo in comment in DomainGatekeeper	2015-08-24 15:10:27 -07:00
Stephen Birarda	a9c04e5116	don't allow verified connection without username	2015-08-24 15:01:39 -07:00
Stephen Birarda	c6f1567361	add a debug for refused connection in DomainGatekeeper	2015-08-24 14:58:25 -07:00
Stephen Birarda	fe591f61cc	fix class rename in processConnectRequestPacket	2015-08-24 14:54:48 -07:00
Stephen Birarda	d57c1fc2d5	fix a typo in DomainGatekeeper comment	2015-08-24 14:50:18 -07:00
Stephen Birarda	7591a29c48	add back indentation to STATICALLY_ASSIGNED_NODES	2015-08-24 14:44:24 -07:00
Stephen Birarda	d2acf327dd	fix NodeConnectionData discrepancy on request	2015-08-24 14:43:49 -07:00