Clément Brisset
b7ac07f590
Merge pull request #12589 from highfidelity/RC65
...
merge back RC65 to master after RC hotfixes
2018-03-07 17:22:41 -08:00
John Conklin II
e0a11271bf
Merge pull request #12573 from birarda/bug/domain-settings-metaverse
...
fix for getSetting QVariant ref in DomainServer
2018-03-07 12:11:45 -08:00
Stephen Birarda
a83b54e10d
fix for getSetting QVariant ref in DomainServer
2018-03-06 13:55:50 -08:00
Atlante45
a23884d0e0
Prevent crash during long backup web requests
2018-03-06 13:21:02 -08:00
Atlante45
85b4c3b422
Protect session UUID from concurrent read/writes
2018-03-02 17:34:18 -08:00
Stephen Birarda
9cc348ef27
Merge branch 'master' of github.com:highfidelity/hifi into feat/content-settings
2018-02-27 09:59:37 -08:00
Stephen Birarda
2af0e5fc2b
Merge pull request #12501 from huffman/feat/content-settings
...
Code review changes
2018-02-26 17:58:08 -07:00
Ryan Huffman
ec210e1750
Move OctreeUtils to OctreeDataUtils
2018-02-26 16:51:42 -08:00
Ryan Huffman
3fa538d42d
Add RawEntityData subclass
2018-02-26 16:32:09 -08:00
Stephen Birarda
f13412dd56
Merge pull request #12500 from birarda/feat/content-settings
...
fixes for comments from code reviews
2018-02-26 17:12:30 -07:00
Atlante45
8580d181ce
Change refresh threshold to 5 minutes.
2018-02-26 15:40:57 -08:00
Ryan Huffman
975bfa6809
Clean up std::chrono usage in DomainContentBackupManager
2018-02-26 15:39:33 -08:00
Ryan Huffman
f23f751e80
Add check to make sure entity data gets written to zip
2018-02-26 15:27:24 -08:00
Atlante45
3592fcf3c2
CR
2018-02-26 14:52:27 -08:00
Stephen Birarda
2872412f9c
fixes for comments from code reviews
2018-02-26 14:35:34 -08:00
Ryan Huffman
cd9cdea3e8
Update backup formats to filter out non-whitelisted characters
2018-02-26 14:29:13 -08:00
Ryan Huffman
dbfbee5406
CR
2018-02-26 13:53:20 -08:00
Stephen Birarda
4c44bcfdba
Merge pull request #12487 from Atlante45/feat/backups-integration
...
Actually remove Backup from list during delete
2018-02-22 20:22:43 -07:00
Atlante45
eeda07bba6
Actually remove Backup from list during delete
2018-02-22 19:19:39 -08:00
Stephen Birarda
32830cbcd3
Merge pull request #12486 from Atlante45/feat/backups-integration
...
Never delete assets on load
2018-02-22 19:49:19 -07:00
Clément Brisset
0e5e63bf03
Merge pull request #12481 from birarda/feat/content-settings
...
immediately show restore, set restore filename, cleanup old AS baked content on start
2018-02-22 18:41:13 -08:00
Atlante45
cbabca5e3e
Add loadingComplete callback
2018-02-22 18:36:36 -08:00
Atlante45
e5c501a4cd
Never delete assets on load
2018-02-22 18:36:22 -08:00
Atlante45
acf04830ee
Remove deleted file from the _assetsOnDisk set
2018-02-22 17:43:04 -08:00
Atlante45
277e556b48
Create a standard function to init Hifi Apps
2018-02-22 17:06:09 -08:00
Stephen Birarda
3e4375b1e6
set recovery filename during domain content archive recovery
2018-02-22 16:54:56 -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
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
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
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
946474c615
do not init caching for asset requests in domain-server
2018-02-21 16:33:58 -08:00
Atlante45
7582395686
Cleanup backup handlers timers on the correct thread
2018-02-21 14:53:04 -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
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
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
4c10dcba96
match previous behavior in DomainGatekeeper
2018-02-16 16:06:29 -08:00
Stephen Birarda
9057918e08
move default security permissions to describe-settings.json
2018-02-16 16:01:40 -08:00
