Compare commits
5 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
432606760b | ||
|
958dbc7092 | ||
|
12f33b6853 | ||
|
b67df24219 | ||
|
7ffcdb139a |
@@ -12,7 +12,7 @@
|
|||||||
"require": {
|
"require": {
|
||||||
"igaster/laravel-theme": "^2.0.15",
|
"igaster/laravel-theme": "^2.0.15",
|
||||||
"creativeorange/gravatar": "^1.0",
|
"creativeorange/gravatar": "^1.0",
|
||||||
"orchestra/asset": "^4.0"
|
"orchestra/asset": "^5.0"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
},
|
},
|
||||||
|
@@ -13,7 +13,7 @@
|
|||||||
<link rel="stylesheet" href="{{ asset('//use.fontawesome.com/releases/v5.13.0/css/v4-shims.css') }}">
|
<link rel="stylesheet" href="{{ asset('//use.fontawesome.com/releases/v5.13.0/css/v4-shims.css') }}">
|
||||||
|
|
||||||
<!-- Google Font: Source Sans Pro -->
|
<!-- Google Font: Source Sans Pro -->
|
||||||
<link href="https://fonts.googleapis.com/css2?family=IBM+Plex+Sans:wght@300&display=swap" rel="stylesheet">
|
<link href="https://fonts.googleapis.com/css2?family={{ str_replace(' ','+',config('app.font') ?: 'IBM Plex Sans') }}:wght@300&display=swap" rel="stylesheet">
|
||||||
|
|
||||||
@if(file_exists('css/social.css'))
|
@if(file_exists('css/social.css'))
|
||||||
<!-- Social Logins -->
|
<!-- Social Logins -->
|
||||||
|
@@ -101,8 +101,12 @@
|
|||||||
|
|
||||||
matcher: function () { return true; },
|
matcher: function () { return true; },
|
||||||
|
|
||||||
|
// Disable sorting and just return the items (items should by the ajax method)
|
||||||
|
sorter: function(items) {
|
||||||
|
return items;
|
||||||
|
},
|
||||||
|
|
||||||
updater: function (item) {
|
updater: function (item) {
|
||||||
console.log(item.value);
|
|
||||||
window.parent.location.href = item.value;
|
window.parent.location.href = item.value;
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
@@ -26,9 +26,6 @@ class AdminController extends Controller
|
|||||||
return ! Session::get('orig_user');
|
return ! Session::get('orig_user');
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @todo Change the background color (or something) so we know we are switched
|
|
||||||
*/
|
|
||||||
public function user_switch_start($id)
|
public function user_switch_start($id)
|
||||||
{
|
{
|
||||||
if ($this->switch_session() AND $this->switch_authorised($id))
|
if ($this->switch_session() AND $this->switch_authorised($id))
|
||||||
|
Reference in New Issue
Block a user