Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-19 09:59:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
85500 commits 28 branches 28 tags 1.2 GiB
Commit graph

783 commits

Author SHA1 Message Date
Kasen IO
6129981459 Merge branch 'master' into feature/domain-metadata-exporter 2020-06-29 23:26:14 -04:00
David Rowe
a78bd7025f Improve wording of get/set privateUserData description 2020-06-28 11:04:59 +12:00
motofckr9k
7b34872b81 Replace domain-server favicon 2020-06-21 03:59:33 +02:00
kasenvr
63e3c001c3
Merge pull request #411 from Misterblue/fix/central-metaverse-urls 
Move metaverse server URL info into central files for easier updating
 2020-06-18 17:23:05 -04:00
Kasen IO
f712fc7735 Export to JSON, JSON formatting. 2020-06-18 16:43:59 -04:00
Kasen IO
7c264e7d85 First pass at adding domain metadata exporter. 2020-06-15 22:51:51 -04:00
Robert Adams
3878ad6df6 Move metaverse server URL info into NetworkingConstants.h (for C++ 
code) and into shared.js (for JS code).
Modify references to the metaverse server from constants to
    references to the new central definitions.
 2020-06-13 07:04:58 -07:00
Dale Glass
443d769eac Make it possible to turn the Prometheus exporter on and off 
The settings are available from the domain settings page.
 2020-06-07 02:47:39 +02:00
Dale Glass
a8bd627cda Add Prometheus exporter 
Exports domain statistics for the domain on port 9703 (officially reserved)
 2020-06-07 02:47:39 +02:00
Kasen IO
115c40bd54 Lots of renamings, more to come. 2020-04-07 04:56:02 -04:00
Dale Glass
e396747377 Add Opus to list of codecs 2020-01-09 16:43:12 +01:00
Shannon Romano
15394f7a6b
Merge pull request #16284 from roxanneskelly/dev653 
DEV-653 - give warning not to change address for cloud domains
 2019-10-04 11:54:30 -07:00
Roxanne Skelly
38afa6b5c2 Move to correct place 2019-10-03 16:47:09 -07:00
Roxanne Skelly
8940d990ec DEV-2044 - add notification that temporary domains won't show up in 
domain list
 2019-10-03 16:17:08 -07:00
Roxanne Skelly
04f13cd17e DEV-653 - give warning not to change address for cloud domains 2019-10-03 12:05:10 -07:00
Roxanne Skelly
434c63b7e3 BUGZ-1381 - domain server creates blank/undefined group when adding 
groups
 2019-09-25 14:14:29 -07:00
Roxanne Skelly
9a7de10614 set file permissions on the config.json file for the domain server 2019-09-11 16:27:00 -07:00
Roxanne Skelly
0f242deaf2 fix crash and some UI issues 2019-09-11 14:11:43 -07:00
Roxanne Skelly
a0ad1f3a68 DEV-444 - OAuth administration improvements 2019-09-10 17:27:23 -07:00
Roxanne Skelly
b4fee1140c BUGZ-319 - Add 'Installed By' username to installed content section on 
settings.
 2019-07-29 16:25:51 -07:00
Roxanne Skelly
701c457ad4 Fix issue where reset of server was prematurely causing the drop of 
an ajax connection which was causing an error popup.
 2019-07-26 16:57:05 -07:00
Roxanne Skelly
22e71115dd DEV-168 - add filename reporting for installed/restored backup content 2019-07-25 11:46:05 -07:00
Roxanne Skelly
fe4334d6c4 BUGZ-829 fix a few nits 2019-07-24 15:33:13 -07:00
Roxanne Skelly
783c61500e BUGZ-829 DEV-168 - domain backup/content management improvements 
BUGZ-829 - improve error reporting during restore of content

DEV-168 - show last installed archive information
 2019-07-24 12:52:06 -07:00
