605 commits

Author	SHA1	Message	Date
Stephen Birarda	6425276eb0	have domain-server using full networking heartbeat with ice-server	2014-10-02 14:33:39 -07:00
Stephen Birarda	9baf983d07	Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel	2014-10-02 10:47:54 -07:00
Leonardo Murillo	78670245df	Merge pull request #3523 from birarda/master ... add debug to domain server if script not saved	2014-10-02 11:10:13 -06:00
Stephen Birarda	b6e0b08a29	add debug to domain server if script not saved	2014-10-02 10:07:02 -07:00
Stephen Birarda	e88b3311ad	Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel	2014-10-02 09:20:08 -07:00
Brad Hefta-Gaub	5d67739ab7	Merge pull request #3521 from birarda/domain-wizard ... handle select inputs in domain server settings creation	2014-10-02 08:36:10 -07:00
Stephen Birarda	d6572c3e2e	handle automatic networking changes with data-server	2014-10-01 16:38:44 -07:00
Stephen Birarda	15156519b3	Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel	2014-10-01 16:19:16 -07:00
Stephen Birarda	3292808342	update domain network address updating for IP auto networking	2014-10-01 16:19:10 -07:00
Stephen Birarda	d5b0904d7a	handle new automatic networking option in domain-server	2014-10-01 12:08:19 -07:00
Stephen Birarda	2eec6c1401	changes to settings.js to allow for select inputs	2014-10-01 12:00:10 -07:00
Stephen Birarda	a4b4fc52b6	handle select inputs in domain server settings creation	2014-10-01 11:57:44 -07:00
Stephen Birarda	d3cef7e592	add select for automatic networking to describe settings	2014-10-01 11:57:24 -07:00
Stephen Birarda	a0487e0a57	send public and local sockets to data-server in new format	2014-10-01 10:42:14 -07:00
Stephen Birarda	0174a985ee	add a domain-server scripts folder that is ignored for clean symlink	2014-10-01 09:56:13 -07:00
Stephen Birarda	f1de2ac937	rename jquery for easier updating in domain-server	2014-10-01 09:00:24 -07:00
Stephen Birarda	4ef2863b79	fix setting posting for checkbox values	2014-09-30 15:01:37 -07:00
Stephen Birarda	fed7dad2b6	use an auto_ptr to be able to reset the AccountManager	2014-09-30 14:36:32 -07:00
Stephen Birarda	909a6e89a8	resolve conflicts on merge with upstream master	2014-09-30 13:50:04 -07:00
Atlante45	b571fb86ae	Changed attenuation setting help	2014-09-30 12:53:33 -07:00
Atlante45	4e7bf0487b	Add attenuation setting on DS page	2014-09-30 12:50:50 -07:00
Stephen Birarda	3969c8bfe0	don't allow a username and password for domain auth, require access token	2014-09-30 12:23:04 -07:00
Stephen Birarda	df5ab50703	clear up domain ID selection on domain settings page	2014-09-30 11:34:03 -07:00
Stephen Birarda	26c2aece7a	fix target blank link from domain-server settings	2014-09-30 11:21:35 -07:00
Stephen Birarda	f566b42d18	make My Tokens link open in a new tab	2014-09-30 11:17:55 -07:00
Stephen Birarda	541c3c6da8	handle style of button while domains are loading	2014-09-30 11:02:47 -07:00
Stephen Birarda	5b03a445a8	allow user to choose domain ID from High Fidelity domains	2014-09-30 10:47:52 -07:00
Stephen Birarda	7e184d67e5	handle transition from dashed JSON settings keys to underscore	2014-09-30 09:49:34 -07:00
Stephen Birarda	68a70cc914	don't use dashes in settings JSON keys	2014-09-30 09:40:54 -07:00
Stephen Birarda	f07a8fd672	add a message for domain query with missing access token	2014-09-30 09:37:41 -07:00
Stephen Birarda	85aa0c34fb	stub of domain-server choose domain handler	2014-09-30 09:31:04 -07:00
Stephen Birarda	c84aac9d2e	remove an extra console log	2014-09-30 09:12:53 -07:00
Stephen Birarda	bd4a32551b	fix for settings save without organization	2014-09-29 10:09:33 -07:00
Stephen Birarda	46258ae78f	add a tooltip to say why locked settings cannot be changed	2014-09-29 10:02:01 -07:00
Stephen Birarda	58b03c7ef2	disable form inputs for values set by master config	2014-09-29 09:53:27 -07:00
Stephen Birarda	ec0805acc5	add locked settings to json return for auth'ed settings	2014-09-29 09:34:04 -07:00
Stephen Birarda	5e2870ac5f	require a distinction between master config and user config	2014-09-29 09:30:08 -07:00
Stephen Birarda	ae542419d1	fix for static assignments from queue	2014-09-26 16:36:18 -07:00
Stephen Birarda	9e02a36d3d	fix for domain-server allowed roles	2014-09-26 16:23:57 -07:00
Stephen Birarda	d389f13e1b	fix for role lookup in domain-server	2014-09-26 16:21:12 -07:00
Stephen Birarda	ae5a7b40a6	don't symlink the web directory on WIN32	2014-09-26 15:19:40 -07:00
Stephen Birarda	42d40d5a13	some help text cleanup for audio settings	2014-09-26 15:11:12 -07:00
Stephen Birarda	6bc81e6ff4	use panels on main domain-server page	2014-09-26 14:45:32 -07:00
Stephen Birarda	e8c3fa3cf1	use ID from new domain settings, don't disable save button	2014-09-26 14:39:50 -07:00
Stephen Birarda	cccacf4e6a	disable the save button if no settings are changed	2014-09-26 14:31:44 -07:00
Stephen Birarda	bbf111a9a0	disable the save button when nothing has changed	2014-09-26 14:27:29 -07:00
Stephen Birarda	05b80e3fb4	remove scrollspy while sections are not large enough	2014-09-26 14:21:49 -07:00
Stephen Birarda	401eb7df4f	remove the offset from scrollspy	2014-09-26 14:19:56 -07:00
Stephen Birarda	2a7626159c	stop the refresh countdown once we hit zero	2014-09-26 14:15:56 -07:00
Stephen Birarda	80f1594a17	add a restart modal to settings page	2014-09-26 14:12:30 -07:00