64669 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Ryan Huffman	6dffffbbc0	Update clang-format ctor initializer list format	2018-02-22 09:30:47 -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
Stephen Birarda	6e6f52236e	Merge pull request #12445 from birarda/feat/content-settings ... handle permissions save with no existing permissions	2018-02-21 14:55:37 -07:00
Stephen Birarda	4b25c9c419	handle permissions save with no existing permissions	2018-02-20 15:06:24 -08:00
Stephen Birarda	52a24f436c	Merge pull request #12442 from Atlante45/feat/backups-integration ... Update isCorrupted with name indexing	2018-02-20 15:25:08 -07:00
Atlante45	0c7f5250f3	Update isCorrupted with name indexing	2018-02-20 11:48:25 -08:00
Stephen Birarda	3401882dc7	Merge pull request #12441 from huffman/feat/corrupted-upload ... Add corrupted backup status to domain content backup info	2018-02-20 11:25:30 -07:00
Ryan Huffman	479dfaf330	Add corrupted backup status to domain content backup info	2018-02-20 10:18:12 -08:00
Stephen Birarda	769d5677b1	Merge branch 'master' of github.com:highfidelity/hifi into feat/content-settings	2018-02-16 17:41:14 -08:00
Stephen Birarda	93d9e962fb	Merge pull request #12433 from Atlante45/feat/backups-integration ... Fix filename not being passed in correctly	2018-02-16 18:39:19 -07: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	df236aaeb0	Merge pull request #12431 from Atlante45/feat/backups-integration ... Index backups by filename	2018-02-16 18:21:30 -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	42afdd6502	Merge pull request #12429 from birarda/feat/pending-content-archives ... availability and restore progress for content archives, move perm defaults, add settings manager thread safety	2018-02-16 17:39:16 -07: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
Clément Brisset	b05c576fc5	Merge pull request #12409 from birarda/feat/content-archives-tables ... Add content archive tables to DS content page	2018-02-16 15:56:16 -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
Stephen Birarda	97f7b71db2	Merge pull request #12427 from huffman/fix/http-connection-crash ... Fix rolling backups, delete backup, and recovery id	2018-02-16 16:34:40 -07: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