Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 07:53:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
87499 commits 71 branches 56 tags 1.2 GiB
Commit graph

527 commits

Author SHA1 Message Date
Stephen Birarda
6240181474 initial separation of content settings and domain settings 2018-02-14 12:09:56 -08:00
Brad Hefta-Gaub
0945c1c50b
Merge pull request #11851 from Atlante45/feat/wizard 
Reworked wizard congratulation page.
 2017-11-21 09:15:59 -08:00
Brad Hefta-Gaub
74bafcbb10
Merge pull request #11795 from huffman/fix/ds-punchlist 
Punchlist fixes for DS
 2017-11-17 17:04:27 -08:00
Atlante45
1f23664c2f Update wizard's congratulation page 2017-11-17 16:33:22 -08:00
Ryan Huffman
b5c4517ee7 Update DS Settings strings 2017-11-13 15:59:57 -08:00
Atlante45
8f133fc7fa Congratulation page styling fixes 2017-11-10 18:12:43 -08:00
Atlante45
067436a743 CR 2017-11-10 18:12:33 -08:00
Atlante45
9cd8f372f2 Fix race condition 2017-11-10 16:21:06 -08:00
Atlante45
796909d366 Permissions page tweaks 2017-11-10 16:19:49 -08:00
Atlante45
2782ae03c5 Add back buttons 2017-11-10 15:48:44 -08:00
Atlante45
c047a1d0a4 Rework perms wizard page 2017-11-10 15:48:44 -08:00
Ryan Huffman
ecc76ab321 Remove dead code from ds settings 2017-11-10 15:35:05 -08:00
Ryan Huffman
2307cde599 Fix add-place button being added when account disconnected 2017-11-10 15:34:53 -08:00
Ryan Huffman
03364c1893 Cleanup DS settings for small screens 2017-11-10 15:34:22 -08:00
Ryan Huffman
d62c98c6e2 Update network address/port label in DS settings 2017-11-09 10:03:41 -08:00
Ryan Huffman
e274df065d Fix label nav always being shown in ds settings nav 2017-11-09 09:25:16 -08:00
Ryan Huffman
3b702a7ae3 Make ESC close dialog windows on DS settings 2017-11-09 09:05:07 -08:00
Ryan Huffman
028410a26a Fix alignment of Disconnect btn on ds settings 2017-11-08 14:05:51 -08:00
Ryan Huffman
1db8e2a0ec Update create domain id language 2017-11-08 14:01:04 -08:00
Ryan Huffman
a55a30f87f Fix 'Path' label when adding a place name 2017-11-08 14:00:43 -08:00
Ryan Huffman
c77942c542 Fix domain settings not showing label when first setting a placename 
This occurs because previously we only created the input elements if you
have a domain id when the page loads. Because you can now have a domain
id assigned after the page initially loads, we need to always create the
input.
 2017-11-08 13:36:03 -08:00
Ryan Huffman
393b55424f Fix Create-new-domain-id not saving in DS settings 2017-11-08 11:37:22 -08:00
David Rowe
ebe5d51ee8 Label models.json.gz paths in server Content tab with operating system 2017-11-08 14:25:10 +13:00
Ryan Huffman
b1fe3699f9 Fix domain id getting set to empty when adding place name 2017-11-02 17:42:24 -07:00
Ryan Huffman
8401aecef5 Update wizard to make request for domain info 2017-11-01 16:04:26 -07:00
Ryan Huffman
70d3bd3672 Fix label/auto networking not being hidden for temp domains 2017-10-29 20:48:03 -07:00
Ryan Huffman
3616ef7c49 Fix ip-only in DS settings to show port instead of address 2017-10-28 14:19:14 -07:00
Atlante45
56e9a9aaf9 Handle old configs 2017-10-27 17:32:11 -07:00
Ryan Huffman
c42ef4f88c Update most DS API forwarding APIs to use a single forwarding function 2017-10-27 15:53:50 -07:00
Atlante45
ae9f87873f Merge branch 'master' of https://github.com/highfidelity/hifi into feat/wizard 2017-10-27 15:27:00 -07:00
Atlante45
c7b8d1114d CR 2017-10-27 15:11:31 -07:00
Ryan Huffman
75e98dcef9 Cleanup style in DS js files 2017-10-27 14:55:50 -07:00
Atlante45
203a419f2a Setup Wizard 2017-10-27 12:52:36 -07:00
Ryan Huffman
390dae3918 Fix DS settings sidebar moving incorrectly 2017-10-27 11:49:41 -07:00
Ryan Huffman
2944d76ef0 Update settings with auto domain creation and restart 2017-10-27 11:49:41 -07:00
Ryan Huffman
1bb778c21f Fix label support in DS settings and add automatic domain generation: 2017-10-27 11:49:41 -07:00
Ryan Huffman
92aa66cdd7 Update domain settings to include domain info editing 2017-10-27 11:49:40 -07:00
Ryan Huffman
7dc475c695 Update domain server settings 
Move requests that require access token to go through DS
Update various styling and ease of use on DS settings page