Zach Fox
55138ed088 CR feedback 2019-05-13 14:12:51 -07:00
Zach Fox
d53b528994 Some fixes - i don't think this code is complete 2019-05-06 13:38:09 -07:00
Zach Fox
2046fcfd09 Merge branch 'master' of github.com:highfidelity/hifi into privateUserData 2019-05-06 11:08:36 -07:00
Zach Fox
d0e5087b20 Add permission 2019-05-06 10:19:58 -07:00
Simon Walton
a0fd828ef7 Set default av-mixer connection-rate to 1e7 2019-04-30 16:00:35 -07:00
Roxanne Skelly
629d5e50ff CR Fix 2019-04-05 16:16:34 -07:00
Roxanne Skelly
a63171fb94 Case22025 - Show 'create temporary place' button when no places are present 
The metaverse urls were hard-coded to be production.  Fix is to pull them
from the domain server, which will pull them from the environment variable.
 2019-04-05 14:54:02 -07:00
Roxanne Skelly
75671be2de Case 22025 - Create temporary placename doesn't appear when no places are listed 2019-04-03 13:57:37 -07:00
Simon Walton
a1660dad95 Follow dynamic updates to hero zones; make reserved fraction a domain setting 2019-03-22 12:30:49 -07:00
Clement
717c12fe16 Add new connection rate limitting 
Limit rate of connection for new Agents
 2019-02-27 18:22:49 -08:00
Clément Brisset
3386e5042f
Merge pull request #14450 from birarda/bug/case-insensitive-paths 
match domain paths match case-insensitively
 2018-12-07 13:59:49 -08:00
birarda
b2bd0d99de add a warning for cloud domain ID changes 2018-11-20 16:07:48 -08:00
birarda
b0aa1b2af2 make domain settings maps keyed case insensitively 2018-11-20 14:47:33 -08:00
John Conklin II
9b886ff725
Merge pull request #14391 from SimonWalton-HiFi/upload-to-ds-chunked 
Upload content to domain server in multiple chunks
 2018-11-19 17:53:44 -08:00
Simon Walton
2a7e22bf31 Identify initial chunk of an upload so as to be more resilient 2018-11-19 15:26:08 -08:00
Simon Walton
2d2cc0eaca Use a random session id for a sequence of chunks 2018-11-16 15:56:39 -08:00
birarda
bb0f046a72 add throttle start and backoff to DS settings 2018-11-15 17:28:34 -08:00
Simon Walton
22c3f5239a Relay upoaded content.zip chunks to temp file 
Entities uploads still build in-memory. Move out chunk
handling to new routine.
 2018-11-15 16:59:52 -08:00
Simon Walton
cd00abd216 Add upload progress bar 2018-11-15 09:47:43 -08:00
Simon Walton
f5e14565b8 Clean-up javascript formatting 2018-11-14 10:17:48 -08:00
Simon Walton
dab025304d Set chunk size to 1 MB 2018-11-13 12:22:30 -08:00
Simon Walton
a21d10ad1b Restore content archives (zip) correctly; other tweaks 2018-11-08 16:34:02 -08:00
Simon Walton
bb60324335 Chunked content upload - working proof-of-concept 2018-11-08 14:01:27 -08:00
Simon Walton
298c5efe69 Simple demo of uploading file in chunks 2018-11-08 12:13:56 -08:00
Clement
d79a47eac3 Increase AJAX timeout until we make a proper fix 2018-10-11 11:31:36 -07:00
Stephen Birarda
97d5e8f614 fix for row re-ordering causing no change alone 2018-09-27 17:11:10 -07:00
John Conklin II
3a6a72a079
Merge pull request #13643 from SimonWalton-HiFi/user-setting-hmac 
Add DS option to disable HMAC packet authentication
 2018-08-03 17:45:32 -07:00
