1747 commits

Author	SHA1	Message	Date
Atlante45	5c731636b1	Sandbox restarts crashed processes	2017-06-29 12:13:52 -07:00
utkarshgautamnyu	5f123018a4	Update DomainMetadata.cpp	2017-06-29 10:38:33 -07:00
Stephen Birarda	cf92144748	fix for OAuth OPTIONS firing on XHR 302	2017-06-28 14:13:09 -07:00
Stephen Birarda	86eb5b14ca	disable the user activity logger in DS/AC/ac-client	2017-06-28 13:19:58 -07:00
Seth Alves	5e2aeb96d3	Merge branch 'master' of github.com:highfidelity/hifi into fix-linux-asan	2017-06-23 10:18:33 -07:00
Seth Alves	8510b60a87	Merge pull request #10789 from sethalves/fix-domain-server-ice-messages ... fix the messages printed by domain-server about which name it's using to find ice-servers	2017-06-22 17:59:09 -07:00
Clément Brisset	c47645e075	Merge pull request #10778 from birarda/feat/upstream-in-nodelist ... add upstream nodes to NL and verify replicated packet sender	2017-06-22 15:16:23 -07:00
Stephen Birarda	07ccf13ca9	Merge pull request #10788 from seefo/fb5533 ... Fixed a bug where restart modal was shown when it shouldn't be	2017-06-22 14:44:19 -07:00
seefo	517329030f	Merge pull request #10787 from seefo/fb5520 ... Added confirmation to domain server webpage before restarting	2017-06-22 14:20:35 -07:00
Seth Alves	d290f03edb	Merge branch 'master' of github.com:highfidelity/hifi into fix-linux-asan	2017-06-22 13:53:23 -07:00
Seth Alves	f1c7d54010	fix the messages printed by domain-server about which name it's using to find ice-servers	2017-06-22 13:53:06 -07:00
seefo	d87a55d6e6	Made requested change to DS restart dialog message	2017-06-22 13:52:34 -07:00
Stephen Birarda	0c7baa3ce4	remove an extra blank line	2017-06-22 13:36:58 -07:00
Stephen Birarda	dd44a81791	verify that replication server type is also present	2017-06-22 13:36:24 -07:00
seefo	d340c1c68f	Fixed a bug where restart modal was shown when it shouldn't be	2017-06-22 13:35:10 -07:00
Stephen Birarda	e00bbfb2fd	make upstream nodes setting advanced	2017-06-22 13:33:57 -07:00
Stephen Birarda	ea45e341ee	send upstream nodes down to avatar/audio	2017-06-22 13:33:57 -07:00
seefo	48b5989b60	add upstream nodes to domain nodelist	2017-06-22 13:33:57 -07:00
seefo	71cc76e94f	Renamed upstream servers setting in domain server	2017-06-22 13:33:31 -07:00
seefo	7eed90bf54	Added Upstream Servers setting to domain server	2017-06-22 13:33:31 -07:00
seefo	d834a05fd9	Added confirmation to domain server webpage before restarting	2017-06-22 13:27:43 -07:00
Stephen Birarda	01d9812247	Merge pull request #10772 from birarda/bug/domain-double-connect ... use existing node ID during repeated connect requests	2017-06-22 13:16:33 -07:00
Seth Alves	7ff576ef18	add memory-debugging macro to some cmake files	2017-06-22 10:07:39 -07:00
Stephen Birarda	95704c1ba5	make broadcasting settings advanced	2017-06-21 17:58:19 -07:00
Stephen Birarda	c516dd06e4	Merge pull request #10714 from highfidelity/replicants ... add broadcasting/replication to downstream avatar mixers and audio mixers	2017-06-21 17:55:07 -07:00
Stephen Birarda	e39e5c8c3b	simplify lambda capture in gate keeper	2017-06-21 16:21:40 -07:00
Stephen Birarda	aeb3f443f8	address code review comments	2017-06-21 16:14:14 -07:00
Stephen Birarda	9285c88e46	check if usernames do not match before using hint ID	2017-06-21 15:34:43 -07:00
Stephen Birarda	3e97b07fc2	Revert "force domain-server to use new ID if node requests connect" ... This reverts commit cd023e0384.	2017-06-21 15:14:16 -07:00
Stephen Birarda	3619294761	Merge pull request #10745 from seefo/fb5367 ... Added a restart button to domain server settings page	2017-06-19 16:35:36 -07:00
seefo	0c7f1cda0f	Added a restart button to domain server settings page	2017-06-19 15:01:50 -07:00
seefo	1619d877d3	Made requested changes to domain server settings.js	2017-06-19 13:21:13 -07:00
seefo	705ce4c789	Changed domain server restart/save button behavior to be correct	2017-06-19 12:09:20 -07:00
seefo	3d4b9c82aa	Changed indentation to be consistent	2017-06-19 11:56:45 -07:00
seefo	3224bf5af0	Domain server settings will now tell user if saving will restart DS	2017-06-19 11:52:49 -07:00
Stephen Birarda	36b4990114	fix for table additions when there is no initial row	2017-06-15 17:19:05 -07:00
Stephen Birarda	e6ef153148	Merge branch 'master' of https://github.com/highfidelity/hifi into feat/replicants	2017-06-15 15:43:13 -07:00
Stephen Birarda	0565cfa2b7	fix for array additions in DS settings	2017-06-15 14:59:12 -07:00
Stephen Birarda	ea6a38148c	Merge branch 'replicants' of https://github.com/highfidelity/hifi into feat/downstream-in-nodelist	2017-06-15 14:30:08 -07:00
Ryan Huffman	330a27b3a0	Fix removing all downstream nodes in settings not killing nodes	2017-06-15 14:27:01 -07:00
Stephen Birarda	94abfc2d6b	nomenclature changes from replication to broadcast	2017-06-15 11:47:13 -07:00
Brad Hefta-Gaub	035a9e898f	Merge pull request #10684 from howard-stearns/avatar-whitelist ... avatar whitelist	2017-06-15 08:45:16 -07:00
Stephen Birarda	2e5d92a537	Merge branch 'replicants' of https://github.com/highfidelity/hifi into feat/downstream-in-nodelist	2017-06-14 17:23:12 -07:00
Stephen Birarda	0fa88db1d3	Merge pull request #10699 from seefo/replicants ... Fixed default value bug in dropdowns inside domain server settings	2017-06-14 17:22:55 -07:00
Stephen Birarda	10649c8f6e	change new Node flag to isForcedNeverSilent	2017-06-14 17:20:37 -07:00
seefo	0fa172a4ef	Fixed default value bug in dropdowns inside domain server settings	2017-06-14 17:19:48 -07:00
Stephen Birarda	224a559602	keep downstream nodes around in domain, alive in upstream	2017-06-14 17:17:14 -07:00
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
howard-stearns	2deb26551f	typos in comments/help-strings	2017-06-14 11:56:47 -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
howard-stearns	6271b8ee7c	avatar whitelist	2017-06-13 16:56:18 -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
Stephen Birarda	1474f22fd7	don't validate category inputs for empty	2017-01-31 10:55:42 -08:00
Stephen Birarda	015aafe0fb	make table additions in DS settings clearer	2017-01-31 10:36:16 -08:00
David Kelly	eaf033107c	Require password verification in domain-server settings ... If you modify the security settings to use a username/password for access to the domain server settings, we now have a second password field which must match the first one you entered.	2017-01-30 17:13:13 -07:00
Howard Stearns	866f9debcd	Merge pull request #9526 from highfidelity/edit-entity-filter ... Edit entity filter (from branch)	2017-01-26 16:00:48 -08:00
Brad Hefta-Gaub	0582aca598	Merge pull request #9511 from kunalgosar/master ... change server to default to not auto-muting	2017-01-26 10:59:50 -08:00
howard-stearns	1c30da42af	change placeholder text in settings	2017-01-25 17:01:07 -08:00
howard-stearns	9cbc4fd1b9	Merge branch 'master' of https://github.com/highfidelity/hifi into entity-filter-resource	2017-01-25 16:23:52 -08:00
Atlante45	f540c94113	Merge branch 'master' of https://github.com/highfidelity/hifi into ess-pr	2017-01-25 13:06:49 -08:00
kunalgosar	7b896f961b	change server to default to not auto-muting	2017-01-25 13:00:57 -08:00
Ryan Downe Karpf	b053fb55aa	Merge pull request #9478 from birarda/bug/too-many-casts ... some reinterpret/dynamic cast cleanup in domain-server	2017-01-25 12:47:27 -08:00
Stephen Birarda	9b8cbba53f	add isInInterestSet to DomainServer for extra checks	2017-01-24 18:32:33 -08:00
Stephen Birarda	e511b6e84c	cleanup connect check in DomainServer	2017-01-24 17:14:05 -08:00
Stephen Birarda	fc42c1bc94	don't tell ESS about script Agents that won't talk to it	2017-01-24 17:10:05 -08:00
Stephen Birarda	7362bf16c1	use isParentOf to check script whitelist, clarify description in settings	2017-01-23 16:44:28 -08:00
Stephen Birarda	1802e1520d	change some dynamic_cast to static_cast for DomainServerNodeData	2017-01-23 13:15:48 -08:00
Stephen Birarda	fb8d2e34fb	fix needless reinterpret_cast for DomainServerNodeData	2017-01-23 13:14:53 -08:00
howard-stearns	3358d58d01	Merge branch 'master' of https://github.com/highfidelity/hifi into minimum-edit-entity-filter	2017-01-23 12:21:32 -08:00
Stephen Birarda	ab7ce19211	use html_id for settings anchor if no name	2017-01-23 09:49:46 -08:00
Ryan Huffman	b6893a0100	Keep Agents and EntityScriptServers from connecting if lacking permissions	2017-01-19 14:35:27 -08:00
Zach Fox	44eaa64a1d	It was writeString() all along!	2017-01-19 11:25:17 -08:00
Zach Fox	534fcd9399	Potential fix	2017-01-19 10:20:36 -08:00
Zach Fox	1175752e1d	Cleanup after rebase	2017-01-18 12:55:24 -08:00
Zach Fox	346cfbfe02	First checkpoint	2017-01-18 12:55:24 -08:00
howard-stearns	d9182cd38d	Merge branch 'master' of https://github.com/highfidelity/hifi into minimum-edit-entity-filter	2017-01-18 10:02:27 -08:00
Atlante45	529286b2ea	More EntityScriptServer work	2017-01-17 13:47:45 -08:00
Atlante45	163d65d784	Setup basic EntityScriptServer	2017-01-17 13:47:45 -08:00
ZappoMan	5e49e8025a	improve comment in domain settings	2017-01-16 21:06:38 -06:00
Zach Fox	e22c1ac30e	Fix the bug	2017-01-16 11:48:51 -08:00
howard-stearns	f6446c6806	minimum entity edit filter	2017-01-13 13:18:24 -08:00
David Kelly	36792e005a	initial commit	2016-12-19 14:19:39 -08:00
David Kelly	c0d7c06d4a	Merge pull request #9221 from davidkelly/dk/machineFingerprintToDS ... Adding Machine Fingerprint to Domain Server permissions	2016-12-19 11:49:33 -08:00
Zach Fox	4bfc04a6ec	Small CR changes	2016-12-19 10:41:18 -08:00
Zach Fox	ee2f600d2e	Fix username display bug	2016-12-19 10:20:08 -08:00
Zach Fox	a912fec496	PR comments; need particular fix on Master for full QA	2016-12-19 10:20:08 -08:00
Zach Fox	e940daf5b4	Comments and clarity	2016-12-19 10:20:08 -08:00
Zach Fox	2c5db54b08	Super close	2016-12-19 10:20:08 -08:00
Zach Fox	802e283508	Another checkpoint, getting closer	2016-12-19 10:20:08 -08:00
Zach Fox	c9dc91900f	Checkpoint	2016-12-19 10:20:08 -08:00
Brad Davis	2d73588361	Fix stat tracker missing in agents	2016-12-16 17:34:00 -08:00
David Kelly	0553dbdcb7	CR feedback	2016-12-16 17:17:10 -08:00
David Kelly	126ae52cb4	Merge branch 'master' of github.com:highfidelity/hifi into dk/machineFingerprintToDS	2016-12-16 12:17:54 -08:00
David Kelly	4d7f3051a7	Expose Machine Fingerprint perms in DS settings page ... Should be about same as MAC or IP for now, applies whenever you are not logged in.	2016-12-16 10:19:37 -08:00
Ryan Huffman	7bb2755913	Add chrome tracing support	2016-12-16 01:14:01 -08:00
Seth Alves	26639aac15	Merge pull request #8789 from Atlante45/fix/settings ... Use JSON for application Settings	2016-12-15 07:00:46 -08:00
David Kelly	cb14b0e3e0	inital cut, passing fingerprint in ... does permissions same as mac address, more or less. Not exposed yet, just a beginning.	2016-12-14 16:09:13 -08:00
Brad Hefta-Gaub	92632e72b6	make default avatar mixer send bandwidth 5mbps	2016-12-13 17:04:25 -08:00
Zach Pomerantz	f5b4fac46d	set default audio threads to 1	2016-12-07 18:47:33 -05:00
Zach Pomerantz	b4638105e3	expose audio mixer threads to gui	2016-11-29 13:32:10 -05:00
Atlante45	3035d43772	Merge branch 'master' of https://github.com/highfidelity/hifi into fix/settings	2016-11-21 13:05:08 -08:00
Stephen Birarda	dec4ce79b2	fix comment in mac permission unpack	2016-11-18 14:42:29 -08:00
Stephen Birarda	143225a74c	add MAC permission table to domain-server and leverage	2016-11-18 14:40:22 -08:00