1598 commits

Author	SHA1	Message	Date
Stephen Birarda	1ed0b693da	Merge branch 'replicants' of https://github.com/highfidelity/hifi into feat/downstream-in-nodelist	2017-06-14 16:57:28 -07:00
Ryan Huffman	785156ad9f	Move downstram server adding to DS	2017-06-14 16:54:04 -07:00
Stephen Birarda	e818a511b9	cleanup debug in updateReplicatedNodes	2017-06-14 15:07:48 -07:00
Stephen Birarda	54832d995d	fix a typo in shouldReplicateNode	2017-06-14 15:05:58 -07:00
Ryan Huffman	67113330b3	Make replicated username list case insensitive	2017-06-14 15:03:54 -07:00
Ryan Huffman	8d5dc21de8	Fix replicated nodes not being properly updated when logging in or changing settings	2017-06-14 15:03:53 -07:00
Clément Brisset	44117ac001	Merge pull request #10694 from highfidelity/master ... Update replicants branch with master	2017-06-14 15:01:22 -07:00
Ryan Huffman	7f75a5f7f5	Make replicated username list case insensitive	2017-06-14 13:57:04 -07:00
Ryan Huffman	59a420a358	Fix replicated nodes not being properly updated when logging in or changing settings	2017-06-14 13:53:50 -07:00
seefo	2d9e92d121	Made requested changes to PR10683	2017-06-13 18:08:26 -07:00
seefo	4080814df8	Cleaned up dropdown support for tables	2017-06-13 18:07:16 -07:00
seefo	2f307f418c	Added support for dropdown to tables in domain settings	2017-06-13 18:07:16 -07:00
seefo	74066647c6	Resolved FB4958	2017-06-13 18:01:53 -07:00
Ryan Huffman	029e6de2a0	Fix replicated users not being checked after username verified	2017-06-13 17:18:29 -07:00
Ryan Huffman	2e23230e82	Remove DomainServer qualification inside header	2017-06-13 17:18:29 -07:00
Ryan Huffman	ea56c568a7	Add support for replicating by username	2017-06-13 17:18:28 -07:00
Stephen Birarda	7bfce55559	Merge pull request #10667 from seefo/fb5284 ... Added initial replication settings to domain settings	2017-06-12 16:28:41 -07:00
seefo	6635187da3	Changed domain server settings	2017-06-12 16:13:03 -07:00
Ryan Huffman	84e1a6f893	Rename isReplicant to isReplicated	2017-06-12 13:38:58 -07:00
Ryan Huffman	ff2800e8d5	Add isReplicant to Node	2017-06-12 13:37:49 -07:00
seefo	2ce924377a	Added initial settings for replication	2017-06-12 11:56:38 -07:00
seefo	110a2f5d03	Resolved FB#4399	2017-06-08 10:35:50 -07:00
seefo	da41b5dc00	Focus is now changed when adding a new list item in DS settings	2017-05-25 09:20:04 -07:00
seefo	cb831733a1	Added warning if trying to change DS HTTP password to blank string	2017-05-23 17:07:37 -07:00
seefo	8a8f971186	empty passwords will no longer allow any password to pass DS HTTP auth	2017-05-23 12:01:00 -07:00
Stephen Birarda	9bc0609b1e	address code review comments	2017-04-28 10:17:48 -07:00
Stephen Birarda	a21a34a4a4	add entities file replacement to DS and ES	2017-04-27 16:56:27 -07:00
Stephen Birarda	cd023e0384	force domain-server to use new ID if node requests connect	2017-04-25 13:10:54 -07:00
Brad Davis	e482eac437	Merge remote-tracking branch 'upstream/master' into smarter_textures	2017-03-20 16:22:13 -07:00
Brad Davis	4367e3d036	PR comments	2017-03-15 18:13:10 -07:00
Brad Davis	2837ae9183	More VS 2017/2015 fixes	2017-03-15 16:13:15 -07:00
Zach Pomerantz	808973d7d2	use QStandardPaths instead of hardcoded paths	2017-03-13 17:26:42 -04:00
Zach Pomerantz	172a638ef0	move resource paths to PathUtils	2017-03-13 17:26:34 -04:00
kunalgosar	a4e0d970bf	Fix security section of domain server	2017-02-24 19:03:30 -08:00
Brad Hefta-Gaub	305e1ae1d2	Merge branch 'master' of https://github.com/highfidelity/hifi into avatarMixerLoopImprovements	2017-02-17 10:18:53 -08:00
David Kelly	a8831e89ff	Ban only by machine fingerprint, when possible	2017-02-16 09:50:56 -07:00
Brad Hefta-Gaub	5d90b7b1b7	Merge branch 'master' of https://github.com/highfidelity/hifi into avatarMixerLoopImprovements	2017-02-15 16:15:57 -08:00
Howard Stearns	34a4770ffa	Merge pull request #9669 from davidkelly/dk/2656 ... inform gatekeeper immediately when kicking someone	2017-02-15 15:13:10 -08:00
Brad Hefta-Gaub	00086fcc06	wire up thread count to settings, tweak stats	2017-02-15 13:00:30 -08:00
Stephen Birarda	27412080dd	return an empty descriptors map when empty	2017-02-14 15:39:59 -08:00
David Kelly	3b344ca01a	inform gatekeeper immediately when kicking someone	2017-02-13 18:25:00 -07:00
David Kelly	45cb11f38a	Don't allow a ban of any node on same machine as domain-server	2017-02-13 14:38:21 -07:00
Ryan Huffman	026c68c7de	Merge pull request #9625 from huffman/fix/server-script-entity-updates ... Fix Server Entity Script w/ high update rate causing issues	2017-02-09 10:07:32 -08:00
Ryan Huffman	f75eceda65	Add entity PPS per script configuration	2017-02-08 13:11:18 -08:00
Stephen Birarda	5c46cecf6a	handle empty initial groups when comparing	2017-02-06 14:32:02 -08:00
Stephen Birarda	3311df5e1f	fix default value in new row	2017-02-06 14:23:37 -08:00
Stephen Birarda	4bbd823a5a	remove open hours from domain settings	2017-02-06 10:50:59 -08:00
Stephen Birarda	5bd8e46510	only check if keys are empty, not all fields	2017-02-01 10:33:29 -08:00
Stephen Birarda	f03d2988c1	fix for checkbox name setting	2017-01-31 17:30:45 -08:00
Stephen Birarda	79cb0ba074	fix keyboard behaviour for category tables	2017-01-31 11:05:57 -08:00