Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-22 22:54:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
72789 commits 75 branches 59 tags 1.2 GiB
Commit graph

1993 commits

Author SHA1 Message Date
Stephen Birarda
3e4375b1e6 set recovery filename during domain content archive recovery 2018-02-22 16:54:56 -08:00
Stephen Birarda
1251328d2b reload backup information immediately when restore starts 2018-02-22 16:53:49 -08:00
Atlante45
80c0f2a21e Fix crash when passing --checkMinSpec flag 
That flag caused a DLL to be loaded before Application was
	instanced.
	This triggers a Qt bug inside Q_COREAPP_STARTUP_FUNC that causes
	the previous registration pointing the startup function in
	the main executable to be overridden with the address of the
	function in the DLL (Since they both link the same static
	library)
	This leads to the correct function running in the wrong address
	space (the DLLs), hence not initializing some global variables
	correctly.
 2018-02-22 16:29:38 -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
Ryan Huffman
12e881a5e3
Merge pull request #12471 from birarda/feat/validate-manual-backup-names 
refuse to post manual content archive with invalid name
 2018-02-22 14:29:43 -08:00
Stephen Birarda
7c5ed86e3e refuse to post manual content archive with invalid name 2018-02-22 11:41:48 -08:00
Stephen Birarda
3c39c92879
Merge pull request #12468 from huffman/fix/reject-invalid-manual-backup-names 
Fix/reject invalid manual backup names
 2018-02-22 12:17:42 -07:00
Stephen Birarda
99c419c315 disable click on restore during restore or for corrupted 2018-02-22 11:03:31 -08:00
Ryan Huffman
017d10de3d Fix DomainContentBackupManager.* headers 2018-02-22 09:29:59 -08:00
Ryan Huffman
bf4fd867a3 Add rejection for invalid manual backup names 2018-02-22 09:29:18 -08:00
Atlante45
2fb9c324a5 Ignore baked assets in backups 2018-02-21 18:40:06 -08:00
Clément Brisset
8f7944522f
Merge pull request #12465 from birarda/feat/content-settings 
fix restore of object settings for content or domain settings
 2018-02-21 18:15:09 -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
Stephen Birarda
af3970e211
Merge pull request #12466 from Atlante45/feat/backups-integration 
Fix crash on manual upload recovery
 2018-02-21 19:13:56 -07: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
a036de9687 fix restore of object settings 2018-02-21 18:12:00 -08:00
Atlante45
a2c94bd9d2 Fix invalid iterator access 2018-02-21 18:08:21 -08:00
Atlante45
e12ca2683f Fix incorrect "all backups loaded" flag 2018-02-21 18:08:21 -08:00
Stephen Birarda
e967ed0e22
Merge pull request #12459 from Atlante45/feat/backups-integration 
Cleanup timers on the correct thread
 2018-02-21 18:55:39 -07:00
Stephen Birarda
3f9ee4918e
Merge pull request #12457 from birarda/feat/disable-ds-asset-client-caching 
disable caching for asset requests in domain-server
 2018-02-21 18:16:56 -07:00
Stephen Birarda
946474c615 do not init caching for asset requests in domain-server 2018-02-21 16:33:58 -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
Atlante45
7582395686 Cleanup backup handlers timers on the correct thread 2018-02-21 14:53:04 -08:00
Stephen Birarda
4b25c9c419 handle permissions save with no existing permissions 2018-02-20 15:06:24 -08:00
Atlante45
0c7f5250f3 Update isCorrupted with name indexing 2018-02-20 11:48:25 -08:00
Ryan Huffman
479dfaf330 Add corrupted backup status to domain content backup info 2018-02-20 10:18:12 -08:00
Sam Gateau
fd49c0d100
Merge pull request #12401 from SamGondelman/decals 
Material Entities
 2018-02-19 10:58:02 -08:00
Stephen Birarda
3f75bf62d5 check for recovery complete always, reload content page on restore 2018-02-16 18:03:16 -08:00
Atlante45
85c1739df4 Fix filename not being passed in correctly 2018-02-16 17:37:29 -08:00
Stephen Birarda
1e36a5b218
Merge pull request #12430 from birarda/feat/pending-content-archives 
make filename regex less restrictive
 2018-02-16 18:21:56 -07:00