Update domain server settings

CP

CP
 2017-10-27 11:49:34 -07:00
Zach Fox
d24f241b88 Fix silly javascript error 2017-10-26 13:31:15 -07:00
Zach Fox
b092862b03 Missed another spot 2017-10-24 14:23:06 -07:00
Liv
f150d77d31 Updating placeholder.js to use a url that points to example scripts 2017-10-02 11:08:07 -07:00
Stephen Birarda
cf92144748 fix for OAuth OPTIONS firing on XHR 302 2017-06-28 14:13:09 -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
d87a55d6e6 Made requested change to DS restart dialog message 2017-06-22 13:52:34 -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
seefo
d834a05fd9 Added confirmation to domain server webpage before restarting 2017-06-22 13:27:43 -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
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
0565cfa2b7 fix for array additions in DS settings 2017-06-15 14:59:12 -07:00
seefo
0fa172a4ef Fixed default value bug in dropdowns inside domain server settings 2017-06-14 17:19:48 -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
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
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
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
kunalgosar
a4e0d970bf Fix security section of domain server 2017-02-24 19:03:30 -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
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
Stephen Birarda
ab7ce19211 use html_id for settings anchor if no name 2017-01-23 09:49:46 -08:00
Zach Pomerantz
e2ff738fc3 strip unused audio settings 
- remove parameters on the jitter buffer algorithm, these are now static
- remove parameters on the output starve detection algorithm, now static
- move interface audio settings to the Developer menu
 2016-09-21 17:35:27 -07:00
