1900 commits

Author	SHA1	Message	Date
Atlante45	c106fee659	Merge branch 'master' of https://github.com/highfidelity/hifi into feat/backups-integration	2018-02-22 19:45:43 -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
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
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