Stephen Birarda
5dd74674ef fix spinner and restart behaviour for manual content upload 2018-02-16 17:18:28 -08:00
Atlante45
c61aa4bf95 Pass in backup name to handler 2018-02-16 17:16:31 -08:00
Stephen Birarda
2faa67c68d make filename regex less restrictive 2018-02-16 17:01:46 -08:00
Atlante45
acc68d65c2 Backup bug fixes 2018-02-16 16:59:12 -08:00
Stephen Birarda
9af7579b85 handle change for programmatic input change badging 2018-02-16 16:32:21 -08:00
Stephen Birarda
4c10dcba96 match previous behavior in DomainGatekeeper 2018-02-16 16:06:29 -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
dd5b08bdc1 fix unlock of locker not mutex, don't pack permission defaults 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
1c053730eb make DomainServerSettingsManager thread-safe for use in content backup 2018-02-16 16:01:40 -08:00
Stephen Birarda
d9f2e1986f set DomainContentBackupManager object name so it appears on thread 2018-02-16 16:01:40 -08:00
Stephen Birarda
8e621a95a3 fix typo in debug for writing new entities 2018-02-16 16:01:40 -08:00
Stephen Birarda
441b55301f cleanup LNL last during DS shutdown 2018-02-16 16:01:40 -08:00
Stephen Birarda
494f93304b take down AssetClient after content manager 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
40078450dd add API to recover from content archive 2018-02-16 16:01:40 -08:00
Stephen Birarda
de75fe8e9f CR fix for typo in comment 2018-02-16 15:37:14 -08:00
Stephen Birarda
2020ce5907 add API to recover from content archive 2018-02-16 15:37:14 -08:00
Stephen Birarda
6f8381d378 use automatic content archives group const 2018-02-16 15:34:55 -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
Ryan Huffman
f4cde44e6a Fix indentation of brace initialization 2018-02-16 15:25:29 -08:00
Ryan Huffman
a2072062f1 Fix recovery filename not being reset when recovery complete 2018-02-16 14:33:37 -08:00
Ryan Huffman
41d7d7efbb Fix initializer list style 2018-02-16 14:33:19 -08:00
Ryan Huffman
936629ec1a Update DomainContentBackupManager to use emplace_back where available 2018-02-16 14:13:12 -08:00
Ryan Huffman
0230abea79 Fix backup loading not getting auto backups 2018-02-16 13:54:35 -08:00
Ryan Huffman
ec3580f596 Fix recovery ID not being recorded 2018-02-16 13:08:57 -08:00
Ryan Huffman
efa55c0a63 Update backup delete to not break rolling backups and remove unused asset files 2018-02-16 13:07:17 -08:00
Stephen Birarda
29349d7bb2 fix for isAvailable boolean in AssetsBackupHandler 2018-02-15 19:18:51 -08:00
Stephen Birarda
4bb8435ef8 don't overwrite general description object with filtered one 2018-02-15 19:18:22 -08:00
Stephen Birarda
81662b5edc don't overwrite general description object with filtered one 2018-02-15 19:14:14 -08:00
Atlante45
b30f98d541 CR 2018-02-15 18:20:14 -08:00
Atlante45
697f0c443c Fix warning 2018-02-15 17:43:02 -08:00
Atlante45
2b85634a21 Fix build error 2018-02-15 17:03:55 -08:00
Atlante45
cae3e0a9dc Add status func to ContentSettingsBackupHandler 2018-02-15 17:00:24 -08:00
Atlante45
771e4cd9f4 Hook up status and progress 2018-02-15 16:48:21 -08:00
Atlante45
57410e4f1c Remove ES restart after restore 2018-02-15 16:48:21 -08:00
Atlante45
b76e1b9750 Add backup status getters 2018-02-15 16:48:21 -08:00
Atlante45
a7ca539899 Simplify BackupHandler pattern 2018-02-15 16:48:21 -08:00
Ryan Huffman
1120b12b8c Fix argument to isAvailable 2018-02-15 16:47:48 -08:00
Ryan Huffman
2942a53a1d Add recovery mode and full backup information to DS 2018-02-15 16:47:48 -08:00
Ryan Huffman
dd0b8a0c2f Add backup download API to DS 2018-02-15 16:47:23 -08:00
Ryan Huffman
9e99c5c744 Add restart of ES during backup recovery 2018-02-15 16:47:23 -08:00
Stephen Birarda
e71f2fa387 use QtHelpers macro for blocking invoke 2018-02-15 16:03:03 -08:00
Stephen Birarda
e06c95f586 make settings manager methods used for backup/restore thread safe 2018-02-15 15:55:13 -08:00
Stephen Birarda
f5cad5683d make sure backup handlers end up on the correct thread 2018-02-15 15:39:25 -08:00
Stephen Birarda
f624e1b464 add a content settings backup handler 2018-02-15 15:10:51 -08:00
Atlante45
3297e39c14 CR 2018-02-15 13:39:18 -08:00
Atlante45
d6e2814081 Write assets to disk when recovering full backup 2018-02-15 11:28:52 -08:00
Atlante45
9fca92facd Move EntitiesBackupHandler to its own file 2018-02-15 11:28:52 -08:00
Atlante45
d8d05fe045 Rename backup supervisor 2018-02-15 11:27:21 -08:00
Atlante45
4482f9c83c Queue all requests until the AS is fully setup 2018-02-15 11:27:21 -08:00
Atlante45
ce93b9a1f4 Simplify BackupHandler pattern 2018-02-15 11:27:20 -08:00
Ryan Huffman
efb2473fcf Updaet createManualBackup to defer response until creation is done 2018-02-15 11:02:55 -08:00
Sam Gondelman
36a74eaeee
Merge branch 'master' into decals 2018-02-15 11:02:49 -08:00
Ryan Huffman
df809f5a3e Cleanup logging for backup cleanup 2018-02-15 11:02:29 -08:00
Ryan Huffman
4b2e907ada Update entities recover backup to reset id and version 2018-02-15 11:02:14 -08:00
Ryan Huffman
1aba89b908 Fix style of init list 2018-02-15 10:22:35 -08:00
Ryan Huffman
b832e118cc Add 'override' to BackupHandler methods 2018-02-15 10:22:35 -08:00
Ryan Huffman
f2b6823748 Fix initializer in EntitiesBackupHandler 2018-02-15 10:22:35 -08:00
Ryan Huffman
b6240e8622 Move backup recover API to POST 2018-02-15 10:22:35 -08:00
Ryan Huffman
8a69c69bec CR 2018-02-15 10:22:35 -08:00
Ryan Huffman
80b03b9046 Make backup directory in content manager const 2018-02-15 10:22:35 -08:00
Ryan Huffman
dd398da2e0 Update DS to use promises for backup APIs 2018-02-15 10:22:35 -08:00
Ryan Huffman
8b07e7e28f Add backup DS APIs 
Add backup apis
 2018-02-15 10:22:35 -08:00