Seth Alves
f348b56106 remove hidden attribute from advanced settings button 2016-08-05 18:16:48 -07:00
Stephen Birarda
62af203d08 migrate the deprecated merged master/user config 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
Zander Otavka
bcff561eb8 Add category collapsing and expanding 2016-07-28 18:14:00 -07:00
Zander Otavka
987a8c802f Add basic input validation 2016-07-28 17:21:40 -07:00
Zander Otavka
aa909a1366 Polish category/row addition and deletion 2016-07-28 17:21:40 -07:00
Zander Otavka
93f9f93b5a Enable adding groups 2016-07-28 17:21:40 -07:00
Zander Otavka
3234de9f92 Add category headers to groups 2016-07-28 17:21:40 -07:00
Seth Alves
b3e04b5370 small cleanups for permissions help text 2016-07-26 09:35:58 -07:00
Seth Alves
f35b935031 do some cleaning-up of the domain-server settings page group tables 2016-07-22 17:51:31 -07:00
Seth Alves
0e86be8660 use dev metaverse 2016-07-13 14:48:23 -07:00
Seth Alves
55d76abf48 back-out accidently changed api urls 2016-07-06 16:42:31 -07:00
Seth Alves
408a77dd13 merge from upstream 2016-06-29 18:49:33 -07:00
Seth Alves
c7d56493b1 Merge branch 'master' of github.com:highfidelity/hifi into groups 2016-06-27 10:07:38 -07:00
Zach Pomerantz
13310923c4 reset to temp domain after logout 2016-06-23 19:38:23 -07:00
Zach Pomerantz
1de1c632af use private_description instead of description for domain settings 2016-06-23 17:16:42 -07:00
Seth Alves
c4b0f1899e merge from upstream 2016-06-23 13:26:01 -07:00
Zach Pomerantz
807596596f fix badging, parsing of operating hours 2016-06-21 00:18:38 -07:00
Zach Pomerantz
7fa7abdb1d add operating hours to domain-server settings/UI 2016-06-20 22:58:20 -07:00
Seth Alves
e606ffb002 use constant rather than hard-coding metaverse url 2016-06-17 18:12:03 -07:00
Seth Alves
3fc9bdb3d0 undo accidental change 2016-06-16 16:44:18 -07:00
Seth Alves
52e3be4f5d allow for read-only text-fields in table input rows 2016-06-16 16:40:36 -07:00
Seth Alves
3072a67839 center help test above group-permissions table 2016-06-16 16:40:07 -07:00
David Rowe
d54247da8d Format hover popups 2016-06-10 10:13:54 +12:00
David Rowe
786c74d7f9 Vertically center table headings, reduce font size in subheadings 2016-06-10 08:57:52 +12:00
David Rowe
f3f04fba97 Fix IE displaying checkboxes too large 2016-06-08 09:41:31 +12:00
David Rowe
801981816b Add permissions tool-tips 2016-06-08 09:11:37 +12:00
David Rowe
f2d81f1338 Add security table heading groups 2016-06-07 17:46:45 +12:00
David Rowe
0119af11d6 Finesse security table text and general layout 2016-06-07 17:46:28 +12:00
David Rowe
a4be536a82 Change table switches to checkboxes; vertically align table rows 2016-06-07 17:46:07 +12:00
Seth Alves
a4e4093a18 split permissions into two sets, one for 'standard' ones and one for specific users 2016-06-06 10:39:47 -07:00
David Rowe
2eaf401bd6 Fix spurious data being submitted from changed permissions in new row 2016-06-04 12:39:55 +12:00
David Rowe
f2e5b6056f Make table switches smaller 2016-06-03 14:03:19 +12:00
David Rowe
8a2685325b Make localhost, anonymous, and logged-in rows non-deletable 2016-06-03 12:06:51 +12:00
David Rowe
fd77f8401c Style new code like old 2016-06-03 10:40:32 +12:00
David Rowe
21ba4f3394 Make editibility of switch columns be configurable 2016-06-03 10:27:38 +12:00
David Rowe
b36b1491af Restrict marking table rows dirty to table row switch events 2016-06-03 10:12:28 +12:00
David Rowe
e24ba4caf6 Code tidying 2016-06-02 05:47:07 -07:00
David Rowe
ce7fa51465 Make checkboxes in user permissions table editable 2016-06-02 05:47:01 -07:00
Seth Alves
f082201941 working toward a grid on domain-server settigns page 2016-06-01 15:32:27 -07:00
Seth Alves
7810ed6313 working toward a permissions grid in domain-server settings 2016-05-31 16:56:08 -07:00
Stephen Birarda
aad98cc25d make sure password setting is set before checking length 2016-04-11 11:56:47 -07:00
Stephen Birarda
7cd115f421 store and transmit passwords as SHA256 hash 2016-04-05 14:11:12 -07:00
Stephen Birarda
13a3b47d1b convert password to base64 before settings post 2016-04-05 14:11:12 -07:00
Stephen Birarda
f44cf3903c re-instate verified domain ownership for full automatic networking 
This reverts commit 34408c8144.
 2016-03-01 13:04:37 -08:00
