1452 commits

Author	SHA1	Message	Date
Seth Alves	bd2ee56a27	fix domain-server command-line arguments	2016-09-22 12:45:49 -07:00
Seth Alves	c43c83019d	Merge branch 'master' of github.com:highfidelity/hifi into ice-troubles	2016-09-22 10:34:25 -07:00
Brad Hefta-Gaub	5d3d4bdbd9	add support for redirection on domain at max capacity	2016-09-21 18:12:38 -07:00
Seth Alves	b9ea93de57	use qWarning rather than qCritical because qCritical may exit	2016-09-21 10:08:02 -07:00
Seth Alves	ba8aa5b50c	fix camelcase	2016-09-19 16:38:34 -07:00
Seth Alves	571aaac4d7	Merge branch 'master' of github.com:highfidelity/hifi into ice-troubles	2016-09-19 15:37:53 -07:00
Seth Alves	8108557e10	whitespace	2016-09-19 15:37:50 -07:00
Brad Hefta-Gaub	fd474f6319	add basic support for master vs stable builds	2016-09-19 14:14:32 -07:00
Seth Alves	45b48c01bf	command-line arguments to control ice-server ip address and domain-server ID	2016-09-19 13:39:42 -07:00
Brad Hefta-Gaub	3d54600843	Merge pull request #8513 from Atlante45/feat/network-port ... Add settings to change local port	2016-09-08 18:10:32 -07:00
SamGondelman	544606bccc	cmake fix	2016-09-06 17:40:44 -07:00
SamGondelman	74e5814a48	try to fix rpath issue	2016-09-06 17:40:43 -07:00
SamGondelman	9d447d4dcc	enabled qnetworkrequest redirects everywhere I could find them	2016-09-06 17:35:06 -07:00
Atlante45	eb007b24cd	Use invalid port to signal no value passed	2016-09-06 11:59:07 -07:00
Stephen Birarda	43b8e01d46	don't force auto networking on non metaverse domains	2016-08-23 11:21:15 -07:00
Stephen Birarda	d098a1ae28	allow temporary domains to use an access token when present	2016-08-22 10:50:39 -07:00
Seth Alves	9bcda1bb45	merge from upstream	2016-08-20 15:25:04 -07:00
Seth Alves	ac4ecc9907	don't send a login-denied packet when we're still waiting for user's public key.	2016-08-19 14:10:27 -07:00
Seth Alves	87dbfa7e47	add -Wsuggest-override to compile flags and deal with fallout	2016-08-18 09:51:41 -07:00
Ryan Huffman	727d59ab27	Add backup directory setting to domain server	2016-08-16 17:33:32 -07:00
Stephen Birarda	5bac88c004	default domain-server permissions to connect for standard	2016-08-11 10:52:36 -07:00
Zander Otavka	3df8aa0dba	Suppress repeated ice server connection messages	2016-08-08 17:01:32 -07:00
Seth Alves	f348b56106	remove hidden attribute from advanced settings button	2016-08-05 18:16:48 -07:00
Brad Hefta-Gaub	652bea8cd0	Merge pull request #8363 from birarda/no-temp-ice-update ... Avoid DS heartbeats with non-metaverse domain ID	2016-08-05 16:48:00 -07:00
Seth Alves	3ca1ee1d82	Fix some group-related code to handle CamelCase usernames	2016-08-04 17:39:41 -07:00
Stephen Birarda	f3e30221f0	only force a new temp name if already a temp domain-server	2016-08-04 09:33:31 -07:00
Stephen Birarda	ba49fd2c61	don't heartbeat immediately unless metaverse domain	2016-08-04 09:33:31 -07:00
Stephen Birarda	a1220b87f1	set key ID for verified user in right place	2016-08-02 14:35:51 -07:00
Stephen Birarda	760223a550	check for existing public key with lowercase username	2016-08-02 14:35:51 -07:00
Stephen Birarda	5eb890e4f5	add a simple IP address sanitizer for DS settings save	2016-08-02 14:35:51 -07:00
Stephen Birarda	39e6ac0974	cleanup API for HifiConfigVariantMap after migration	2016-08-02 14:35:11 -07:00
Stephen Birarda	62af203d08	migrate the deprecated merged master/user config	2016-08-02 14:35:11 -07:00
Stephen Birarda	285478f1b2	don't repack the same permissions after kick	2016-08-02 14:35:11 -07:00
Stephen Birarda	5b04ab6d53	add node kick request handling to DS	2016-08-02 14:35:11 -07:00
Stephen Birarda	eaf52ae111	default kick perms for localhost	2016-08-02 14:35:11 -07:00
Stephen Birarda	f04996a53d	add the kick permission to domain server settings	2016-08-02 14:35:11 -07:00
Stephen Birarda	5d69c9c81e	fix sockaddr choice for local nodes	2016-08-02 14:35:11 -07:00
Stephen Birarda	b1e0e6d708	use replacement for IP address perms, not additive	2016-08-02 14:35:11 -07:00
Stephen Birarda	f7298ef767	add packing of IP perms, small cleanup in packing	2016-08-02 14:35:11 -07:00
Stephen Birarda	cd436355fc	cleanup handling of defaults for standard user perms	2016-08-02 14:35:11 -07:00
Stephen Birarda	f8ea180127	match naming of forbidden IP settings group to groups	2016-08-02 14:35:11 -07:00
Stephen Birarda	a674c843c2	add unpack for IP, DRYup unpackPermissions	2016-08-02 14:35:11 -07:00
Stephen Birarda	edce249d2c	remove subnet from IP address security	2016-08-02 14:35:11 -07:00
Stephen Birarda	6836b09f87	add sections to DS security for IP/Subnet	2016-08-02 14:35:11 -07:00
Seth Alves	60d6673950	switch data-web urls to point at production server rather than dev one	2016-08-01 12:00:08 -07:00
Seth Alves	c72cfb165c	damnit	2016-07-29 18:33:06 -07:00
Seth Alves	2443166d78	update for new friends api	2016-07-29 16:41:17 -07:00
Seth Alves	ebdfede89f	switch to new friends api	2016-07-29 16:34:59 -07:00
Seth Alves	11cf01e5ae	Merge branch 'groups' of github.com:sethalves/hifi into groups	2016-07-29 13:10:30 -07:00
Seth Alves	8e1820f911	make sure permissions have the correct ID in the case where a user has been verified	2016-07-29 13:10:14 -07:00