Simon Walton
81c8fe6114 Change 'Enable Authentication' to 'Enable Packet Verification' 2018-07-24 17:06:09 -07:00
Simon Walton
3002abeddc Add DS option to turn off packet authentication 2018-07-18 18:22:36 -07:00
Simon Walton
beb878f10e Update avatar field description 2018-07-11 10:33:42 -07:00
Simon Walton
09b7787bc9 Use jQuery correctly, other clean-up 2018-07-11 10:27:17 -07:00
Simon Walton
7455f9fc18 Update the correct file this time 2018-07-10 18:25:43 -07:00
Simon Walton
41b08fcf40 Validate user-supplied avatar height range before accepting 2018-07-10 18:17:34 -07:00
Clement
e1c5eb9bda Fix wizard wording 2018-05-02 17:17:19 -07:00
Clément Brisset
feec59655c
Merge pull request #12692 from highfidelity/stable 
Merge stable back into master
 2018-03-22 15:08:30 -07:00
Ryan Huffman
fdeae4c11a Fix missing semicolon in content.js 2018-03-22 10:24:29 -07:00
Ryan Huffman
dc694fb0b7 Update content backup downloads to be asynchronous 
Previously backups would be consolidated into a full .zip when the
backup was requested. Because of the potential for a large number of
assets, this could take awhile, causing a browser to fail due to timeout
before the backup was available. This change splits the download
endpoint into 2 parts - one to request information about a backup and
possibly kick off a consolidation, and another to request the actual
file once the consolidate backup is available.
 2018-03-21 15:02:38 -07:00
Stephen Birarda
debea3791d Fix DS content backups not loading on IE 
IE does not support Object.assign
 2018-03-16 14:30:03 -07:00
Stephen Birarda
2872412f9c fixes for comments from code reviews 2018-02-26 14:35:34 -08:00
Stephen Birarda
1251328d2b reload backup information immediately when restore starts 2018-02-22 16:53:49 -08:00
Stephen Birarda
7fcac581ae fix regex for archive name, add general error message 2018-02-22 15:08:43 -08:00
Ryan Huffman
13b15ced89
Merge pull request #12470 from birarda/bug/content-settings-fixes 
disable click on restore during a restore or for corrupted
 2018-02-22 14:41:41 -08:00
Stephen Birarda
7c5ed86e3e refuse to post manual content archive with invalid name 2018-02-22 11:41:48 -08:00
Stephen Birarda
99c419c315 disable click on restore during restore or for corrupted 2018-02-22 11:03:31 -08:00
Clément Brisset
e83a933f50
Merge pull request #12461 from birarda/bug/delete-add-rule 
fix badging for changes in tables
 2018-02-21 18:14:21 -08:00
Clément Brisset
bbade00f3d
Merge pull request #12434 from birarda/feat/reload-after-restore 
check for recovery complete always, reload content page on restore
 2018-02-21 18:12:37 -08:00