Stephen Birarda
34408c8144 Revert "verified domain ownership for full automatic networking" 2016-02-25 17:02:08 -08:00
Stephen Birarda
0191d75e86 allow temporary domain to upload public key 2016-02-23 17:29:15 -08:00
Stephen Birarda
8598360f2e allow string values to be graphable in DS stats 2016-02-10 11:50:23 -08:00
Stephen Birarda
f12e0b5fd0 simplify callback for domain API get 2016-01-21 11:15:50 -08:00
Stephen Birarda
4e94817959 hookup share when passed action on settings page 2016-01-15 15:41:34 -08:00
Andrew Meadows
4ff05e8c2a fix lin endings of some JS files 2015-10-20 13:26:19 -07:00
Stephen Birarda
17befac262 use fixed width for stats tables 2015-08-24 18:10:21 -07:00
Stephen Birarda
b8ac9aa5eb update jquery and bootstrap in DS 2015-08-24 18:02:26 -07:00
Stephen Birarda
b386a95d08 fix sort for node uptime 2015-08-19 18:31:42 -07:00
Stephen Birarda
2738f65c10 have domain-server report non-skewed uptime 2015-08-19 18:23:11 -07:00
Leonardo Murillo
b345d75e4d More cleanup and showing version in ds web gui 2015-08-13 16:44:28 -06:00
Stephen Birarda
857552ae0b don't hold back link event for account connect 2015-05-26 15:16:23 -07:00
Stephen Birarda
33545a0c3f fix for domain-server settings account disconnect 2015-05-21 13:45:50 -07:00
Stephen Birarda
e295f52c0a handle change event for new checkboxes 2015-05-20 14:52:31 -07:00
Stephen Birarda
ab52df7254 change checkboxes to prettier bootstrap switches 2015-05-20 14:30:50 -07:00
Stephen Birarda
227bdff07a fix width of re-order column 2015-05-20 11:31:32 -07:00
Stephen Birarda
8fb5c53142 handle initial values for hash tables 2015-05-20 11:21:19 -07:00
Stephen Birarda
dff021ea15 fix for table creation on settings.js 2015-05-18 12:45:24 -07:00
Stephen Birarda
1a1b304319 update METAVERSE_URL to correct url 2015-05-18 10:24:10 -07:00
Stephen Birarda
6c5626da43 save input on enter or act on table 2015-05-18 10:19:11 -07:00
Stephen Birarda
bc0cb6105d fix sidebar badging for grouped values 2015-05-15 17:28:37 -07:00
Stephen Birarda
23378a79ab enable full auto networking for temporary name 2015-05-15 17:25:18 -07:00
Stephen Birarda
9024f15d25 show description for existing domain selection 2015-05-15 17:19:22 -07:00
Stephen Birarda
b8b5ff4aca fixes for temporary domain creation 2015-05-15 17:14:51 -07:00
Stephen Birarda
edf9042ed5 add hifi link to table, make table icons anchors 2015-05-15 17:12:19 -07:00
Stephen Birarda
60a8dc1eb3 add initial version of places table in domain-server 2015-05-15 16:33:12 -07:00
Stephen Birarda
bfa069a26b handle domain ID removal and account disconnection 2015-05-15 13:15:09 -07:00
Stephen Birarda
a675b0a891 fix locked link button in settings 2015-05-15 13:10:32 -07:00
Stephen Birarda
82cb55e602 handle case where account is locked 2015-05-15 11:26:06 -07:00
Stephen Birarda
78fa82515a use constant IDs for domain buttons 2015-05-15 11:19:44 -07:00
Stephen Birarda
c0473adec9 add button to create new domain ID in settings 2015-05-15 11:18:12 -07:00
Stephen Birarda
bb936657ae handle domain creation during account connect flow 2015-05-15 11:09:00 -07:00
Stephen Birarda
c4f926b25f hide domain ID + auto network options without account 2015-05-14 16:15:28 -07:00
Stephen Birarda
20940b55ba handle access token storage via sweet-alert 2015-05-14 15:47:20 -07:00
Stephen Birarda
5645fdc8b9 send user to token creation page 2015-05-14 15:21:33 -07:00
Stephen Birarda
a668ea7a4c remove a blank line 2015-05-14 12:53:23 -07:00
Stephen Birarda
4de006f9b9 handle OAuth access token retrieval 2015-05-14 12:22:23 -07:00
Stephen Birarda
fabe19a92c ask for OAuth token directly 2015-05-14 11:19:07 -07:00
Stephen Birarda
aff83be768 handle account disconnection from DS settings 2015-05-14 11:03:41 -07:00
Stephen Birarda
033007cce6 use viewHelpers to create HF account button 2015-05-14 10:45:26 -07:00
Stephen Birarda
62c0aff16a handle falsy values returned from valueForKeyPath 2015-05-13 17:52:46 -07:00
Stephen Birarda
93973eecd1 resolve conflicts on merge with upstream/master 2015-05-13 17:13:33 -07:00
Stephen Birarda
c66bd9b1aa complete addition of paths to DS settings 2015-05-12 11:58:55 -07:00
Stephen Birarda
f0aeaa1af8 handle sidebar badging for new root values 2015-05-11 18:07:33 -07:00
Stephen Birarda
542ce944ef add paths, handling for non-grouped values 2015-05-11 17:44:35 -07:00
Stephen Birarda
c390dcb4dd change button to disconnect if account connected 2015-05-11 14:10:44 -07:00
Stephen Birarda
27f06e2d37 add button handling for describe settings 2015-05-11 13:32:09 -07:00
Stephen Birarda
e7433adc96 re-affix the DS settings sidebar 2015-05-11 11:29:32 -07:00
Stephen Birarda
979f33ade5 show an advanced toggle button in when xs 2015-05-11 11:26:45 -07:00
Stephen Birarda
e225443986 fix for table overflow in DS settings 2015-05-11 11:18:26 -07:00
Stephen Birarda
7b4522e950 nullify the current Highchart when modal closed 2015-05-01 16:21:05 -07:00
Stephen Birarda
73da4828b1 fix the shift and width of stat highchart 2015-04-30 08:33:08 -07:00
Stephen Birarda
17c5d1e32a complete highchart dynamic graph for numerical values 2015-04-29 20:07:00 -07:00
Stephen Birarda
781f45e488 pull the keypath for clicked value in stats javascript 2015-04-29 17:55:10 -07:00
Stephen Birarda
a39ee91233 add a keypath data attribute on stat values 2015-04-29 17:53:29 -07:00
Stephen Birarda
eda18318d8 add highcharts for graphing of numerical stat values 2015-04-29 17:35:03 -07:00
Stephen Birarda
40dfbada5d cleanup styling in json.human.css 2015-04-29 16:38:12 -07:00
Stephen Birarda
cca13d6c96 add back stale state for stats 2015-04-29 16:35:07 -07:00
Stephen Birarda
ab4a140806 re-enable dynamic stat updates, styling fix 2015-04-29 16:25:40 -07:00
Stephen Birarda
cb588debfe handle display of more complex json stats in domain-server 2015-04-29 16:21:35 -07:00
Leonardo Murillo
d1d183e190 More .com changes 2015-03-25 13:05:10 -06:00
Stephen Birarda
fe79d8902e replace data with metaverse for highfidelity urls 2015-02-10 10:05:38 -08:00
Stephen Birarda
2c1d4c8a64 fix settings url to check domains 2015-01-15 17:44:15 -08:00
Stephen Birarda
891cb42eff use new place names in domain-server settings 2015-01-15 17:41:59 -08:00
Stephen Birarda
2103e0150f fix for row removal in domain array settings 2015-01-06 15:42:01 -08:00
Stephen Birarda
51c175d160 put input default back after row add 2015-01-06 15:30:38 -08:00
Atlante45
e6123ec4a7 Typo 2014-12-18 16:31:19 -08:00
Atlante45
47d8b0b062 Replace Game Of Life with intructions 2014-12-18 16:24:26 -08:00
Stephen Birarda
77bc00e410 a simple model for persistent scripts in domain-server 2014-12-16 18:34:39 -08:00
Stephen Birarda
9364c3b342 fix for delete of last row in array table 2014-10-23 11:54:30 -07:00
Stephen Birarda
1e4eaed7fd don't show domain ID selection button if in master config 2014-10-17 12:25:23 -07:00
Stephen Birarda
0d99beb344 add styling to locked table 2014-10-17 11:33:29 -07:00
Stephen Birarda
796b519fe0 remove change buttons for a locked table 2014-10-17 11:24:51 -07:00
Stephen Birarda
7c24186baa don't allow the creation of new table rows if table locked 2014-10-17 11:23:39 -07:00
Stephen Birarda
5b0ccd7091 fix for for clickable labels and locked table 2014-10-17 11:22:42 -07:00
Atlante45
9019ae4f89 Merge branch 'master' of https://github.com/highfidelity/hifi into attenuation_zones 
Conflicts:
	domain-server/resources/web/js/settings.js
 2014-10-16 10:55:46 -07:00
AndrewMeadows
4fbc589606 Merge pull request #3598 from birarda/domain-tunnel 
initial pass at using keypairs for username verification for basic domain-server ACL
 2014-10-16 10:49:03 -07:00
Atlante45
3f67f6fae7 hide panels if only advanced settings 2014-10-15 17:09:10 -07:00