From c33c57c6961cd0c2b6a3409d070abf10cc91aa47 Mon Sep 17 00:00:00 2001 From: William Welling Date: Tue, 27 Nov 2018 16:46:40 -0600 Subject: [PATCH 1/4] fix forever subpath --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index ab365dfc..31c9671f 100644 --- a/package.json +++ b/package.json @@ -16,8 +16,8 @@ "preprotractor": "npm run update-webdriver", "protractor": "protractor e2e-tests/protractor.conf.js", "stop": "wvr server --stop", - "start": "wvr server -b /magpie --prod --uid magpie-webserver", - "start-dev": "wvr server -b /magpie --uid magpie-webserver" + "start": "wvr server -b /metadatatool --prod --uid magpie-webserver", + "start-dev": "wvr server -b /metadatatool --uid magpie-webserver" }, "dependencies": { "ng-csv": "0.3.6", From df54d23382a35575f466aa0e81f238b20a175db6 Mon Sep 17 00:00:00 2001 From: William Welling Date: Wed, 28 Nov 2018 14:19:56 -0600 Subject: [PATCH 2/4] Update package.json --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 31c9671f..ab365dfc 100644 --- a/package.json +++ b/package.json @@ -16,8 +16,8 @@ "preprotractor": "npm run update-webdriver", "protractor": "protractor e2e-tests/protractor.conf.js", "stop": "wvr server --stop", - "start": "wvr server -b /metadatatool --prod --uid magpie-webserver", - "start-dev": "wvr server -b /metadatatool --uid magpie-webserver" + "start": "wvr server -b /magpie --prod --uid magpie-webserver", + "start-dev": "wvr server -b /magpie --uid magpie-webserver" }, "dependencies": { "ng-csv": "0.3.6", From 31695c8cec36eab449b0935c5051a969df81fcc8 Mon Sep 17 00:00:00 2001 From: William Welling Date: Wed, 28 Nov 2018 14:20:26 -0600 Subject: [PATCH 3/4] Update index.html --- app/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/index.html b/app/index.html index 78be95de..ed467208 100644 --- a/app/index.html +++ b/app/index.html @@ -7,7 +7,7 @@ - + From 0d0a13c85fb8b7508a9fc89c8c90daf13ab4d471 Mon Sep 17 00:00:00 2001 From: William Welling Date: Wed, 28 Nov 2018 14:20:54 -0600 Subject: [PATCH 4/4] Update .htaccess --- app/.htaccess | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/.htaccess b/app/.htaccess index 7dd2721a..2740c52d 100644 --- a/app/.htaccess +++ b/app/.htaccess @@ -1,7 +1,7 @@ - RewriteEngine On - RewriteBase /metadatatool/ + RewriteEngine On + RewriteBase /magpie/ RewriteCond %{HTTP:X-Requested-With} !XMLHttpRequest$ RewriteCond %{REQUEST_FILENAME} !-f RewriteRule . index.html [L] - \ No newline at end of file +