From 2faa67c68dd3d1cf9c814ce66283bc2da264a360 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 16 Feb 2018 17:01:46 -0800
Subject: [PATCH 1/2] make filename regex less restrictive

---
 domain-server/src/DomainServer.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index 9cecea5f70..0689bc5b5f 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -2250,7 +2250,7 @@ bool DomainServer::handleHTTPRequest(HTTPConnection* connection, const QUrl& url
                 // check the file extension to see what kind of file this is
                 // to make sure we handle this filetype for a content restore
                 auto dispositionValue = QString(firstFormData.first.value("Content-Disposition"));
-                auto formDataFilenameRegex = QRegExp("filename=\"(\\S+)\"");
+                auto formDataFilenameRegex = QRegExp("filename=\"(.+)\"");
                 auto matchIndex = formDataFilenameRegex.indexIn(dispositionValue);
 
                 QString uploadedFilename = "";

From 5dd74674ef106559857cb256e70e7507e085fcca Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 16 Feb 2018 17:18:28 -0800
Subject: [PATCH 2/2] fix spinner and restart behaviour for manual content
 upload

---
 domain-server/resources/web/content/js/content.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/domain-server/resources/web/content/js/content.js b/domain-server/resources/web/content/js/content.js
index 525b989259..4d8034eb1d 100644
--- a/domain-server/resources/web/content/js/content.js
+++ b/domain-server/resources/web/content/js/content.js
@@ -54,7 +54,7 @@ $(document).ready(function(){
         var fileFormData = new FormData();
         fileFormData.append('restore-file', files[0]);
 
-        showSpinnerAlert("Restoring Content");
+        showSpinnerAlert("Uploading content to restore");
 
         $.ajax({
           url: '/content/upload',
@@ -65,7 +65,6 @@ $(document).ready(function(){
           data: fileFormData
         }).done(function(data, textStatus, jqXHR) {
           swal.close();
-          showRestartModal();
         }).fail(function(jqXHR, textStatus, errorThrown) {
           showErrorMessage(
             "Error",