Merge branch 'develop'

Author: snipe

app/Http/Controllers/Api/UsersController.php

@@ -53,7 +53,7 @@ public function index(Request $request)
             'users.activated',
             'users.avatar',
 
-        ])->with('manager', 'groups', 'location', 'company', 'department','throttle','assets','licenses','accessories','consumables')
+        ])->with('manager', 'groups', 'userloc', 'company', 'department','assets','licenses','accessories','consumables')
             ->withCount('assets','licenses','accessories','consumables');
         $users = Company::scopeCompanyables($users);
 
@@ -85,7 +85,7 @@ public function index(Request $request)
 
         $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
         $offset = request('offset', 0);
-        $limit = request('limit', 50);
+        $limit = request('limit',  20);
 
         switch ($request->input('sort')) {
             case 'manager':

app/Http/Middleware/ContentSecurityPolicyHeader.php

@@ -21,7 +21,7 @@ public function handle($request, Closure $next)
 
         $policy[] = "default-src 'self'";
         $policy[] = "style-src 'self' 'unsafe-inline' oss.maxcdn.com";
-        $policy[] = "script-src 'self' 'unsafe-inline' oss.mafxcdn.com cdnjs.cloudflare.com 'nonce-".csrf_token()."'";
+        $policy[] = "script-src 'self' 'unsafe-inline' oss.mafxcdn.com cdnjs.cloudflare.com'";
         $policy[] = "connect-src 'self'";
         $policy[] = "object-src 'none'";
         $policy[] = "font-src 'self' data:";

config/version.php

@@ -1,7 +1,7 @@
 <?php
 return array (
-  'app_version' => 'v4.1.0',
-  'build_version' => '37',
-  'hash_version' => 'g48207fc',
-  'full_hash' => 'v4.1.0-37-g48207fc',
+  'app_version' => 'v4.1.1',
+  'build_version' => '46',
+  'hash_version' => 'g28a4293',
+  'full_hash' => 'v4.1.1-46-g28a4293',
 );