Stephen Birarda
e80fef4e1b fix badging for changes in tables 2018-02-21 15:52:33 -08:00
Stephen Birarda
468ac62676 mark corrupted backups and refuse to restore from them in web UI 2018-02-21 15:33:12 -08:00
Stephen Birarda
4b25c9c419 handle permissions save with no existing permissions 2018-02-20 15:06:24 -08:00
Stephen Birarda
3f75bf62d5 check for recovery complete always, reload content page on restore 2018-02-16 18:03:16 -08:00
Stephen Birarda
5dd74674ef fix spinner and restart behaviour for manual content upload 2018-02-16 17:18:28 -08:00
Stephen Birarda
9af7579b85 handle change for programmatic input change badging 2018-02-16 16:32:21 -08:00
Stephen Birarda
c8308efa0c put back more broad header for content upload 2018-02-16 16:04:52 -08:00
Stephen Birarda
9057918e08 move default security permissions to describe-settings.json 2018-02-16 16:01:40 -08:00
Stephen Birarda
679513599c fix row hiding and paste events for badging 2018-02-16 16:01:40 -08:00
Stephen Birarda
5dec3aba50 fix download link and restore behaviour with pending 2018-02-16 16:01:40 -08:00
Stephen Birarda
faacd986b3 remove deleted backups from content archives tables 2018-02-16 16:01:40 -08:00
Stephen Birarda
cb747c9cdf refresh backups for availability and restore status 2018-02-16 16:01:40 -08:00
Stephen Birarda
910f3425f8 fix latest backup refreshing with no caching 2018-02-16 15:34:55 -08:00
Stephen Birarda
41b0bb8c58 connect download link from content archive tables 2018-02-16 15:34:55 -08:00
Stephen Birarda
2b39419795 keeping AYS DRY and hooking up restore/delete for content archives 2018-02-16 15:34:55 -08:00
Stephen Birarda
b019895fce handle entity file upload from new content upload 2018-02-16 15:34:55 -08:00
Stephen Birarda
2d9f2ebf81 fix active with anchor and settings dropdowns on non-settings pages 2018-02-16 15:34:55 -08:00
Stephen Birarda
dd5a705836 move rolling interval backup rules to automatic content archives 2018-02-16 15:34:55 -08:00
Stephen Birarda
29ceffd7cc add sections to content page for backup/restore 2018-02-16 15:34:54 -08:00
Stephen Birarda
4d4b42848b add alert for moved content settings 2018-02-14 16:31:28 -08:00
Stephen Birarda
37b8fa2c0c put back default values in settings response 2018-02-14 12:09:57 -08:00
Stephen Birarda
3516a8939a flag settings in description as being excluded from backups 2018-02-14 12:09:57 -08:00
Stephen Birarda
9f2015ba46 check correct element to determine if restart is required 2018-02-14 12:09:57 -08:00
Stephen Birarda
09c2390db4 change backup file name, fix safari button click bug 2018-02-14 12:09:57 -08:00
Stephen Birarda
11fe279f6f add domain settings backup and restore to web interface 2018-02-14 12:09:57 -08:00
Stephen Birarda
2f6b079d80 quick re-organization of settings groups 2018-02-14 12:09:57 -08:00
Stephen Birarda
bb2df1eb37 rename entity server section to remove settings 2018-02-14 12:09:57 -08:00
Stephen Birarda
3969288996 re-hide advanced settings and show with collapsible 2018-02-14 12:09:57 -08:00
Stephen Birarda
b650753e43 hide confusing label from domain settings for now 2018-02-14 12:09:57 -08:00
Stephen Birarda
6e93eb5dfa update SVG icon for HMD with new colour 2018-02-14 12:09:57 -08:00
Stephen Birarda
2c2a6d5c60 add the empty label group to domain extra groups 2018-02-14 12:09:57 -08:00
Stephen Birarda
8c924ea106 update badge colour 2018-02-14 12:09:57 -08:00
Stephen Birarda
b0967dfc3a move some more settings to content, leave places in domain settings 2018-02-14 12:09:57 -08:00
Stephen Birarda
6240181474 initial separation of content settings and domain settings 2018-02-14 12:09:56 -08:00
Anthony J. Thibault
fbcecbfc89 Merge branch 'master' into feature/domain-limited-height 2017-12-07 10:01:33 -08:00
Stephen Birarda
8978254037 kick logged in by fingerprint/ip if enabled in DS settings 2017-11-27 18:23:14 -08:00
Anthony J. Thibault
9f54ce55f3 Change domain setting from min/max avatar scale to min/max avatar height 
* Domain settings version has been bumped from version 2.0 to 2.1
* Old domain settings for avatar scale will be auto-converted to avatar height
* Avatar code has been changed so that limitDomainScale() works with the new height limits
* Avatar getUnscaledEyeHeight() was added to C++.
* MyAvatar.getHeight() was added to JS.
 2017-11-21 13:25:47 -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
Zach Fox
5ab737f66d
Merge pull request #11658 from zfox23/pop_dynamicTestsMaster 
Commerce: Owner Verification for Certified Entities
 2017-10-27 12:28:04 -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
Zach Fox
3f0b08aea8 Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster 2017-10-18 10:37:47 -07:00
Zach Fox
eceb0dcc95 Fix appearance of domain settings page 2017-10-17 11:29:43 -07:00
Zach Fox
a4b8bf0be6 Bugfixes and CR 2017-10-16 15:33:10 -07:00