merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #258 from bagisto/jitendra 

Jitendra
This commit is contained in:
JItendra Singh 2018-12-04 10:42:35 +05:30 committed by GitHub
parent a60ca52eb6 94a1cd9800
commit 657bf1265b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Admin/publishable/assets/css/admin.css vendored
View File

File diff suppressed because one or more lines are too long

2
packages/Webkul/Admin/publishable/assets/js/admin.js vendored
View File

File diff suppressed because one or more lines are too long

4
packages/Webkul/Admin/publishable/assets/mix-manifest.json
View File

@ -1,4 +1,4 @@
{
"/js/admin.js": "/js/admin.js?id=463fcd59d49e91caa65c",
"/css/admin.css": "/css/admin.css?id=affdaf4eec255546f6e6"
"/js/admin.js": "/js/admin.js?id=1d3c0ea423bffae501e9",
"/css/admin.css": "/css/admin.css?id=201f91bc553baa11139f"
}

24
packages/Webkul/Admin/src/Resources/assets/js/bootstrap.js vendored
View File

@ -1,15 +1,17 @@
window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
if (window.axios) {
window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
/**
* Next we will register the CSRF Token as a common header with Axios so that
* all outgoing HTTP requests automatically have it attached. This is just
* a simple convenience so we don't have to attach every token manually.
*/
/**
* Next we will register the CSRF Token as a common header with Axios so that
* all outgoing HTTP requests automatically have it attached. This is just
* a simple convenience so we don't have to attach every token manually.
*/
let token = document.head.querySelector('meta[name="csrf-token"]');
let token = document.head.querySelector('meta[name="csrf-token"]');
if (token) {
window.axios.defaults.headers.common['X-CSRF-TOKEN'] = token.content;
} else {
console.error('CSRF token not found: https://laravel.com/docs/csrf#csrf-x-csrf-token');
if (token) {
window.axios.defaults.headers.common['X-CSRF-TOKEN'] = token.content;
} else {
console.error('CSRF token not found: https://laravel.com/docs/csrf#csrf-x-csrf-token');
}
}

4
packages/Webkul/User/src/Http/Middleware/Bouncer.php
View File

@ -4,7 +4,11 @@ namespace Webkul\User\Http\Middleware;
use Closure;
use Illuminate\Support\Facades\Auth;
<<<<<<< HEAD
use Illuminate\Support\Facades\Route;
=======
use Route;
>>>>>>> a60ca52eb69bf055764c4f182e32adc54b39a2a3
class Bouncer
{