1677 commits

Author	SHA1	Message	Date
Liv	b63fcc329e	localhost default can change settings	2017-08-07 17:28:49 -07:00
Liv	d2abc42e8f	Update domain server to include permissions	2017-08-07 12:43:54 -07:00
Liv Erickson	da70071b5a	Merge branch 'master' into feat/domain-setup	2017-08-07 10:04:54 -07:00
Liv	eb1b7e52df	restore original files that had erroneous whitespace changes to reduce diff	2017-07-26 09:00:51 -07:00
Stephen Birarda	dd3755596c	fix typo in comment in DomainGatekeeper header	2017-07-25 15:43:34 -07:00
Stephen Birarda	e9845784d5	don't return error decrypting for optimistic public keys	2017-07-25 15:28:05 -07:00
Stephen Birarda	2d0c5ff37a	remove preloading of allowed user keys since it happens on connect	2017-07-25 11:41:34 -07:00
Liv	9458e4a1eb	Merge branch 'master' of https://github.com/highfidelity/hifi into feat/domain-setup	2017-07-25 11:32:13 -07:00
utkarshgautamnyu	5771ee27e1	Update DomainGatekeeper.cpp	2017-07-24 17:33:01 -07:00
utkarshgautamnyu	884bdb3b7e	Update DomainGatekeeper.cpp	2017-07-24 14:57:22 -07:00
utkarshgautamnyu	7c62ed6dac	made sendRequest depend on hasValidAccessToken being true	2017-07-24 14:46:32 -07:00
Liv	4ba9b08125	first attempt at url handling in octree server	2017-07-20 14:00:51 -07:00
Liv	e0fd391766	Add permission level for replacing domain content	2017-07-18 14:34:22 -07:00
Liv	3712e14530	Surface new user group UI to domain server settings	2017-07-18 10:02:46 -07:00
Stephen Birarda	d22b146370	Merge pull request #10845 from birarda/bug/domain-cookie-restart ... fix for OAuth OPTIONS firing every XHR 302	2017-07-06 17:22:03 -07:00
Stephen Birarda	6d98d20b12	cleanup bad QEventLoop::exec() OAuth handling code	2017-07-06 16:19:47 -07:00
utkarshgautamnyu	d961a0c4ad	Merge pull request #10887 from highfidelity/bug/5950 ... Bug/5950	2017-07-06 14:04:38 -07:00
Clément Brisset	34e3f56002	Merge pull request #10843 from birarda/bug/user-activities-interface-only ... disable user activity logger in DS/AC/ac-client	2017-07-06 14:01:49 -07:00
utkarshgautamnyu	d5c88bc6de	Merge branch 'master' into bug/5950	2017-07-06 12:52:13 -07:00
Stephen Birarda	916f57772b	default the UAL off for all targets, enable manually for Interface	2017-07-06 10:21:07 -07:00
utkarshgautamnyu	9d2fe8da9c	Update DomainServer.cpp	2017-07-05 18:02:44 -07:00
utkarshgautamnyu	8c96d00f14	Update DomainServerSettingsManager.cpp	2017-07-05 16:59:47 -07:00
utkarshgautamnyu	9b7a561c28	Update describe-settings.json	2017-07-05 16:56:21 -07:00
utkarshgautamnyu	f824290a4c	Update describe-settings.json	2017-07-05 14:38:06 -07:00
utkarshgautamnyu	25773fcf5a	Update describe-settings.json	2017-07-05 14:36:17 -07:00
utkarshgautamnyu	872751bb16	Update describe-settings.json	2017-07-05 14:30:48 -07:00
utkarshgautamnyu	c069c13ebb	Update DomainServerSettingsManager.cpp	2017-07-05 14:12:18 -07:00
utkarshgautamnyu	1385ef80a7	Update DomainServerSettingsManager.cpp	2017-07-05 13:56:40 -07:00
utkarshgautamnyu	7b79e8c41e	Update describe-settings.json	2017-07-05 13:53:04 -07:00
Clément Brisset	8744b8e58d	Merge pull request #10859 from Atlante45/fix/ac-cleanup ... Fix AC cleanup	2017-06-30 16:42:15 -07:00
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