diff --git a/.htaccess b/.htaccess
index f2ad6f44..d3a7c5e4 100755
--- a/.htaccess
+++ b/.htaccess
@@ -3,6 +3,10 @@ Options -Indexes
RewriteEngine On
+# Handle Authorization Header
+RewriteCond %{HTTP:Authorization} ^(.*)
+RewriteRule .* - [e=HTTP_AUTHORIZATION:%1]
+
# Deny all these files/folders
RedirectMatch 403 ^/.git/.*?$
RedirectMatch 403 ^/.travis/.*?$
diff --git a/public/.htaccess b/public/.htaccess
index 8f894062..969eb19f 100755
--- a/public/.htaccess
+++ b/public/.htaccess
@@ -1,23 +1,6 @@
# Disable index view
Options -Indexes
-# Hide a specific file
-
- Order allow,deny
- Deny from all
-
-
-
- Order allow,deny
- Deny from all
-
-
-# Hide a specific file
-
- Order allow,deny
- Deny from all
-
-
Options -MultiViews
@@ -25,6 +8,9 @@ Options -Indexes
RewriteEngine On
+ RewriteCond %{HTTP:Authorization} ^(.*)
+ RewriteRule .* - [e=HTTP_AUTHORIZATION:%1]
+
# Redirect Trailing Slashes If Not A Folder...
RewriteCond %{REQUEST_FILENAME} !-d
RewriteRule ^(.*)/$ /$1 [L,R=301]
diff --git a/public/assets/admin/fonts/glyphicons-halflings-regular.woff2 b/public/assets/admin/fonts/glyphicons-halflings-regular.woff2
new file mode 100644
index 00000000..64539b54
Binary files /dev/null and b/public/assets/admin/fonts/glyphicons-halflings-regular.woff2 differ
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index a9c4de2f..9cdec124 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -3,6 +3,7 @@
"/assets/frontend/css/now-ui-kit.css": "/assets/frontend/css/now-ui-kit.css?id=58ec3dc768f07fee143a",
"/assets/system/js/jquery.js": "/assets/system/js/jquery.js?id=09dd64a64ba840c31a81",
"/assets/fonts/glyphicons-halflings-regular.woff2": "/assets/fonts/glyphicons-halflings-regular.woff2?id=b5b5055c6d812c0f9f0d",
+ "/assets/admin/fonts/glyphicons-halflings-regular.woff2": "/assets/admin/fonts/glyphicons-halflings-regular.woff2?id=b5b5055c6d812c0f9f0d",
"/assets/admin/css/vendor.min.css": "/assets/admin/css/vendor.min.css?id=b7f27b62f5cf3ebb7a65",
"/assets/admin/js/vendor.js": "/assets/admin/js/vendor.js?id=2831a0e25aded202c08c",
"/assets/admin/css/blue.png": "/assets/admin/css/blue.png?id=753a3c0dec86d3a38d9c",
diff --git a/resources/views/admin/subfleets/script.blade.php b/resources/views/admin/subfleets/script.blade.php
index d6d7166b..147a9e57 100644
--- a/resources/views/admin/subfleets/script.blade.php
+++ b/resources/views/admin/subfleets/script.blade.php
@@ -19,6 +19,7 @@ $(document).ready(function() {
$(document).on('submit', 'form.rm_fare', function(event) {
event.preventDefault();
+ console.log(event);
$.pjax.submit(event, '#aircraft_fares_wrapper', {push: false});
});
diff --git a/tests/TestCase.php b/tests/TestCase.php
index d1e8a504..21c559f5 100755
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -19,7 +19,7 @@ abstract class TestCase extends Illuminate\Foundation\Testing\TestCase
protected $connectionsToTransact = ['testing'];
protected static $auth_headers = [
- 'Authorization' => 'testadminapikey'
+ 'x-api-key' => 'testadminapikey'
];
public function apiHeaders()
diff --git a/webpack.mix.js b/webpack.mix.js
index 8194999c..69cff1b9 100644
--- a/webpack.mix.js
+++ b/webpack.mix.js
@@ -22,6 +22,7 @@ mix.webpackConfig({
mix.copy('node_modules/jquery/dist/jquery.js', 'public/assets/system/js/');
mix.copy('node_modules/bootstrap3/fonts/*.woff2', 'public/assets/fonts/');
+mix.copy('node_modules/bootstrap3/fonts/*.woff2', 'public/assets/admin/fonts/');
/**
* ADMIN REQUIRED FILES