Ryan Huffman
e63b692d80 Add BackupHandler for entity file backups 2018-02-15 10:22:35 -08:00
Atlante45
69298246c4 CR 2018-02-15 10:09:21 -08:00
Atlante45
d4b4c55673 Remove unecessary debug 2018-02-15 10:09:21 -08:00
Atlante45
c41ad1a699 Add consolidate 2018-02-15 10:09:21 -08:00
Atlante45
a6447da64c More Asset Backup work 2018-02-15 10:09:21 -08:00
Atlante45
11b7fb89a9 Integrate new backup systems 2018-02-15 10:09:21 -08:00
Ryan Huffman
0bbbff95cd Fix replacement octree data not working 2018-02-15 10:09:21 -08:00
Ryan Huffman
2a667fcd60 Cleanup entity -> ds persist 2018-02-15 10:09:21 -08:00
Ryan Huffman
ff5be2d690 Fix entity data ID sometimes being reset 2018-02-15 10:09:20 -08:00
Ryan Huffman
fc8e7a0841 Add target_zlib to DS CMakeLists.txt 2018-02-15 10:09:20 -08:00
Ryan Huffman
cb9327e030 Add entity file sync and domain content backups 2018-02-15 10:09:20 -08:00
Sam Gondelman
15cdfef16a
Merge branch 'master' into decals 2018-02-14 17:33:01 -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
0ace92798d repair 2.1 settings migration code for avatar height 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
Atlante45
e15ab2ca6c CR 2018-02-12 13:32:48 -08:00
SamGondelman
5337377ef5 Merge remote-tracking branch 'upstream/master' into decals 2018-02-09 14:40:20 -08:00
SamGondelman
84cd0e1529 wip live material swapping on model entities, model overlays, avatars, 
and albedo swap on shape entities
 2018-02-09 12:00:08 -08:00
Atlante45
46449256ce CR 2018-02-09 11:38:46 -08:00
Atlante45
87f77b6257 Asset Server Backup 2018-02-09 11:32:42 -08:00
Stephen Birarda
7a21ae8d89 re-send a connection token packet if the current one is null 2018-02-02 15:25:43 -08:00
Stephen Birarda
98d581acd1 fix debug lines in DomainGatekeeper with extra parens 2018-02-02 13:47:48 -08:00
Atlante45
314c51ab3b Fix settings init in all exe 2018-01-26 15:53:08 -08:00
Thijs Wenker
1bfb62bd7f list assignment types in assignment-client help 2017-12-18 15:32:32 -08:00
Stephen Birarda
139976d8bb allow staging METAVERSE_SERVER_URL to be toggled by env 2017-12-12 16:22:08 -08:00
Anthony J. Thibault
fbcecbfc89 Merge branch 'master' into feature/domain-limited-height 2017-12-07 10:01:33 -08:00
Anthony J. Thibault
d1609fb964 domain-server warning fix 2017-11-28 17:48:34 -08:00
Stephen Birarda
e2082c0bcf apply machine fingerprint permissions if username absent 2017-11-27 19:02:40 -08:00
Stephen Birarda
8978254037 kick logged in by fingerprint/ip if enabled in DS settings 2017-11-27 18:23:14 -08:00
Atlante45
b398e235a2 Add tmpRezCertified to default perms 2017-11-22 13:40:44 -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