Bumped point release

* Possible fix for #6710 - explicitly make auto_increment_prefix nullable

* Added migration to make auto_increment_prefix explicitly nullable

.env.example

@@ -72,13 +72,20 @@ ENABLE_CSP=false
 CACHE_DRIVER=file
 SESSION_DRIVER=file
 QUEUE_DRIVER=sync
+CACHE_PREFIX=snipeit
 
 # --------------------------------------------
 # OPTIONAL: REDIS SETTINGS
 # --------------------------------------------
 REDIS_HOST=null
 REDIS_PASSWORD=null
-REDIS_PORT-null
+REDIS_PORT=null
+
+# --------------------------------------------
+# OPTIONAL: MEMCACHED SETTINGS
+# --------------------------------------------
+MEMCACHED_HOST=null
+MEMCACHED_PORT=null
 
 # --------------------------------------------
 # OPTIONAL: AWS S3 SETTINGS

.gitignore

@@ -50,3 +50,4 @@ tests/_support/_generated/*
 /storage/oauth-public.key
 
 *.cache
+/public/storage

.travis.yml

@@ -16,8 +16,13 @@ services:
 php:
   - 5.6
   - 7.0
-  - 7.2 
-  - 7.1.4
+  - 7.1
+  - 7.2
+  - 7.3
+
+matrix:
+  allow_failures:
+    - php: 7.3
 
 # execute any number of scripts before the test run, custom env's are available as variables
 before_script:

README.md

@@ -10,7 +10,7 @@ It is built on [Laravel 5.4](http://laravel.com).
 
 Snipe-IT is actively developed and we're [releasing quite frequently](https://github.com/snipe/snipe-it/releases). ([Check out the live demo here](https://snipeitapp.com/demo/).)
 
-__This is web-based software__. This means there there is no executable file (aka no .exe files), and it must be run on a web server and accessed through a web browser. It runs on any Mac OSX, flavor of Linux, as well as Windows, and we have a [Docker image](https://snipe-it.readme.io/docs/docker) available if that's what you're into.
+__This is web-based software__. This means there is no executable file (aka no .exe files), and it must be run on a web server and accessed through a web browser. It runs on any Mac OSX, flavor of Linux, as well as Windows, and we have a [Docker image](https://snipe-it.readme.io/docs/docker) available if that's what you're into.
 
 -----
 

app/Console/Commands/ObjectImportCommand.php

@@ -74,6 +74,7 @@ class ObjectImportCommand extends Command
         $importer->setCallbacks([$this, 'log'], [$this, 'progress'], [$this, 'errorCallback'])
                  ->setUserId($this->option('user_id'))
                  ->setUpdating($this->option('update'))
+                 ->setShouldNotify($this->option('send-welcome'))
                  ->setUsernameFormat($this->option('username_format'));
 
         $logFile = $this->option('logfile');
@@ -172,6 +173,7 @@ class ObjectImportCommand extends Command
         array('web-importer', null, InputOption::VALUE_NONE, 'Internal: packages output for use with the web importer'),
         array('user_id', null, InputOption::VALUE_REQUIRED, 'ID of user creating items', 1),
         array('update', null, InputOption::VALUE_NONE, 'If a matching item is found, update item information'),
+        array('send-welcome', null, InputOption::VALUE_NONE, 'Whether to send a welcome email to any new users that are created.'),
         );
 
     }

app/Console/Commands/ResetDemoSettings.php

@@ -63,6 +63,8 @@ class ResetDemoSettings extends Command
         $settings->time_display_format = 'g:iA';
         $settings->thumbnail_max_h = '30';
         $settings->locale = 'en';
+        $settings->version_footer = 'on';
+        $settings->support_footer = 'on';
         $settings->save();
 
         if ($user = User::where('username', '=', 'admin')->first()) {

app/Console/Commands/SendExpirationAlerts.php

@@ -62,6 +62,7 @@ class SendExpirationAlerts extends Command
             if ($assets->count() > 0) {
                 $this->info(trans_choice('mail.assets_warrantee_alert', $assets->count(),
                     ['count' => $assets->count(), 'threshold' => $threshold]));
+                \Notification::send($recipients, new ExpiringAssetsNotification($assets, $threshold));
             }
 
             // Expiring licenses

app/Http/Controllers/Api/AccessoriesController.php

@@ -46,7 +46,7 @@ class AccessoriesController extends Controller
             $accessories->where('supplier_id','=',$request->input('supplier_id'));
         }
 
-        $offset = $request->input('offset', 0);
+        $offset = (($accessories) && (request('offset') > $accessories->count())) ? 0 : request('offset', 0);
         $limit = $request->input('limit', 50);
         $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
         $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at';

app/Http/Controllers/Api/AssetMaintenancesController.php

@@ -44,7 +44,7 @@ class AssetMaintenancesController extends Controller
             $maintenances->where('asset_id', '=', $request->input('asset_id'));
         }
 
-        $offset = request('offset', 0);
+        $offset = (($maintenances) && (request('offset') > $maintenances->count())) ? 0 : request('offset', 0);
         $limit = request('limit', 50);
 
         $allowed_columns = [

app/Http/Controllers/Api/AssetModelsController.php

@@ -60,7 +60,7 @@ class AssetModelsController extends Controller
             $assetmodels->TextSearch($request->input('search'));
         }
 
-        $offset = $request->input('offset', 0);
+        $offset = (($assetmodels) && (request('offset') > $assetmodels->count())) ? 0 : request('offset', 0);
         $limit = $request->input('limit', 50);
         $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
         $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'models.created_at';

app/Http/Controllers/Api/AssetsController.php

@@ -95,7 +95,7 @@ class AssetsController extends Controller
 
         $assets = Company::scopeCompanyables(Asset::select('assets.*'),"company_id","assets")
             ->with('location', 'assetstatus', 'assetlog', 'company', 'defaultLoc','assignedTo',
-            'model.category', 'model.manufacturer', 'model.fieldset','supplier');
+                'model.category', 'model.manufacturer', 'model.fieldset','supplier');
 
 
         // These are used by the API to query against specific ID numbers.
@@ -127,7 +127,7 @@ class AssetsController extends Controller
 
         if (($request->has('assigned_to')) && ($request->has('assigned_type'))) {
             $assets->where('assets.assigned_to', '=', $request->input('assigned_to'))
-                    ->where('assets.assigned_type', '=', $request->input('assigned_type'));
+                ->where('assets.assigned_type', '=', $request->input('assigned_type'));
         }
 
         if ($request->has('company_id')) {
@@ -144,7 +144,7 @@ class AssetsController extends Controller
 
         $request->has('order_number') ? $assets = $assets->where('assets.order_number', '=', e($request->get('order_number'))) : '';
 
-        $offset = request('offset', 0);
+        $offset = (($assets) && (request('offset') > $assets->count())) ? 0 : request('offset', 0);
         $limit = $request->input('limit', 50);
         $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
 
@@ -167,12 +167,12 @@ class AssetsController extends Controller
                 break;
             case 'RTD':
                 $assets->whereNull('assets.assigned_to')
-                ->join('status_labels AS status_alias',function ($join) {
-                    $join->on('status_alias.id', "=", "assets.status_id")
-                        ->where('status_alias.deployable','=',1)
-                        ->where('status_alias.pending','=',0)
-                        ->where('status_alias.archived', '=', 0);
-                });
+                    ->join('status_labels AS status_alias',function ($join) {
+                        $join->on('status_alias.id', "=", "assets.status_id")
+                            ->where('status_alias.deployable','=',1)
+                            ->where('status_alias.pending','=',0)
+                            ->where('status_alias.archived', '=', 0);
+                    });
                 break;
             case 'Undeployable':
                 $assets->Undeployable();
@@ -188,11 +188,11 @@ class AssetsController extends Controller
             case 'Requestable':
                 $assets->where('assets.requestable', '=', 1)
                     ->join('status_labels AS status_alias',function ($join) {
-                    $join->on('status_alias.id', "=", "assets.status_id")
-                        ->where('status_alias.deployable','=',1)
-                        ->where('status_alias.pending','=',0)
-                        ->where('status_alias.archived', '=', 0);
-                });
+                        $join->on('status_alias.id', "=", "assets.status_id")
+                            ->where('status_alias.deployable','=',1)
+                            ->where('status_alias.pending','=',0)
+                            ->where('status_alias.archived', '=', 0);
+                    });
 
                 break;
             case 'Deployed':
@@ -207,8 +207,8 @@ class AssetsController extends Controller
                         $join->on('status_alias.id', "=", "assets.status_id")
                             ->where('status_alias.archived', '=', 0);
                     });
-                    
-                // If there is a status ID, don't take show_archived_in_list into consideration
+
+                    // If there is a status ID, don't take show_archived_in_list into consideration
                 } else {
                     $assets->join('status_labels AS status_alias',function ($join) {
                         $join->on('status_alias.id', "=", "assets.status_id");
@@ -233,8 +233,8 @@ class AssetsController extends Controller
         // This handles all of the pivot sorting (versus the assets.* fields
         // in the allowed_columns array)
         $column_sort = in_array($sort_override, $allowed_columns) ? $sort_override : 'assets.created_at';
-        
-        
+
+
         switch ($sort_override) {
             case 'model':
                 $assets->OrderModels($order);
@@ -291,7 +291,7 @@ class AssetsController extends Controller
             $this->authorize('view', $asset);
             return (new AssetsTransformer)->transformAsset($asset);
         }
-        return response()->json(Helper::formatStandardApiResponse('error', null, 'Asset not found'), 404);
+        return response()->json(Helper::formatStandardApiResponse('error', null, 'Asset not found'), 200);
 
     }
 
@@ -305,17 +305,18 @@ class AssetsController extends Controller
      */
     public function showBySerial($serial)
     {
+        $this->authorize('index', Asset::class);
         if ($assets = Asset::with('assetstatus')->with('assignedTo')
             ->withTrashed()->where('serial',$serial)->get()) {
-                $this->authorize('view', $assets);
-                return (new AssetsTransformer)->transformAssets($assets, $assets->count());
+
+            return (new AssetsTransformer)->transformAssets($assets, $assets->count());
         }
-        return response()->json(Helper::formatStandardApiResponse('error', null, 'Asset not found'), 404);
+        return response()->json(Helper::formatStandardApiResponse('error', null, 'Asset not found'), 200);
 
     }
 
 
-     /**
+    /**
      * Returns JSON with information about an asset for detail view.
      *
      * @author [A. Gianotto] [<snipe@snipe.net>]
@@ -353,7 +354,7 @@ class AssetsController extends Controller
             'assets.assigned_to',
             'assets.assigned_type',
             'assets.status_id'
-            ])->with('model', 'assetstatus', 'assignedTo')->NotArchived());
+        ])->with('model', 'assetstatus', 'assignedTo')->NotArchived(),'company_id', 'assets');
 
         if ($request->has('assetStatusType') && $request->input('assetStatusType') === 'RTD') {
             $assets = $assets->RTD();
@@ -378,7 +379,7 @@ class AssetsController extends Controller
                 $asset->use_text .= ' → '.$asset->assigned->getFullNameAttribute();
             }
 
-            
+
             if ($asset->assetstatus->getStatuslabelType()=='pending') {
                 $asset->use_text .=  '('.$asset->assetstatus->getStatuslabelType().')';
             }
@@ -468,43 +469,15 @@ class AssetsController extends Controller
         $this->authorize('update', Asset::class);
 
         if ($asset = Asset::find($id)) {
-            ($request->has('model_id')) ?
-                $asset->model()->associate(AssetModel::find($request->get('model_id'))) : '';
-            ($request->has('name')) ?
-                $asset->name = $request->get('name') : '';
-            ($request->has('serial')) ?
-                $asset->serial = $request->get('serial') : '';
-            ($request->has('model_id')) ?
-                $asset->model_id = $request->get('model_id') : '';
-            ($request->has('order_number')) ?
-                $asset->order_number = $request->get('order_number') : '';
-            ($request->has('notes')) ?
-                $asset->notes = $request->get('notes') : '';
-            ($request->has('asset_tag')) ?
-                $asset->asset_tag = $request->get('asset_tag') : '';
-            ($request->has('archived')) ?
-                $asset->archived = $request->get('archived') : '';
-            ($request->has('status_id')) ?
-                $asset->status_id = $request->get('status_id') : '';
-            ($request->has('warranty_months')) ?
-                $asset->warranty_months = $request->get('warranty_months') : '';
-            ($request->has('purchase_cost')) ?
-                $asset->purchase_cost = Helper::ParseFloat($request->get('purchase_cost')) : '';
-            ($request->has('purchase_date')) ?
-                $asset->purchase_date = $request->get('purchase_date') : '';
-            ($request->has('assigned_to')) ?
-                $asset->assigned_to = $request->get('assigned_to') : '';
-            ($request->has('supplier_id')) ?
-                $asset->supplier_id = $request->get('supplier_id') : '';
-            ($request->has('requestable')) ?
-                $asset->requestable = $request->get('requestable') : '';
-            ($request->has('rtd_location_id')) ?
-                $asset->rtd_location_id = $request->get('rtd_location_id') : '';
-            ($request->has('rtd_location_id')) ?
-                $asset->location_id = $request->get('rtd_location_id') : '';
-            ($request->has('company_id')) ?
-                $asset->company_id = Company::getIdForCurrentUser($request->get('company_id')) : '';
 
+            $asset->fill($request->all());
+
+            ($request->has('model_id')) ?
+                $asset->model()->associate(AssetModel::find($request->get('model_id'))) : null;
+            ($request->has('company_id')) ?
+                $asset->company_id = Company::getIdForCurrentUser($request->get('company_id')) : null;
+            ($request->has('rtd_location_id')) ?
+                $asset->location_id = $request->get('rtd_location_id') : null;
 
             // Update custom fields
             if (($model = AssetModel::find($asset->model_id)) && (isset($model->fieldset))) {
@@ -519,9 +492,9 @@ class AssetsController extends Controller
             if ($asset->save()) {
 
                 if (($request->has('assigned_user')) && ($target = User::find($request->get('assigned_user')))) {
-                        $location = $target->location_id;
+                    $location = $target->location_id;
                 } elseif (($request->has('assigned_asset')) && ($target = Asset::find($request->get('assigned_asset')))) {
-                            $location = $target->location_id;
+                    $location = $target->location_id;
                 } elseif (($request->has('assigned_location')) && ($target = Location::find($request->get('assigned_location')))) {
                     $location = $target->id;
                 }
@@ -631,7 +604,7 @@ class AssetsController extends Controller
         $expected_checkin = request('expected_checkin', null);
         $note = request('note', null);
         $asset_name = request('name', null);
-        
+
         // Set the location ID to the RTD location id if there is one
         if ($asset->rtd_location_id!='') {
             $asset->location_id = $target->rtd_location_id;
@@ -639,7 +612,7 @@ class AssetsController extends Controller
 
 
 
-        
+
 
         if ($asset->checkOut($target, Auth::user(), $checkout_at, $expected_checkin, $note, $asset_name, $asset->location_id)) {
             return response()->json(Helper::formatStandardApiResponse('success', ['asset'=> e($asset->asset_tag)], trans('admin/hardware/message.checkout.success')));

app/Http/Controllers/Api/CategoriesController.php

@@ -30,7 +30,7 @@ class CategoriesController extends Controller
             $categories = $categories->TextSearch($request->input('search'));
         }
 
-        $offset = $request->input('offset', 0);
+        $offset = (($categories) && (request('offset') > $categories->count())) ? 0 : request('offset', 0);
         $limit = $request->input('limit', 50);
         $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
         $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'assets_count';

app/Http/Controllers/Api/CompaniesController.php

@@ -41,7 +41,7 @@ class CompaniesController extends Controller
             $companies->TextSearch($request->input('search'));
         }
 
-        $offset = $request->input('offset', 0);
+        $offset = (($companies) && (request('offset') > $companies->count())) ? 0 : request('offset', 0);
         $limit = $request->input('limit', 50);
         $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
         $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at';

app/Http/Controllers/Api/ComponentsController.php

@@ -43,7 +43,7 @@ class ComponentsController extends Controller
             $components->where('location_id','=',$request->input('location_id'));
         }
 
-        $offset = request('offset', 0);
+        $offset = (($components) && (request('offset') > $components->count())) ? 0 : request('offset', 0);
         $limit = request('limit', 50);
 
         $allowed_columns = ['id','name','min_amt','order_number','serial','purchase_date','purchase_cost','company','category','qty','location','image'];

app/Http/Controllers/Api/ConsumablesController.php

@@ -35,12 +35,16 @@ class ConsumablesController extends Controller
             $consumables->where('company_id','=',$request->input('company_id'));
         }
 
+        if ($request->has('category_id')) {
+            $consumables->where('category_id','=',$request->input('category_id'));
+        }
+
         if ($request->has('manufacturer_id')) {
             $consumables->where('manufacturer_id','=',$request->input('manufacturer_id'));
         }
 
 
-        $offset = request('offset', 0);
+        $offset = (($consumables) && (request('offset') > $consumables->count())) ? 0 : request('offset', 0);
         $limit = request('limit', 50);
         $allowed_columns = ['id','name','order_number','min_amt','purchase_date','purchase_cost','company','category','model_number', 'item_no', 'manufacturer','location','qty','image'];
         $order = $request->input('order') === 'asc' ? 'asc' : 'desc';

app/Http/Controllers/Api/DepartmentsController.php

@@ -39,7 +39,7 @@ class DepartmentsController extends Controller
             $departments = $departments->TextSearch($request->input('search'));
         }
 
-        $offset = $request->input('offset', 0);
+        $offset = (($departments) && (request('offset') > $departments->count())) ? 0 : request('offset', 0);
         $limit = $request->input('limit', 50);
         $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
         $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at';

app/Http/Controllers/Api/DepreciationsController.php

@@ -28,7 +28,7 @@ class DepreciationsController extends Controller
             $depreciations = $depreciations->TextSearch($request->input('search'));
         }
 
-        $offset = $request->input('offset', 0);
+        $offset = (($depreciations) && (request('offset') > $depreciations->count())) ? 0 : request('offset', 0);
         $limit = $request->input('limit', 50);
         $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
         $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at';

app/Http/Controllers/Api/GroupsController.php

@@ -28,7 +28,7 @@ class GroupsController extends Controller
             $groups = $groups->TextSearch($request->input('search'));
         }
 
-        $offset = $request->input('offset', 0);
+        $offset = (($groups) && (request('offset') > $groups->count())) ? 0 : request('offset', 0);
         $limit = $request->input('limit', 50);
         $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
         $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at';

app/Http/Controllers/Api/LicensesController.php

@@ -82,7 +82,7 @@ class LicensesController extends Controller
         }
 
 
-        $offset = request('offset', 0);
+        $offset = (($licenses) && (request('offset') > $licenses->count())) ? 0 : request('offset', 0);
         $limit = request('limit', 50);
         $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
 

app/Http/Controllers/Api/LocationsController.php

@@ -51,7 +51,7 @@ class LocationsController extends Controller
 
 
 
-        $offset = $request->input('offset', 0);
+        $offset = (($locations) && (request('offset') > $locations->count())) ? 0 : request('offset', 0);
         $limit = $request->input('limit', 50);
         $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
         $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at';

app/Http/Controllers/Api/ManufacturersController.php

@@ -39,7 +39,7 @@ class ManufacturersController extends Controller
 
 
 
-        $offset = request('offset', 0);
+        $offset = (($manufacturers) && (request('offset') > $manufacturers->count())) ? 0 : request('offset', 0);
         $limit = $request->input('limit', 50);
         $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
         $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at';

app/Http/Controllers/Api/StatuslabelsController.php

@@ -30,7 +30,7 @@ class StatuslabelsController extends Controller
             $statuslabels = $statuslabels->TextSearch($request->input('search'));
         }
 
-        $offset = $request->input('offset', 0);
+        $offset = (($statuslabels) && (request('offset') > $statuslabels->count())) ? 0 : request('offset', 0);
         $limit = $request->input('limit', 50);
         $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
         $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at';
@@ -238,8 +238,7 @@ class StatuslabelsController extends Controller
      */
     public function checkIfDeployable($id) {
         $statuslabel = Statuslabel::findOrFail($id);
-
-        $this->authorize('view', $statuslabel);
+        $this->authorize('view', Asset::class);
 
         if ($statuslabel->getStatuslabelType()=='deployable') {
             return '1';

app/Http/Controllers/Api/SuppliersController.php

@@ -33,7 +33,7 @@ class SuppliersController extends Controller
             $suppliers = $suppliers->TextSearch($request->input('search'));
         }
 
-        $offset = request('offset', 0);
+        $offset = (($suppliers) && (request('offset') > $suppliers->count())) ? 0 : request('offset', 0);
         $limit = $request->input('limit', 50);
         $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
         $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at';

app/Http/Controllers/Api/UsersController.php

@@ -85,7 +85,7 @@ class UsersController extends Controller
         }
 
         $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
-        $offset = request('offset', 0);
+        $offset = (($users) && (request('offset') > $users->count())) ? 0 : request('offset', 0);
         $limit = request('limit',  20);
 
         switch ($request->input('sort')) {

app/Http/Controllers/AssetMaintenancesController.php

@@ -162,6 +162,9 @@ class AssetMaintenancesController extends Controller
             // Redirect to the improvement management page
             return redirect()->route('maintenances.index')
                            ->with('error', trans('admin/asset_maintenances/message.not_found'));
+        } elseif (!$assetMaintenance->asset) {
+            return redirect()->route('maintenances.index')
+                ->with('error', 'The asset associated with this maintenance does not exist.');
         } elseif (!Company::isCurrentUserHasAccess($assetMaintenance->asset)) {
             return static::getInsufficientPermissionsRedirect();
         }

app/Http/Controllers/AssetsController.php

@@ -143,7 +143,7 @@ class AssetsController extends Controller
         }
 
         // Create the image (if one was chosen.)
-        if ($request->hasFile('image')) {
+        if ($request->has('image')) {
             $image = $request->input('image');
 
             // After modification, the image is prefixed by mime info like the following:

app/Http/Controllers/Auth/LoginController.php

@@ -80,7 +80,7 @@ class LoginController extends Controller
                 Log::debug("Remote user auth lookup complete");
                 if(!is_null($user)) Auth::login($user, true);
             } catch(Exception $e) {
-                Log::error("There was an error authenticating the Remote user: " . $e->getMessage());
+                Log::debug("There was an error authenticating the Remote user: " . $e->getMessage());
             }
         }
     }
@@ -169,7 +169,7 @@ class LoginController extends Controller
             // If the user was unable to login via LDAP, log the error and let them fall through to
             // local authentication.
             } catch (\Exception $e) {
-                Log::error("There was an error authenticating the LDAP user: ".$e->getMessage());
+                Log::debug("There was an error authenticating the LDAP user: ".$e->getMessage());
             }
         }
 

app/Http/Controllers/CompaniesController.php

@@ -31,7 +31,7 @@ final class CompaniesController extends Controller
     {
         $this->authorize('view', Company::class);
 
-        return view('companies/index')->with('companies', Company::all());
+        return view('companies/index');
     }
 
     /**

app/Http/Controllers/DepreciationsController.php

@@ -34,7 +34,7 @@ class DepreciationsController extends Controller
         $this->authorize('view', Depreciation::class);
 
         // Show the page
-        return view('depreciations/index', compact('depreciations'));
+        return view('depreciations/index');
     }
 
 

app/Http/Controllers/GroupsController.php

@@ -31,7 +31,7 @@ class GroupsController extends Controller
     public function index()
     {
         // Show the page
-        return view('groups/index', compact('groups'));
+        return view('groups/index');
     }
 
     /**
@@ -72,7 +72,7 @@ class GroupsController extends Controller
         if ($group->save()) {
             return redirect()->route("groups.index")->with('success', trans('admin/groups/message.success.create'));
         }
-        return redirect(route('groups.create'))->withInput()->withErrors($group->getErrors());
+        return redirect()->back()->withInput()->withErrors($group->getErrors());
     }
 
     /**
@@ -111,7 +111,7 @@ class GroupsController extends Controller
     {
         $permissions = config('permissions');
         if (!$group = Group::find($id)) {
-            return redirect()->route('groups')->with('error', trans('admin/groups/message.group_not_found', compact('id')));
+            return redirect()->route('groups.index')->with('error', trans('admin/groups/message.group_not_found', compact('id')));
         }
         $group->name = e(Input::get('name'));
         $group->permissions = json_encode(Input::get('permission'));
@@ -138,7 +138,7 @@ class GroupsController extends Controller
     {
         if (!config('app.lock_passwords')) {
             if (!$group = Group::find($id)) {
-                return redirect()->route('groups')->with('error', trans('admin/groups/message.group_not_found', compact('id')));
+                return redirect()->route('groups.index')->with('error', trans('admin/groups/message.group_not_found', compact('id')));
             }
             $group->delete();
             // Redirect to the group management page

app/Http/Controllers/LocationsController.php

@@ -44,7 +44,7 @@ class LocationsController extends Controller
         $locations = Location::orderBy('created_at', 'DESC')->with('parent', 'assets', 'assignedassets')->get();
 
         // Show the page
-        return view('locations/index', compact('locations'));
+        return view('locations/index');
     }
 
 

app/Http/Controllers/ManufacturersController.php

@@ -36,7 +36,7 @@ class ManufacturersController extends Controller
     public function index()
     {
         $this->authorize('index', Manufacturer::class);
-        return view('manufacturers/index', compact('manufacturers'));
+        return view('manufacturers/index');
     }
 
 

app/Http/Controllers/ProfileController.php

@@ -125,8 +125,7 @@ class ProfileController extends Controller
 
         $rules = array(
             'current_password'     => 'required',
-            'password'         => Setting::passwordComplexityRulesSaving('store'),
-            'password_confirm' => 'required|same:password',
+            'password'         => Setting::passwordComplexityRulesSaving('store').'|confirmed',
         );
 
         $validator = \Validator::make($request->all(), $rules);

app/Http/Controllers/ReportsController.php

@@ -603,8 +603,8 @@ class ReportsController extends Controller
 
 
                     if ($request->has('assigned_to')) {
-                        $row[] = ($asset->checkedOutToUser() && $asset->assigned) ? e($asset->assigned->getFullNameAttribute()) : ($asset->assigned ? e($asset->assigned->display_name) : '');
-                        $row[] = ($asset->checkedOutToUser() && $asset->assigned) ? 'user' : e($asset->assignedType());
+                        $row[] = ($asset->checkedOutToUser() && $asset->assigned) ? $asset->assigned->getFullNameAttribute() : ($asset->assigned ? $asset->assigned->display_name : '');
+                        $row[] = ($asset->checkedOutToUser() && $asset->assigned) ? 'user' : $asset->assignedType();
                     }
 
                     if ($request->has('username')) {

app/Http/Controllers/SettingsController.php

@@ -482,13 +482,12 @@ class SettingsController extends Controller
                 $setting->two_factor_enabled = null;
             } else {
                 $setting->two_factor_enabled = $request->input('two_factor_enabled');
-
-                # remote user login
-                $setting->login_remote_user_enabled = (int)$request->input('login_remote_user_enabled');
-                $setting->login_common_disabled= (int)$request->input('login_common_disabled');
-                $setting->login_remote_user_custom_logout_url = $request->input('login_remote_user_custom_logout_url');
             }
 
+            # remote user login
+            $setting->login_remote_user_enabled = (int)$request->input('login_remote_user_enabled');
+            $setting->login_common_disabled = (int)$request->input('login_common_disabled');
+            $setting->login_remote_user_custom_logout_url = $request->input('login_remote_user_custom_logout_url');
         }
 
         $setting->pwd_secure_uncommon = (int) $request->input('pwd_secure_uncommon');

app/Http/Controllers/StatuslabelsController.php

@@ -33,7 +33,7 @@ class StatuslabelsController extends Controller
     public function index()
     {
         $this->authorize('view', Statuslabel::class);
-        return view('statuslabels.index', compact('statuslabels'));
+        return view('statuslabels.index');
     }
 
     public function show($id)

app/Http/Controllers/SuppliersController.php

@@ -34,10 +34,9 @@ class SuppliersController extends Controller
     {
         // Grab all the suppliers
         $this->authorize('view', Supplier::class);
-        $suppliers = Supplier::orderBy('created_at', 'DESC')->get();
 
         // Show the page
-        return view('suppliers/index', compact('suppliers'));
+        return view('suppliers/index');
     }
 
 

app/Http/Controllers/UsersController.php

@@ -259,9 +259,7 @@ class UsersController extends Controller
 
         // Only save groups if the user is a super user
         if (Auth::user()->isSuperUser()) {
-            if ($request->has('groups')) {
-                $user->groups()->sync($request->input('groups'));
-            }
+            $user->groups()->sync($request->input('groups'));
         }
 
 
@@ -984,7 +982,7 @@ class UsersController extends Controller
      */
     public function printInventory($id)
     {
-
+        $this->authorize('view', User::class);
         $show_user = User::where('id',$id)->withTrashed()->first();
         $assets = Asset::where('assigned_to', $id)->where('assigned_type', User::class)->with('model', 'model.category')->get();
         $licenses = $show_user->licenses()->get();

app/Http/Controllers/ViewAssetsController.php

@@ -73,7 +73,7 @@ class ViewAssetsController extends Controller
         $assets = Asset::with('model', 'defaultLoc', 'location', 'assignedTo', 'requests')->Hardware()->RequestableAssets()->get();
         $models = AssetModel::with('category', 'requests', 'assets')->RequestableModels()->get();
 
-        return view('account/requestable-assets', compact('user', 'assets', 'models'));
+        return view('account/requestable-assets', compact('assets', 'models'));
     }
 
 

app/Http/Kernel.php

@@ -25,7 +25,7 @@ class Kernel extends HttpKernel
         \Fideloper\Proxy\TrustProxies::class,
         \App\Http\Middleware\CheckForSetup::class,
         \App\Http\Middleware\CheckForDebug::class,
-       // \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
+        \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
     ];
 
     /**

app/Http/Requests/ItemImportRequest.php

@@ -50,6 +50,7 @@ class ItemImportRequest extends FormRequest
         $importer->setCallbacks([$this, 'log'], [$this, 'progress'], [$this, 'errorCallback'])
                  ->setUserId(Auth::id())
                  ->setUpdating($this->has('import-update'))
+                 ->setShouldNotify($this->has('send-welcome'))
                  ->setUsernameFormat('firstname.lastname')
                  ->setFieldMappings($fieldMappings);
         // $logFile = storage_path('logs/importer.log');
@@ -60,7 +61,7 @@ class ItemImportRequest extends FormRequest
 
     public function log($string)
     {
-        // \Log::Info($string);
+         \Log::Info($string);
     }
 
     public function progress($count)

app/Http/Requests/SaveUserRequest.php

@@ -37,7 +37,7 @@ class SaveUserRequest extends Request
                 $rules['username'] = 'required_unless:ldap_import,1|string|min:1';
                 if ($this->request->get('ldap_import') == false)
                 {
-                    $rules['password'] = Setting::passwordComplexityRulesSaving('store');
+                    $rules['password'] = Setting::passwordComplexityRulesSaving('store').'|confirmed';
                 }
                 break;
             }
@@ -46,7 +46,7 @@ class SaveUserRequest extends Request
             case 'PUT':
                 $rules['first_name'] = 'required|string|min:1';
                 $rules['username'] = 'required_unless:ldap_import,1|string|min:1';
-                $rules['password'] = Setting::passwordComplexityRulesSaving('update');
+                $rules['password'] = Setting::passwordComplexityRulesSaving('update').'|confirmed';
                 break;
 
             // Save only what's passed
@@ -58,9 +58,7 @@ class SaveUserRequest extends Request
 
             default:break;
         }
-
-        $rules['password_confirm'] = 'sometimes|required_with:password';
-
+        
         return $rules;
 
     }

app/Http/Requests/SetupUserRequest.php

@@ -29,8 +29,7 @@ class SetupUserRequest extends Request
           'last_name' => 'required|string|min:1',
           'username' => 'required|string|min:2|unique:users,username,NULL,deleted_at',
           'email' => 'email|unique:users,email',
-          'password' => 'required|min:6',
-          'password_confirm' => 'required|min:6|same:password',
+          'password' => 'required|min:6|confirmed',
           'email_domain' => 'required|min:4',
         ];
     }

app/Http/Transformers/AssetMaintenancesTransformer.php

@@ -27,6 +27,11 @@ class AssetMaintenancesTransformer
                 'name'=> ($assetmaintenance->asset->name) ? e($assetmaintenance->asset->name) : null,
                 'asset_tag'=> e($assetmaintenance->asset->asset_tag)
 
+            ]  : null,
+            'company' => (($assetmaintenance->asset) && ($assetmaintenance->asset->company)) ? [
+                'id' => (int) $assetmaintenance->asset->company->id,
+                'name'=> ($assetmaintenance->asset->company->name) ? e($assetmaintenance->asset->company->name) : null,
+
             ]  : null,
             'title'         => ($assetmaintenance->title) ? e($assetmaintenance->title) : null,
             'location' => (($assetmaintenance->asset) && ($assetmaintenance->asset->location)) ? [

app/Importer/Importer.php

@@ -4,6 +4,7 @@ namespace App\Importer;
 use App\Models\CustomField;
 use App\Models\Setting;
 use App\Models\User;
+use App\Models\Department;
 use ForceUTF8\Encoding;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Auth;
@@ -29,6 +30,7 @@ abstract class Importer
      */
     private $defaultFieldMap = [
         'asset_tag' => 'asset tag',
+        'activated' => 'activated',
         'category' => 'category',
         'checkout_class' => 'checkout type', // Supports Location or User for assets.  Using checkout_class instead of checkout_type because type exists on asset already.
         'checkout_location' => 'checkout location',
@@ -66,6 +68,9 @@ abstract class Importer
         'phone_number' => 'phone number',
         'first_name' => 'first name',
         'last_name' => 'last name',
+        'department' => 'department',
+        'manager_first_name' => 'manager first name',
+        'manager_last_name' => 'manager last name',
     ];
     /**
      * Map of item fields->csv names
@@ -176,10 +181,9 @@ abstract class Importer
     {
 
         $val = $default;
-
         $key = $this->lookupCustomKey($key);
 
-        $this->log("Custom Key: ${key}");
+        // $this->log("Custom Key: ${key}");
         if (array_key_exists($key, $array)) {
             $val = Encoding::toUTF8(trim($array[ $key ]));
         }
@@ -198,7 +202,6 @@ abstract class Importer
     public function lookupCustomKey($key)
     {
         if (array_key_exists($key, $this->fieldMap)) {
-            // $this->log("Found a match in our custom map: {$key} is " . $this->fieldMap[$key]);
             return $this->fieldMap[$key];
         }
         // Otherwise no custom key, return original.
@@ -248,7 +251,10 @@ abstract class Importer
     }
 
     /**
-     * Finds the user matching given data, or creates a new one if there is no match
+     * Finds the user matching given data, or creates a new one if there is no match.
+     * This is NOT used by the User Import, only for Asset/Accessory/etc where
+     * there are users listed and we have to create them and associate them at
+     * the same time. [ALG]
      *
      * @author Daniel Melzter
      * @since 3.0
@@ -261,8 +267,13 @@ abstract class Importer
         $user_array = [
             'full_name' => $this->findCsvMatch($row, "full_name"),
             'email'     => $this->findCsvMatch($row, "email"),
-            'username'  => $this->findCsvMatch($row, "username")
+            'manager_id'=>  '',
+            'department_id' =>  '',
+            'username'  => $this->findCsvMatch($row, "username"),
+            'activated'  => $this->fetchHumanBoolean($this->findCsvMatch($row, 'activated')),
         ];
+        \Log::debug('Importer.php Activated: '.$this->findCsvMatch($row, 'activated'));
+
         // If the full name is empty, bail out--we need this to extract first name (at the very least)
         if(empty($user_array['full_name'])) {
             $this->log('Insufficient user data provided (Full name is required)- skipping user creation, just adding asset');
@@ -283,6 +294,7 @@ abstract class Importer
         $user_formatted_array = User::generateFormattedNameFromFullName(Setting::getSettings()->username_format, $user_array['full_name']);
         $user_array['first_name'] = $user_formatted_array['first_name'];
         $user_array['last_name'] = $user_formatted_array['last_name'];
+
         if (empty($user_array['username'])) {
             $user_array['username'] = $user_formatted_array['username'];
             if ($this->usernameFormat =='email') {
@@ -290,8 +302,9 @@ abstract class Importer
             }
         }
 
+        // Does this ever actually fire??
         // Check for a matching user after trying to guess username.
-        if($user = User::where('username', $user_array['username'])->first()) {
+        if ($user = User::where('username', $user_array['username'])->first()) {
             $this->log('User '.$user_array['username'].' already exists');
             return $user;
         }
@@ -307,10 +320,15 @@ abstract class Importer
         $user->last_name = $user_array['last_name'];
         $user->username = $user_array['username'];
         $user->email = $user_array['email'];
-        $user->activated = 1;
+        $user->manager_id = (isset($user_array['manager_id']) ? $user_array['manager_id'] : null);
+        $user->department_id = (isset($user_array['department_id']) ? $user_array['department_id']:  null);
+        $user->activated = $user_array['activated'];
         $user->password = $this->tempPassword;
 
+        \Log::debug('Creating a user with the following attributes: '.print_r($user_array, true));
+
         if ($user->save()) {
+            \Log::debug('Importer.php  Name: '.$user->first_name.' '.$user->last_name.' ('.$user->username.')');
             $this->log('User '.$user_array['username'].' created');
             return $user;
         }
@@ -360,6 +378,20 @@ abstract class Importer
         return $this;
     }
 
+    /**
+     * Sets the Are we updating items in the import.
+     *
+     * @param bool $updating the updating
+     *
+     * @return self
+     */
+    public function setShouldNotify($send_welcome)
+    {
+        $this->send_welcome = $send_welcome;
+
+        return $this;
+    }
+
     /**
      * Defines mappings of csv fields
      *
@@ -407,4 +439,64 @@ abstract class Importer
 
         return $this;
     }
+
+    public function fetchHumanBoolean($value)
+    {
+        if (($value =='1') || (strtolower($value) =='true') || (strtolower($value) =='yes'))
+        {
+            return '1';
+        }
+        return '0';
+    }
+
+    /**
+     * Fetch an existing department, or create new if it doesn't exist
+     *
+     * @author A. Gianotto
+     * @since 4.6.5
+     * @param $user_department string
+     * @return int id of company created/found
+     */
+    public function createOrFetchDepartment($user_department_name)
+    {
+        if ($user_department_name!='') {
+            $department = Department::where('name', '=', $user_department_name)->first();
+
+            if ($department) {
+                $this->log('A matching Department ' . $user_department_name . ' already exists');
+                return $department->id;
+            }
+
+            $department = new Department();
+            $department->name = $user_department_name;
+
+            if ($department->save()) {
+                $this->log('Department ' . $user_department_name . ' was created');
+                return $department->id;
+            }
+            $this->logError($department, 'Department');
+        }
+
+        return null;
+    }
+
+    /**
+     * Fetch an existing manager
+     *
+     * @author A. Gianotto
+     * @since 4.6.5
+     * @param $user_manager string
+     * @return int id of company created/found
+     */
+    public function fetchManager($user_manager_first_name, $user_manager_last_name)
+    {
+        $manager = User::where('first_name', '=', $user_manager_first_name)
+            ->where('last_name', '=', $user_manager_last_name)->first();
+        if ($manager) {
+            $this->log('A matching Manager ' . $user_manager_first_name . ' '. $user_manager_last_name . ' already exists');
+            return $manager->id;
+        }
+        $this->log('No matching Manager ' . $user_manager_first_name . ' '. $user_manager_last_name . ' found. If their user account is being created through this import, you should re-process this file again. ');
+        return null;
+    }
 }

app/Importer/ItemImporter.php

@@ -10,6 +10,7 @@ use App\Models\Location;
 use App\Models\Manufacturer;
 use App\Models\Statuslabel;
 use App\Models\Supplier;
+use App\Models\Department;
 use App\Models\User;
 
 class ItemImporter extends Importer
@@ -54,6 +55,18 @@ class ItemImporter extends Importer
         if ($this->shouldUpdateField($item_supplier)) {
             $this->item['supplier_id'] = $this->createOrFetchSupplier($item_supplier);
         }
+
+        $item_department = $this->findCsvMatch($row, "department");
+        if ($this->shouldUpdateField($item_department)) {
+            $this->item['department_id'] = $this->createOrFetchDepartment($item_department);
+        }
+
+        $item_manager_first_name = $this->findCsvMatch($row, "manager_first_name");
+        $item_manager_last_name = $this->findCsvMatch($row, "manager_last_name");
+        if ($this->shouldUpdateField($item_manager_first_name)) {
+            $this->item['manager_id'] = $this->fetchManager($item_manager_first_name, $item_manager_last_name);
+        }
+
         $this->item["name"] = $this->findCsvMatch($row, "item_name");
         $this->item["notes"] = $this->findCsvMatch($row, "notes");
         $this->item["order_number"] = $this->findCsvMatch($row, "order_number");
@@ -84,7 +97,7 @@ class ItemImporter extends Importer
      */ 
     protected function determineCheckout($row)
     {
-        // We only support checkout-to-location for asset, so short circuit otherw.
+        // We only support checkout-to-location for asset, so short circuit otherwise.
         if(get_class($this) != AssetImporter::class) {
             return $this->createOrFetchUser($row);
         }
@@ -161,7 +174,7 @@ class ItemImporter extends Importer
      * @since 3.0
      * @param array
      * @param $category Category
-     * @param $manufacturer Manufacturer
+     * @param $row Manufacturer
      * @return int Id of asset model created/found
      * @internal param $asset_modelno string
      */
@@ -279,6 +292,8 @@ class ItemImporter extends Importer
         return null;
     }
 
+
+
     /**
      * Fetch the existing status label or create new if it doesn't exist.
      *

app/Importer/UserImporter.php

@@ -6,13 +6,21 @@ use App\Helpers\Helper;
 use App\Models\User;
 use App\Notifications\WelcomeNotification;
 
+/**
+ * This is ONLY used for the User Import. When we are importing users
+ * via an Asset/etc import, we use createOrFetchUser() in
+ * App\Importer.php. [ALG]
+ *
+ * Class UserImporter
+ * @package App\Importer
+ *
+ */
 class UserImporter extends ItemImporter
 {
     protected $users;
     public function __construct($filename)
     {
         parent::__construct($filename);
-        // $this->users = User::all();
     }
 
     protected function handle($row)
@@ -31,25 +39,40 @@ class UserImporter extends ItemImporter
      */
     public function createUserIfNotExists(array $row)
     {
-        // User Specific Bits
+        // Pull the records from the CSV to determine their values
         $this->item['username'] = $this->findCsvMatch($row, 'username');
         $this->item['first_name'] = $this->findCsvMatch($row, 'first_name');
         $this->item['last_name'] = $this->findCsvMatch($row, 'last_name');
+        \Log::debug('UserImporter.php  Name: '.$this->item['first_name'].' '.$this->item['last_name'].' ('.$this->item['username'].')');
         $this->item['email'] = $this->findCsvMatch($row, 'email');
         $this->item['phone'] = $this->findCsvMatch($row, 'phone_number');
         $this->item['jobtitle'] = $this->findCsvMatch($row, 'jobtitle');
+        $this->item['activated'] =  ($this->fetchHumanBoolean($this->findCsvMatch($row, 'activated')) == 1) ? '1' : 0;
+
+        \Log::debug('UserImporter.php Activated: '.$this->findCsvMatch($row, 'activated'));
+        \Log::debug('UserImporter.php Activated fetchHumanBoolean: '. $this->fetchHumanBoolean($this->findCsvMatch($row, 'activated')));
+
         $this->item['employee_num'] = $this->findCsvMatch($row, 'employee_num');
+        $this->item['department_id'] = $this->createOrFetchDepartment($this->findCsvMatch($row, 'department')) ? $this->createOrFetchDepartment($this->findCsvMatch($row, 'department')) : null;
+        $this->item['manager_id'] = $this->fetchManager($this->findCsvMatch($row, 'manager_first_name'), $this->findCsvMatch($row, 'manager_last_name')) ? $this->fetchManager($this->findCsvMatch($row, 'manager_first_name'), $this->findCsvMatch($row, 'manager_last_name')) : null;
+
+
         $user = User::where('username', $this->item['username'])->first();
         if ($user) {
             if (!$this->updating) {
                 $this->log('A matching User ' . $this->item["name"] . ' already exists.  ');
+                \Log::debug('A matching User ' . $this->item["name"] . ' already exists.  ');
                 return;
             }
             $this->log('Updating User');
             $user->update($this->sanitizeItemForUpdating($user));
             $user->save();
+            // \Log::debug('UserImporter.php Updated User ' . print_r($user, true));
             return;
         }
+
+
+
         // This needs to be applied after the update logic, otherwise we'll overwrite user passwords
         // Issue #5408
         $this->item['password'] = $this->tempPassword;
@@ -57,10 +80,11 @@ class UserImporter extends ItemImporter
         $this->log("No matching user, creating one");
         $user = new User();
         $user->fill($this->sanitizeItemForStoring($user));
+
         if ($user->save()) {
-            // $user->logCreate('Imported using CSV Importer');
             $this->log("User " . $this->item["name"] . ' was created');
-            if($user->email) {
+
+            if(($user->email) && ($user->activated=='1')) {
                 $data = [
                     'email' => $user->email,
                     'username' => $user->username,
@@ -69,8 +93,10 @@ class UserImporter extends ItemImporter
                     'password' => $this->tempPassword,
                 ];
 
-                // UNCOMMENT this to re-enable sending email notifications on user import
-                // $user->notify(new WelcomeNotification($data));
+                if ($this->send_welcome) {
+                    $user->notify(new WelcomeNotification($data));
+                }
+
             }
             $user = null;
             $this->item = null;

app/Importer/import_mappings.md

@@ -1,16 +1,20 @@
 | CSV                 | Item             | Applicable Types                          |
 |---------------------|------------------|-------------------------------------------|
+| activated           |                  | User                                      |
 | asset tag           | asset_tag        | Asset                                     |
 | category            | category         | All                                       |
 | company             | company          | All                                       |
+| department_id       |                  | User ? All                                |
 | item name           | item_name        | All                                       |
-| image               | image            | asset                                     |
+| image               | image            | Asset                                     |
+| email               |                  |                                           |
 | expiration date     | expiration_date  | License                                   |
 | location            | location         | All                                       |
 | notes               | notes            | All                                       |
 | licensed to email   | license_email    | License                                   |
 | licensed to name    | license_name     | License                                   |
 | maintained          | maintained       | License                                   |
+| manager_id          |                  | User                                         |
 | manufacturer        | manufacturer     | All                                       |
 | model name          | asset_model      | Asset                                     |
 | model number        | model_number     | Asset                                     |
@@ -22,12 +26,12 @@
 | reassignable        | reassignable     | License                                   |
 | requestable         | requestable      | Asset, Accessory?                         |
 | seats               | seats            | License                                   |
-| serial number       | serial           | asset, license                            |
-| status              | status           | asset ? All                               |
+| serial number       | serial           | Asset, license                            |
+| status              | status           | Asset ? All                               |
 | supplier            | supplier         | Asset ? All                               |
 | termination date    | termination_date | License                                   |
-| warranty months     | warranty_months  | asset                                     |
+| warranty months     | warranty_months  | Asset                                     |
 | User Related Fields | assigned_to      | Asset                                     |
 | name                |                  |                                           |
-| email               |                  |                                           |
-| username            |                  |                                           |
+| username            |                  |                                           |
+

app/Models/AssetMaintenance.php

@@ -72,6 +72,8 @@ class AssetMaintenance extends Model implements ICompanyableChild
             trans('admin/asset_maintenances/general.repair')      => trans('admin/asset_maintenances/general.repair'),
             trans('admin/asset_maintenances/general.upgrade')     => trans('admin/asset_maintenances/general.upgrade'),
             'PAT test'      => 'PAT test',
+            trans('admin/asset_maintenances/general.calibration')     => trans('admin/asset_maintenances/general.calibration'),
+            'PAT test'      => 'PAT test',
         ];
     }
 

app/Models/Consumable.php

@@ -35,7 +35,7 @@ class Consumable extends SnipeModel
         'qty'         => 'required|integer|min:0',
         'category_id' => 'required|integer',
         'company_id'  => 'integer|nullable',
-        'min_amt'     => 'integer|min:1|nullable',
+        'min_amt'     => 'integer|min:0|nullable',
         'purchase_cost'   => 'numeric|nullable',
     );
 

app/Models/Department.php

@@ -25,11 +25,11 @@ class Department extends SnipeModel
     use ValidatingTrait, UniqueUndeletedTrait;
 
     protected $rules = [
-        'name'            => 'required|max:255',
-        'user_id'        => 'required',
-        'location_id'        => 'numeric|nullable',
-        'company_id'        => 'numeric|nullable',
-        'manager_id'        => 'numeric|nullable',
+        'name'                  => 'required|max:255',
+        'user_id'               => 'nullable|exists:users,id',
+        'location_id'           => 'numeric|nullable',
+        'company_id'            => 'numeric|nullable',
+        'manager_id'            => 'numeric|nullable',
     ];
 
     /**

app/Models/Ldap.php

@@ -96,8 +96,11 @@ class Ldap extends Model
 
         $filterQuery = $settings->ldap_auth_filter_query . $username;
 
+
         if (!$ldapbind = @ldap_bind($connection, $userDn, $password)) {
-            return false;
+            if(!$ldapbind = Ldap::bindAdminToLdap($connection)){
+                    return false;
+            }
         }
 
         if (!$results = ldap_search($connection, $baseDn, $filterQuery)) {
@@ -112,7 +115,7 @@ class Ldap extends Model
             return false;
         }
 
-        return $user;
+        return array_change_key_case($user);
 
     }
 

app/Models/License.php

@@ -110,6 +110,7 @@ class License extends Depreciable
     protected $searchableRelations = [
       'manufacturer' => ['name'],
       'company'      => ['name'],
+      'category'     => ['name'],
     ];    
 
     public static function boot()

app/Models/Loggable.php

@@ -41,7 +41,8 @@ trait Loggable
         $settings = Setting::getSettings();
         $log = new Actionlog;
         $log = $this->determineLogItemType($log);
-        $log->user_id = Auth::user()->id;
+        if(Auth::user())
+            $log->user_id = Auth::user()->id;
 
         if (!isset($target)) {
             throw new Exception('All checkout logs require a target');

app/Models/User.php

@@ -47,6 +47,7 @@ class User extends SnipeModel implements AuthenticatableContract, CanResetPasswo
         'manager_id',
         'password',
         'phone',
+        'notes',
         'state',
         'username',
         'zip',
@@ -269,7 +270,7 @@ class User extends SnipeModel implements AuthenticatableContract, CanResetPasswo
      **/
     public function managedLocations()
     {
-        return $this->hasMany('\App\Models\Location', 'manager_id')->withTrashed();
+        return $this->hasMany('\App\Models\Location', 'manager_id');
     }
 
     /**
@@ -328,7 +329,7 @@ class User extends SnipeModel implements AuthenticatableContract, CanResetPasswo
 
     public function scopeGetDeleted($query)
     {
-        return $query->withTrashed()->whereNotNull('deleted_at');
+        return $query->withTrashed()->whereNotNull('users.deleted_at');
     }
 
     public function scopeGetNotDeleted($query)
@@ -445,7 +446,7 @@ class User extends SnipeModel implements AuthenticatableContract, CanResetPasswo
 
     public function scopeDeleted($query)
     {
-        return $query->whereNotNull('deleted_at');
+        return $query->whereNotNull('users.deleted_at');
     }
 
 

app/Providers/AppServiceProvider.php

@@ -58,7 +58,7 @@ class AppServiceProvider extends ServiceProvider
         if (($this->app->environment('production'))  && (config('services.rollbar.access_token'))){
             $this->app->register(\Rollbar\Laravel\RollbarServiceProvider::class);
         }
-
+        
         foreach ($monolog->getHandlers() as $handler) {
             $handler->setLevel($log_level);
         }

composer.json

@@ -12,8 +12,9 @@
     "doctrine/dbal": "^2.5.13",
     "doctrine/inflector": "1.1.*",
     "doctrine/instantiator": "1.0.*",
+    "eduardokum/laravel-mail-auto-embed": "^1.0",
     "erusev/parsedown": "^1.6",
-    "fideloper/proxy": "^3.1",
+    "fideloper/proxy": "^3.3",
     "intervention/image": "^2.3",
     "javiereguiluz/easyslugger": "^1.0",
     "laravel/framework": "5.4.35",
@@ -28,7 +29,7 @@
     "phpspec/prophecy": "1.6.2",
     "pragmarx/google2fa": "^1.0",
     "predis/predis": "^1.1",
-    "rollbar/rollbar-laravel": "^2.2",
+    "rollbar/rollbar-laravel": "2.4.1",
     "schuppo/password-strength": "~1.5",
     "spatie/laravel-backup": "3.11.0",
     "tecnickcom/tc-lib-barcode": "^1.15",
@@ -41,7 +42,6 @@
     "fzaninotto/faker": "~1.4",
     "phpunit/php-token-stream": "1.4.11",
     "phpunit/phpunit": "~5.7",
-    "roave/security-advisories": "dev-master",
     "squizlabs/php_codesniffer": "*",
     "symfony/css-selector": "3.1.*",
     "symfony/dom-crawler": "3.1.*"

config/app.php

@@ -297,6 +297,7 @@ return [
         Unicodeveloper\DumbPassword\DumbPasswordServiceProvider::class,
         Schuppo\PasswordStrength\PasswordStrengthServiceProvider::class,
         Tightenco\Ziggy\ZiggyServiceProvider::class, // Laravel routes in vue
+        Eduardokum\LaravelMailAutoEmbed\ServiceProvider::class,
 
         /*
         * Application Service Providers...

config/cache.php

@@ -86,6 +86,6 @@ return [
     |
     */
 
-    'prefix' => 'snipeit',
+    'prefix' => env('CACHE_PREFIX', 'snipeit'),
 
 ];

config/trustedproxy.php

@@ -63,11 +63,12 @@ return [
      * We may also want to add something like:
      * \Illuminate\Http\Request::HEADER_CLIENT_PROTO => 'X_FORWARDED_SCHEME',
      */
+    // These are defaults already set in the config:
     'headers' => [
+        (defined('Illuminate\Http\Request::HEADER_FORWARDED') ? Illuminate\Http\Request::HEADER_FORWARDED : 'forwarded') => 'FORWARDED',
         \Illuminate\Http\Request::HEADER_CLIENT_IP    => 'X_FORWARDED_FOR',
         \Illuminate\Http\Request::HEADER_CLIENT_HOST  => 'X_FORWARDED_HOST',
         \Illuminate\Http\Request::HEADER_CLIENT_PROTO => 'X_FORWARDED_PROTO',
         \Illuminate\Http\Request::HEADER_CLIENT_PORT  => 'X_FORWARDED_PORT',
-
     ]
 ];

config/version.php

@@ -1,10 +1,10 @@
 <?php
 return array (
-  'app_version' => 'v4.6.5',
-  'full_app_version' => 'v4.6.5 - build 3897-gff824ec4d',
-  'build_version' => '3897',
+  'app_version' => 'v4.6.11',
+  'full_app_version' => 'v4.6.11 - build 3980-gb26fbf986',
+  'build_version' => '3980',
   'prerelease_version' => '',
-  'hash_version' => 'gff824ec4d',
-  'full_hash' => 'v4.6.5-15-gff824ec4d',
+  'hash_version' => 'gb26fbf986',
+  'full_hash' => 'v4.6.11-4-gb26fbf986',
   'branch' => 'master',
 );

database/migrations/2014_11_20_224421_add_prefix_to_settings.php

@@ -15,7 +15,7 @@ class AddPrefixToSettings extends Migration {
 		//
 		Schema::table('settings', function(Blueprint $table) {
 
-			$table->string('auto_increment_prefix')->default(0);
+			$table->string('auto_increment_prefix')->nullable()->default(NULL);
 
 		});
 	}

database/migrations/2019_02_14_154310_change_auto_increment_prefix_to_nullable.php

@@ -0,0 +1,30 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class ChangeAutoIncrementPrefixToNullable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('settings', function (Blueprint $table) {
+            $table->boolean('auto_increment_prefix')->nullable()->default(null)->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}

public/mix-manifest.json

@@ -1,14 +1,14 @@
 {
-    "/js/build/vue.js": "/js/build/vue.js?id=832c22cb5b66ac81ed06",
+    "/js/build/vue.js": "/js/build/vue.js?id=af0a53aa1b89d0e19039",
     "/css/AdminLTE.css": "/css/AdminLTE.css?id=5e72463a66acbcc740d5",
     "/css/app.css": "/css/app.css?id=407edb63cc6b6dc62405",
     "/css/overrides.css": "/css/overrides.css?id=2d81c3704393bac77011",
-    "/js/build/vue.js.map": "/js/build/vue.js.map?id=0deaf852882fe2d65263",
+    "/js/build/vue.js.map": "/js/build/vue.js.map?id=79fce5e6515d8a4cc760",
     "/css/AdminLTE.css.map": "/css/AdminLTE.css.map?id=0be7790b84909dca6a0a",
     "/css/app.css.map": "/css/app.css.map?id=96b5c985e860716e6a16",
     "/css/overrides.css.map": "/css/overrides.css.map?id=f7ce9ca49027594ac402",
     "/css/dist/all.css": "/css/dist/all.css?id=98db4e9b7650453c8b00",
-    "/js/dist/all.js": "/js/dist/all.js?id=9d02373ef452329336d3",
+    "/js/dist/all.js": "/js/dist/all.js?id=a3a656ed6316d4c4efe7",
     "/css/build/all.css": "/css/build/all.css?id=98db4e9b7650453c8b00",
-    "/js/build/all.js": "/js/build/all.js?id=9d02373ef452329336d3"
+    "/js/build/all.js": "/js/build/all.js?id=a3a656ed6316d4c4efe7"
 }

resources/assets/js/components/importer/importer-file.vue

@@ -6,29 +6,50 @@ tr {
 
 <template>
     <tr v-show="processDetail">
-        <td colspan="3">
+        <td colspan="5">
+            <div class="col-md-2 text-left">
+            </div>
+            <div class="col-md-8 col-md-offset-2 text-center" style="padding-top: 30px; margin: 0 auto;">
+            <div class="col-md-12 text-left">
+
             <h4 class="modal-title">Import File:</h4>
             <div class="dynamic-form-row">
-                <div class="col-md-4 col-xs-12">
+                <div class="col-md-5 col-xs-12">
                     <label for="import-type">Import Type:</label>
                 </div>
-                <div class="col-md-4 col-xs-12">
+                <div class="col-md-7 col-xs-12">
                     <select2 :options="options.importTypes" v-model="options.importType" required>
                         <option disabled value="0"></option>
                     </select2>
                 </div>
             </div>
             <div class="dynamic-form-row">
-                <div class="col-md-4 col-xs-12">
+                <div class="col-md-5 col-xs-12">
                     <label for="import-update">Update Existing Values?:</label>
                 </div>
-                <div class="col-md-4 col-xs-12">
+                <div class="col-md-7 col-xs-12">
                     <input type="checkbox" name="import-update" v-model="options.update">
                 </div>
             </div>
+            <div class="dynamic-form-row">
+                <div class="col-md-5 col-xs-12">
+                    <label for="send-welcome">Send Welcome Email for new Users?</label>
+                </div>
+                <div class="col-md-7 col-xs-12">
+                    <input type="checkbox" name="send-welcome" v-model="options.send_welcome">
+                </div>
+                </div>
+            </div>
+            <div class="alert col-md-12"
+                 :class="alertClass"
+                 style="text-align:left"
+                 v-if="statusText">
+                {{ this.statusText }}
+            </div>
 
-            <div class="col-md-12" style="padding-top: 30px;">
-            <table class="table">
+
+            <div class="text-left" style="padding-top: 30px;">
+            <table class="table table-striped snipe-table">
             <thead>
                 <th>Header Field</th>
                 <th>Import Field</th>
@@ -54,21 +75,25 @@ tr {
                 </template>
             </tbody>
             </table>
+                <br>
+                 <div class="col-md-8 col-md-offset-2 text-right">
+                     <button type="button" class="btn btn-sm btn-default" @click="processDetail = false">Cancel</button>
+                     <button type="submit" class="btn btn-sm btn-primary" @click="postSave">Import</button>
+                     <br><br>
+                 </div>
+
+                <div class="alert col-md-12" style="padding-top: 20px;"
+                     :class="alertClass"
+                     style="text-align:left"
+                     v-if="statusText">
+                    {{ this.statusText }}
+                </div>
+
+             </div>
             </div>
+
         </td>
 
-        <td>
-            <button type="button" class="btn btn-sm btn-default" @click="processDetail = false">Cancel</button>
-            <button type="submit" class="btn btn-sm btn-primary" @click="postSave">Import</button>
-            <div 
-                class="alert col-md-5 col-md-offset-1"
-                :class="alertClass"
-                style="text-align:left"
-                v-if="statusText"
-            >
-                {{ this.statusText }}
-            </div>
-        </td>
     </tr>
 </template>
 
@@ -113,6 +138,7 @@ tr {
                         {id: 'serial', text: 'Serial Number' },
                         {id: 'supplier', text: 'Supplier' },
                         {id: 'username', text: 'Username' },
+                        {id: 'department', text: 'Department' },
                     ],
                     assets: [
                         {id: 'asset_tag', text: 'Asset Tag' },
@@ -143,6 +169,9 @@ tr {
                         {id: 'jobtitle', text: 'Job Title' },
                         {id: 'last_name', text: 'Last Name' },
                         {id: 'phone_number', text: 'Phone Number' },
+                        {id: 'manager_first_name', text: 'Manager First Name' },
+                        {id: 'manager_last_name', text: 'Manager Last Name' },
+                        {id: 'activated', text: 'Activated' },
 
                     ],
                     customFields: this.customFields,
@@ -211,6 +240,7 @@ tr {
                 this.statusText = "Processing...";
                 this.$http.post(route('api.imports.importFile', this.file.id), {
                     'import-update': this.options.update,
+                    'send-welcome': this.options.send_welcome,
                     'import-type': this.options.importType,
                     'column-mappings': this.columnMappings
                 }).then( ({body}) => {

resources/lang/ar/admin/settings/general.php

@@ -42,7 +42,7 @@ return array(
 	'alt_barcode_type'			=> '1D نوع الباركود',
     'eula_settings'				=> 'إعدادات اتفاقية ترخيص المستخدم النهائي',
     'eula_markdown'				=> 'تسمح اتفاقية ترخيص المستخدم هذه <a href="https://help.github.com/articles/github-flavored-markdown/">بتطبيق نمط الكتابة من Github</a>.',
-    'footer_text'               => 'Additional Footer Text ',
+    'footer_text'               => 'إضافة نص لتذييل الصفحة ',
     'footer_text_help'          => 'This text will appear in the right-side footer. Links are allowed using <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Line breaks, headers, images, etc may result in unpredictable results.',
     'general_settings'			=> 'الاعدادات العامة',
 	'generate_backup'			=> 'إنشاء النسخ الاحتياطي',
@@ -75,7 +75,7 @@ return array(
     'ldap_active_flag'          => 'لداب العلم النشط',
     'ldap_emp_num'              => 'رقم موظف لداب',
     'ldap_email'                => 'بريد لداب',
-    'license'                  => 'Software License',
+    'license'                  => 'ترخيص البرنامج',
     'load_remote_text'          => 'المخطوطات عن بعد',
     'load_remote_help_text'		=> 'هذا قنص إيت تثبيت يمكن تحميل البرامج النصية من العالم الخارجي.',
     'login_note'                => 'تسجيل الدخول ملاحظة',
@@ -83,16 +83,16 @@ return array(
     'login_remote_user_text'    => 'Remote User login options',
     'login_remote_user_enabled_text' => 'Enable Login with Remote User Header',
     'login_remote_user_enabled_help' => 'This option enables Authentication via the REMOTE_USER header according to the "Common Gateway Interface (rfc3875)"',
-    'login_common_disabled_text' => 'Disable other authentication mechanisms',
+    'login_common_disabled_text' => 'تعطيل آليات المصادقة الأخرى',
     'login_common_disabled_help' => 'This option disables other authentication mechanisms. Just enable this option if you are sure that your REMOTE_USER login is already working',
     'login_remote_user_custom_logout_url_text' => 'عنوان صفحة مخصص لتسجيل الخروج',
     'login_remote_user_custom_logout_url_help' => 'If a url is provided here, users will get redirected to this URL after the user logs out of Snipe-IT. This is useful to close the user sessions of your Authentication provider correctly.',
     'logo'                    	=> 'شعار',
-    'logo_print_assets'         => 'Use in Print',
-    'logo_print_assets_help'    => 'Use branding on printable asset lists ',
+    'logo_print_assets'         => 'الاستخدام في الطباعة',
+    'logo_print_assets_help'    => 'استخدم العلامة التجارية في قوائم الأصول القابلة للطباعة ',
     'full_multiple_companies_support_help_text' => 'تقييد المستخدمين (بما في ذلك المشرفون) المعينون للشركات إلى أصول شركاتهم.',
     'full_multiple_companies_support_text' => 'كامل دعم الشركات المتعددة',
-    'show_in_model_list'   => 'Show in Model Dropdowns',
+    'show_in_model_list'   => 'إظهار في القوائم المنسدلة للنماذج',
     'optional'					=> 'اختياري',
     'per_page'                  => 'النتائج لكل صفحة',
     'php'                       => 'نسخة فب',
@@ -108,10 +108,10 @@ return array(
     'qr_text'                   => 'نص رمز الاستجابة السريعة',
     'setting'                   => 'ضبط',
     'settings'                  => 'إعدادات',
-    'show_alerts_in_menu'       => 'Show alerts in top menu',
-    'show_archived_in_list'     => 'Archived Assets',
-    'show_archived_in_list_text'     => 'Show archived assets in the "all assets" listing',
-    'show_images_in_email'     => 'Show images in emails',
+    'show_alerts_in_menu'       => 'عرض التنبيهات في القائمة العلوية',
+    'show_archived_in_list'     => 'الأصول المحفوظة',
+    'show_archived_in_list_text'     => 'عرض الأصول المحفوظة في قائمة "جميع الأصول"',
+    'show_images_in_email'     => 'إظهار الصور في رسائل البريد الإلكتروني',
     'show_images_in_email_help'   => 'Uncheck this box if your Snipe-IT installation is behind a VPN or closed network and users outside the network will not be able to load images served from this installation in their emails.',
     'site_name'                 => 'اسم الموقع',
     'slack_botname'             => 'سلاك بوتنام',
@@ -136,7 +136,7 @@ return array(
     'label_dimensions'          => 'أبعاد التسمية (بوصة)',
     'next_auto_tag_base'        => 'الزيادة التلقائية التالية',
     'page_padding'              => 'هوامش الصفحة (بوصة)',
-    'privacy_policy_link'       => 'Link to Privacy Policy',
+    'privacy_policy_link'       => 'رابط سياسة الخصوصية',
     'privacy_policy'            => 'سياسة الخصوصية',
     'privacy_policy_link_help'  => 'If a url is included here, a link to your privacy policy will be included in the app footer and in any emails that the system sends out, in compliance with GDPR. ',
     'purge'                     => 'تطهير السجلات المحذوفة',

resources/lang/cs/admin/custom_fields/general.php

@@ -20,7 +20,7 @@ return array(
     'field_element_short'     => 'Typ',
     'field_format'            => 'Formát',
     'field_custom_format'     => 'Vlastní formát',
-    'field_custom_format_help'     => 'This field allows you to use a regex expression for validation. It should start with "regex:" - for example, to validate that a custom field value contains a valid IMEI (15 numeric digits), you would use <code>regex:/^[0-9]{15}$/</code>.',
+    'field_custom_format_help'     => 'Toto pole umožňuje použít pro validaci regulární výrazy. Mělo by začínat slovem "regex:" - například pro ověření, že zadaná hodnota pole obsahuje platný IMEI (15 číslic), použijte <code>regex:/^[0-9]{15}$/</code>.',
     'required'   		          => 'Povinné',
     'req'   		              => 'Pov.',
     'used_by_models'   		    => 'Užito u modelů',

resources/lang/cs/admin/settings/general.php

@@ -5,7 +5,7 @@ return array(
     'ad_domain'				    => 'Doména služby Active Directory',
     'ad_domain_help'			=> 'Toto je někdy stejné jako vaše emailová doména, ale ne vždy.',
     'admin_cc_email'            => 'Ve skryté kopii',
-    'admin_cc_email_help'       => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.',
+    'admin_cc_email_help'       => 'Chcete-li poslat kopii e-mailů pro check-in / checkout, které jsou uživatelům zaslány na další e-mailový účet, zadejte je zde. V opačném případě nechte toto pole prázdné.',
     'is_ad'				        => 'Toto je server služby Active Directory',
 	'alert_email'				=> 'Zasílat upozornění na',
 	'alerts_enabled'			=> 'Upozornění zapnutá',
@@ -26,9 +26,9 @@ return array(
 	'custom_css'				=> 'Vlastní CSS',
 	'custom_css_help'			=> 'Zadejte libovolné vlastní CSS, které chcete použít. Nezahrnujte <style></style> tagy.',
     'custom_forgot_pass_url'	=> 'Uživatelem určená URL adresa pro resetování hesla',
-    'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
+    'custom_forgot_pass_url_help'	=> 'Nahrazuje vestavěnou URL pro změnu zapomenutého hesla na přihlašovací obrazovce, slouží k přesměrování uživatelů na interní nebo hostované funkce obnovení hesla LDAP. Zablokuje přístup k funkci změny hesla lokálního uživatele.',
     'dashboard_message'			=> 'Hlášení na nástěnce',
-    'dashboard_message_help'	=> 'This text will appear on the dashboard for anyone with permission to view the dashboard.',
+    'dashboard_message_help'	=> 'Tento text se objeví na nástěnce každému, kdo má oprávnění k zobrazení nástěnky.',
 	'default_currency'  		=> 'Výchozí měna',
 	'default_eula_text'			=> 'Výchozí EULA',
   'default_language'			=> 'Výchozí jazyk',
@@ -43,7 +43,7 @@ return array(
     'eula_settings'				=> 'Nastavení EULA',
     'eula_markdown'				=> 'Tato EULA umožňuje <a href="https://help.github.com/articles/github-flavored-markdown/">Github markdown</a>.',
     'footer_text'               => 'Další text do zápatí ',
-    'footer_text_help'          => 'This text will appear in the right-side footer. Links are allowed using <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Line breaks, headers, images, etc may result in unpredictable results.',
+    'footer_text_help'          => 'Tento text se zobrazí v pravém zápatí. Odkazy jsou povoleny pomocí <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Zalamování řádků, záhlaví, obrázky atd. mohou mít za následek nepředvídatelné výsledky.',
     'general_settings'			=> 'Obecné nastavení',
 	'generate_backup'			=> 'Vytvořit zálohu',
     'header_color'              => 'Barva záhlaví',
@@ -53,7 +53,7 @@ return array(
     'ldap_integration'          => 'LDAP integrace',
     'ldap_settings'             => 'Nastavení LDAP',
     'ldap_login_test_help'      => 'Zadejte platné LDAP uživatelské jméno a heslo ze základu rozlišeného názvu který jste určili výše a vyzkoušejte zda je LDAP přihlašování správně nastavené. NEJPRVE JE TŘEBA ULOŽIT ZMĚNĚNÉ NASTAVENÍ LDAP.',
-    'ldap_login_sync_help'      => 'This only tests that LDAP can sync correctly. If your LDAP Authentication query is not correct, users may still not be able to login. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
+    'ldap_login_sync_help'      => 'Otestujte, že LDAP může správně synchronizovat. Pokud ověřovací LDAP dotaz není správný, uživatelé se nemusí být schopni přihlásit. JE NUTNÉ NEJPRVE NEJDŘÍVE ULOŽIT NASTAVENÍ LDAP POKUD BYLO ZMĚNĚNO.',
     'ldap_server'               => 'LDAP server',
     'ldap_server_help'          => 'Toto by mělo začít s ldap: // (pro nešifrované nebo TLS) nebo ldaps: // (pro SSL)',
 	'ldap_server_cert'			=> 'Validace certifikátů LDAP SSL',
@@ -86,10 +86,10 @@ return array(
     'login_common_disabled_text' => 'Vypnout ostatní způsoby ověřování',
     'login_common_disabled_help' => 'Tato volba vypne ostatní způsoby ověřování. Použijte ji pouze pokud jste si jistí, že už funguje přihlašování REMOTE_USER',
     'login_remote_user_custom_logout_url_text' => 'Uživatelsky určená URL adresa odhlašování',
-    'login_remote_user_custom_logout_url_help' => 'If a url is provided here, users will get redirected to this URL after the user logs out of Snipe-IT. This is useful to close the user sessions of your Authentication provider correctly.',
+    'login_remote_user_custom_logout_url_help' => 'Pokud je zde uvedena adresa URL, uživatelé budou po odhlášení ze Snipe-IT přesměrování na tuto URL. To je užitečné pro správné ukončení relací Authentication providera.',
     'logo'                    	=> 'Logo',
-    'logo_print_assets'         => 'Use in Print',
-    'logo_print_assets_help'    => 'Use branding on printable asset lists ',
+    'logo_print_assets'         => 'Použijte v tisku',
+    'logo_print_assets_help'    => 'Používat branding na seznamech k tisku ',
     'full_multiple_companies_support_help_text' => 'Omezení uživatelů (včetně správců) jsou přiřazená ke společnostem s majetkem společnosti.',
     'full_multiple_companies_support_text' => 'Plná podpora více společností',
     'show_in_model_list'   => 'Zobrazit v rozbalovacích nabídkách modelu',
@@ -120,10 +120,10 @@ return array(
     'slack_integration'         => 'Nastavení Slack',
     'slack_integration_help'    => 'Slack integrace je dobrovolná, nicméně pokud ho chcete používat jsou vyžadovány koncový bod a kanál. Chcete-li nakonfigurovat integraci Slack, nejprve <a href=":slack_link" target="_new"> ytvořte příchozí webhook</a> na vašem Slack účtu.',
     'slack_integration_help_button'    => 'Po uložení informací ke Slack se zobrazí tlačítko pro vyzkoušení.',
-    'slack_test_help'           => 'Test whether your Slack integration is configured correctly. YOU MUST SAVE YOUR UPDATED SLACK SETTINGS FIRST.',
+    'slack_test_help'           => 'Zkontrolujte, zda je správně nakonfigurována integrace Slack. MUSÍTE NEJDŘÍVE ULOŽIT NASTAVENÍ SLACK POKUD BYLO ZMĚNĚNO.',
     'snipe_version'  			=> 'Verze Snipe-IT',
     'support_footer'            => 'Odkazy v zápatí na podporu ',
-    'support_footer_help'       => 'Specify who sees the links to the Snipe-IT Support info and Users Manual',
+    'support_footer_help'       => 'Určete, kdo uvidí odkazy na Snipe-IT podporu a uživatelskou příručku',
     'version_footer'            => 'Verze v zápatí ',
     'version_footer_help'       => 'Určete kdo uvidí verzi Snipe-IT a číslo sestavení.',
     'system'                    => 'Systémové informace',
@@ -182,6 +182,6 @@ return array(
     'vertical'        => 'svislé',
     'horizontal'        => 'vodorovné',
     'unique_serial'                => 'Neopakující se sériová čísla',
-    'unique_serial_help_text'                => 'Checking this box will enforce a uniqueness constraint on asset serials',
+    'unique_serial_help_text'                => 'Zaškrtnutím tohoto políčka bude vynucena jedinečnost seriových čísel položek majetku',
     'zerofill_count'        => 'Délka značek majetku včetně zerofill',
 );

resources/lang/cs/admin/statuslabels/table.php

@@ -6,7 +6,7 @@ return array(
     'create'      	=> 'Vytvořit označení stavu',
     'color'      	=> 'Barva grafu',
     'default_label' => 'Výchozí štítek',
-    'default_label_help' => 'This is used to ensure your most commonly used status labels appear at the top of the select box when creating/editing assets.',
+    'default_label_help' => 'Toto se používá k zajištění zobrazení nejčastěji používaných štítků v horní části rozbalovacího pole, při vytváření nebo úpravách položek majetku.',
     'deployable'      	=> 'Připraveno k nasazení',
     'info'      	=> 'Označení stavu se používá k popisu různých stavů majetku. Můžou být v opravě, ztracení atd. Lze vytvořit nové stavy pro další možné stavy.',
     'name'      	=> 'Název stavu',

resources/lang/cs/admin/suppliers/message.php

@@ -19,9 +19,9 @@ return array(
         'confirm'   => 'Opravdu si přejete odstranit tohoto dodavatele?',
         'error'   => 'Vyskytl se problém při mazání dodavatele. Zkuste to prosím znovu.',
         'success' => 'Dodavatel byl úspěšně smazán.',
-        'assoc_assets'	 => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ',
-        'assoc_licenses'	 => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ',
-        'assoc_maintenances'	 => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ',
+        'assoc_assets'	 => 'Tento dodavatel je v současné době přiřazen k :asset_count položkám majetku a nelze jej smazat. Aktualizujte svůj majetek tak, aby již tento dodavatel nebyl přiřazen a zkuste to znovu. ',
+        'assoc_licenses'	 => 'Tento dodavatel je v současné době spojen s :licenses_count licencemi a nelze jej smazat. Aktualizujte prosím své licence, abyste již tento dodavatel nebyl přiřazen a zkuste to znovu. ',
+        'assoc_maintenances'	 => 'Tento dodavatel je v současné době spojen s údržbou :asset_maintenances_count položek majetku a nemůže být smazán. Aktualizujte prosím údržbu vašeho majetku, aby již tento dodavatel nebyl přiřazen a zkuste to znovu. ',
     )
 
 );

resources/lang/cs/admin/users/general.php

@@ -3,7 +3,7 @@
 
 return array(
     'activated_help_text' => 'Tento uživatel se může přihlásit',
-    'activated_disabled_help_text' => 'You cannot edit activation status for your own account.',
+    'activated_disabled_help_text' => 'Nelze upravit stav aktivace pro svůj vlastní účet.',
     'assets_user'       => 'Majetky přiřazené :name',
     'bulk_update_warn'	=> 'Chystáte se upravit vlastnosti :user_count uživatelů. Nezapomeňte, že pomocí tohoto formuláře nemůžete změnit vlastní atributy uživatele a musíte provádět vlastní úpravy individuálně.',
     'bulk_update_help'	=> 'Tento formulář umožňuje aktualizovat více uživatelů najednou. Vyplňte pouze pole, která potřebujete změnit. Všechna pole, která jsou prázdná, zůstanou nezměněny.',

resources/lang/cs/passwords.php

@@ -2,6 +2,6 @@
 
 return [
     'sent'	        => 'Váš odkaz s heslem byl odeslán!',
-    'user'			=> 'No matching active user found with that email.',
+    'user'			=> 'Nebyl nalezen žádný aktivní uživatel s takovým e-mailem.',
 ];
 

resources/lang/de/admin/settings/general.php

@@ -88,8 +88,8 @@ return array(
     'login_remote_user_custom_logout_url_text' => 'Benutzerdefinierte Abmelde-URL',
     'login_remote_user_custom_logout_url_help' => 'Sofern hier eine URL angegeben ist, werden Benutzer automatisch zu dieser URL weitergeleitet, nachdem der Benutzer sich aus Snipe-IT ausloggt. Dies ist nützlich, um die Benutzersitzung Ihres Authentifizierungsproviders korrekt zu beenden.',
     'logo'                    	=> 'Logo',
-    'logo_print_assets'         => 'Use in Print',
-    'logo_print_assets_help'    => 'Use branding on printable asset lists ',
+    'logo_print_assets'         => 'Anzeigen beim Drucken',
+    'logo_print_assets_help'    => 'Firmenlogo anzeigen beim Drucken der Asset-Liste ',
     'full_multiple_companies_support_help_text' => 'Beschränkung von Benutzern (inklusive Administratoren) die einer Firma zugewiesen sind zu den Assets der Firma.',
     'full_multiple_companies_support_text' => 'Volle Mehrmandanten-Unterstützung für Firmen',
     'show_in_model_list'   => 'In Modell-Dropdown-Liste anzeigen',

resources/lang/de/mail.php

@@ -59,7 +59,7 @@ return array(
     'test_mail_text' => 'Dies ist ein Test von Snipe-IT-Asset-Management-System. Wenn Sie das erhalten haben, funktioniert das Senden von Mails :)',
     'the_following_item' => 'Der folgende Gegenstand wurde eingecheckt: ',
     'low_inventory_alert' => 'Es gibt :count Artikel, der unter dem Minimum ist oder kurz davor ist.|Es gibt :count Artikel, die unter dem Minimum sind oder kurz davor sind.',
-    'assets_warrantee_alert' => 'Es gibt :count Asset mit einer auslaufenden Garantie in den nächsten :threshold Tagen.| Es gibt :count Asset mit auslaufenden Garantien in den nächsten :threshold Tagen.',
+    'assets_warrantee_alert' => 'Es gibt :count Asset mit einer auslaufenden Garantie in den nächsten :threshold Tagen.| Es gibt :count Assets mit auslaufenden Garantien in den nächsten :threshold Tagen.',
     'license_expiring_alert' => 'Es gibt :count auslaufende Lizenz in den nächsten :threshold Tagen.|Es gibt :count auslaufende Lizenzen in den nächsten :threshold Tagen.',
     'to_reset' => 'Zum Zurücksetzen Ihres :web Passwortes, füllen Sie bitte dieses Formular aus:',
     'type' => 'Typ',

resources/lang/de/passwords.php

@@ -2,6 +2,6 @@
 
 return [
     'sent'	        => 'Ihr Link wurde verschickt!',
-    'user'			=> 'No matching active user found with that email.',
+    'user'			=> 'Kein passender aktiver Nutzer mit dieser E-Mail gefunden.',
 ];
 

resources/lang/en/admin/asset_maintenances/general.php

@@ -7,5 +7,6 @@
         'view'               => 'View Asset Maintenance Details',
         'repair'             => 'Repair',
         'maintenance'        => 'Maintenance',
-        'upgrade'            => 'Upgrade'
+        'upgrade'            => 'Upgrade',
+        'calibration'        => 'Calibration'
     ];

resources/lang/en/validation.php

@@ -42,6 +42,7 @@ return array(
     'exists'               => 'The selected :attribute is invalid.',
     'file'                 => 'The :attribute must be a file.',
     'filled'               => 'The :attribute field must have a value.',
+    'hashed_pass'          => 'Your password is incorrect.',
     'image'                => 'The :attribute must be an image.',
     'in'                   => 'The selected :attribute is invalid.',
     'in_array'             => 'The :attribute field does not exist in :other.',

resources/lang/es-CO/admin/settings/general.php

@@ -86,10 +86,10 @@ return array(
     'login_common_disabled_text' => 'Deshabilitar otros mecanismos de autenticación',
     'login_common_disabled_help' => 'Esta opción desactiva otros mecanismos de autenticación. Simplemente habilite esta opción si está seguro de que su inicio de sesión REMOTE_USER ya está funcionando',
     'login_remote_user_custom_logout_url_text' => 'URL de cierre de sesión personalizado',
-    'login_remote_user_custom_logout_url_help' => 'If a url is provided here, users will get redirected to this URL after the user logs out of Snipe-IT. This is useful to close the user sessions of your Authentication provider correctly.',
+    'login_remote_user_custom_logout_url_help' => 'Si se proporciona una url aquí, los usuarios serán redirigidos a esta URL después de que el usuario cierre la sesión de Snipe-IT. Esto es útil para cerrar correctamente las sesiones de usuario de su proveedor de autenticación.',
     'logo'                    	=> 'Logo',
-    'logo_print_assets'         => 'Use in Print',
-    'logo_print_assets_help'    => 'Use branding on printable asset lists ',
+    'logo_print_assets'         => 'Utilizar en impresión',
+    'logo_print_assets_help'    => 'Utilice la marca en las listas de activos imprimibles ',
     'full_multiple_companies_support_help_text' => 'Usuarios restringidos (incluidos administradores) asignados a compañías de sus bienes de compañía.',
     'full_multiple_companies_support_text' => 'Soporte completo múltiple de compañías',
     'show_in_model_list'   => 'Mostrar en Desplegado de Modelos',

resources/lang/es-CO/admin/users/general.php

@@ -2,8 +2,8 @@
 
 
 return array(
-    'activated_help_text' => 'This user can login',
-    'activated_disabled_help_text' => 'You cannot edit activation status for your own account.',
+    'activated_help_text' => 'Este usuario puede ingresar',
+    'activated_disabled_help_text' => 'No puedes editar el estado de activación de tu propia cuenta.',
     'assets_user'       => 'Equipos asignados a :name',
     'bulk_update_warn'	=> 'Estás a punto de modificar las propiedades de :user_count usuarios. Por favor, ten en cuenta que no puedes modificar las propiedades de tu propio usuario con este formulario, y debes realizar las modificaciones a tu propio usuario de forma individual.',
     'bulk_update_help'	=> 'Este formulario permite actualizar múltiples usuarios simultáneamente. Rellena únicamente los campos que necesites cambiar. Cualquier campo que quede en blanco no se actualizará.',

resources/lang/es-ES/admin/settings/general.php

@@ -86,10 +86,10 @@ return array(
     'login_common_disabled_text' => 'Deshabilitar otros mecanismos de autenticación',
     'login_common_disabled_help' => 'Esta opción desactiva otros mecanismos de autenticación. Simplemente habilite esta opción si está seguro de que su inicio de sesión REMOTE_USER ya está funcionando',
     'login_remote_user_custom_logout_url_text' => 'URL de cierre de sesión personalizado',
-    'login_remote_user_custom_logout_url_help' => 'If a url is provided here, users will get redirected to this URL after the user logs out of Snipe-IT. This is useful to close the user sessions of your Authentication provider correctly.',
+    'login_remote_user_custom_logout_url_help' => 'Si se proporciona una url aquí, los usuarios serán redirigidos a esta URL después de que el usuario cierre la sesión de Snipe-IT. Esto es útil para cerrar correctamente las sesiones de usuario de su proveedor de autenticación.',
     'logo'                    	=> 'Logo',
-    'logo_print_assets'         => 'Use in Print',
-    'logo_print_assets_help'    => 'Use branding on printable asset lists ',
+    'logo_print_assets'         => 'Utilizar en impresión',
+    'logo_print_assets_help'    => 'Utilice la marca en las listas de activos imprimibles ',
     'full_multiple_companies_support_help_text' => 'Usuarios restringidos (incluidos administradores) asignados a compañías de sus bienes de compañía.',
     'full_multiple_companies_support_text' => 'Soporte completo múltiple de compañías',
     'show_in_model_list'   => 'Mostrar en Desplegado de Modelos',

resources/lang/es-ES/admin/users/general.php

@@ -2,8 +2,8 @@
 
 
 return array(
-    'activated_help_text' => 'This user can login',
-    'activated_disabled_help_text' => 'You cannot edit activation status for your own account.',
+    'activated_help_text' => 'Este usuario puede ingresar',
+    'activated_disabled_help_text' => 'No puedes editar el estado de activación de tu propia cuenta.',
     'assets_user'       => 'Equipos asignados a :name',
     'bulk_update_warn'	=> 'Estás a punto de modificar las propiedades de :user_count usuarios. Por favor, ten en cuenta que no puedes modificar las propiedades de tu propio usuario con este formulario, y debes realizar las modificaciones a tu propio usuario de forma individual.',
     'bulk_update_help'	=> 'Este formulario permite actualizar múltiples usuarios simultáneamente. Rellena únicamente los campos que necesites cambiar. Cualquier campo que quede en blanco no se actualizará.',

resources/lang/es-MX/admin/settings/general.php

@@ -86,10 +86,10 @@ return array(
     'login_common_disabled_text' => 'Deshabilitar otros mecanismos de autenticación',
     'login_common_disabled_help' => 'Esta opción desactiva otros mecanismos de autenticación. Simplemente habilite esta opción si está seguro de que su inicio de sesión REMOTE_USER ya está funcionando',
     'login_remote_user_custom_logout_url_text' => 'URL de cierre de sesión personalizado',
-    'login_remote_user_custom_logout_url_help' => 'If a url is provided here, users will get redirected to this URL after the user logs out of Snipe-IT. This is useful to close the user sessions of your Authentication provider correctly.',
+    'login_remote_user_custom_logout_url_help' => 'Si se proporciona una url aquí, los usuarios serán redirigidos a esta URL después de que el usuario cierre la sesión de Snipe-IT. Esto es útil para cerrar correctamente las sesiones de usuario de su proveedor de autenticación.',
     'logo'                    	=> 'Logo',
-    'logo_print_assets'         => 'Use in Print',
-    'logo_print_assets_help'    => 'Use branding on printable asset lists ',
+    'logo_print_assets'         => 'Utilizar en impresión',
+    'logo_print_assets_help'    => 'Utilice la marca en las listas de activos imprimibles ',
     'full_multiple_companies_support_help_text' => 'Usuarios restringidos (incluidos administradores) asignados a compañías de sus bienes de compañía.',
     'full_multiple_companies_support_text' => 'Soporte completo múltiple de compañías',
     'show_in_model_list'   => 'Mostrar en Desplegado de Modelos',

resources/lang/es-MX/admin/users/general.php

@@ -2,8 +2,8 @@
 
 
 return array(
-    'activated_help_text' => 'This user can login',
-    'activated_disabled_help_text' => 'You cannot edit activation status for your own account.',
+    'activated_help_text' => 'Este usuario puede ingresar',
+    'activated_disabled_help_text' => 'No puedes editar el estado de activación de tu propia cuenta.',
     'assets_user'       => 'Equipos asignados a :name',
     'bulk_update_warn'	=> 'Estás a punto de modificar las propiedades de :user_count usuarios. Por favor, ten en cuenta que no puedes modificar las propiedades de tu propio usuario con este formulario, y debes realizar las modificaciones a tu propio usuario de forma individual.',
     'bulk_update_help'	=> 'Este formulario permite actualizar múltiples usuarios simultáneamente. Rellena únicamente los campos que necesites cambiar. Cualquier campo que quede en blanco no se actualizará.',

resources/lang/es-VE/admin/settings/general.php

@@ -86,10 +86,10 @@ return array(
     'login_common_disabled_text' => 'Deshabilitar otros mecanismos de autenticación',
     'login_common_disabled_help' => 'Esta opción desactiva otros mecanismos de autenticación. Simplemente habilite esta opción si está seguro de que su inicio de sesión REMOTE_USER ya está funcionando',
     'login_remote_user_custom_logout_url_text' => 'URL de cierre de sesión personalizado',
-    'login_remote_user_custom_logout_url_help' => 'If a url is provided here, users will get redirected to this URL after the user logs out of Snipe-IT. This is useful to close the user sessions of your Authentication provider correctly.',
+    'login_remote_user_custom_logout_url_help' => 'Si se proporciona una url aquí, los usuarios serán redirigidos a esta URL después de que el usuario cierre la sesión de Snipe-IT. Esto es útil para cerrar correctamente las sesiones de usuario de su proveedor de autenticación.',
     'logo'                    	=> 'Logo',
-    'logo_print_assets'         => 'Use in Print',
-    'logo_print_assets_help'    => 'Use branding on printable asset lists ',
+    'logo_print_assets'         => 'Utilizar en impresión',
+    'logo_print_assets_help'    => 'Utilice la marca en las listas de activos imprimibles ',
     'full_multiple_companies_support_help_text' => 'Restringir usuarios (incluyendo administradores) asignados a compañías a sus activos de la compañía.',
     'full_multiple_companies_support_text' => 'Soporte Completo de Múltiples Compañías',
     'show_in_model_list'   => 'Mostrar en Modelos Desplegados',

resources/lang/es-VE/admin/users/general.php

@@ -2,8 +2,8 @@
 
 
 return array(
-    'activated_help_text' => 'This user can login',
-    'activated_disabled_help_text' => 'You cannot edit activation status for your own account.',
+    'activated_help_text' => 'Este usuario puede ingresar',
+    'activated_disabled_help_text' => 'No puedes editar el estado de activación de tu propia cuenta.',
     'assets_user'       => 'Activos asignados a :name',
     'bulk_update_warn'	=> 'Estas a punto de editar las propiedades de :user_count usuarios. Por favor, ten en cuenta que no puedes cambiar los atributos de tus usuarios usando este formulario, y debes editar tu propio usuario individualmente.',
     'bulk_update_help'	=> 'Este formulario te permite actualizar múltiples usuarios a la vez. Sólo llena los campos que necesites cambiar. Cualquier campo dejado en blanco permanecerá sin cambios.',

resources/lang/is/admin/accessories/general.php

@@ -13,7 +13,7 @@ return array(
     'eula_text_help'					=> 'Þessi reitur gerir þér kleift að sérsníða notendaskilmála fyrir ákveðinn búnað. Ef þú hefur aðeins einn notendaskilmála fyrir allan þinn búnað þá skaltu haka í reitinn fyrir neðan sem notar sömu skilmálana fyrir allann þann búnað.',
     'require_acceptance'				=> 'Kerfjast þess að notendur samþykki viðtöku búnaðs í þessum flokki.',
     'no_default_eula'					=> 'Fann enga sjálfgefna notendaskilmála. Vinsamlegast bættu þeim við í undir "Stillingar"',
-    'total'  							=> 'Heildar',
+    'total'  							=> 'Samtals',
     'remaining'  						=> 'Gagnslaust',
     'update'  							=> 'Uppfæra endabúnað',
     'use_default_eula'					=> 'Notaðu frekar <a href="#" data-toggle="modal" data-target="#eulaModal">',

resources/lang/is/admin/accessories/message.php

@@ -3,34 +3,34 @@
 return array(
 
     'does_not_exist' => 'Þessi aukabúnaður er ekki til.',
-    'assoc_users'	 => 'This accessory currently has :count items checked out to users. Please check in the accessories and and try again. ',
+    'assoc_users'	 => 'Þessi aukabúnaður er nú þegar: count items sem skráð eru á notendur. Vinsamlegast skráðu inn aukabúnaðinn og reyndu aftur! ',
 
     'create' => array(
-        'error'   => 'The accessory was not created, please try again.',
-        'success' => 'The accessory was successfully created.'
+        'error'   => 'Aukabúnaðurinn var ekki skráður, vinsamlegast reyndu aftur!',
+        'success' => 'Aukabúnaðurinn var skráður.'
     ),
 
     'update' => array(
-        'error'   => 'The accessory was not updated, please try again',
-        'success' => 'The accessory was updated successfully.'
+        'error'   => 'Aukabúnaðurinn var ekki uppfærður, vinsamlegast reyndu aftur!',
+        'success' => 'Aukabúnaðurinn var uppfærður.'
     ),
 
     'delete' => array(
-        'confirm'   => 'Are you sure you wish to delete this accessory?',
-        'error'   => 'There was an issue deleting the accessory. Please try again.',
-        'success' => 'The accessory was deleted successfully.'
+        'confirm'   => 'Viltu örugglega eyða þessum tiltekna aukabúnaði?',
+        'error'   => 'Það var eitthvað smá vesen að eyða aukabúnaðinum, vinsamlegast reyndu aftur.',
+        'success' => 'Aukabúnaðinum var eytt.'
     ),
 
      'checkout' => array(
-        'error'   		=> 'Accessory was not checked out, please try again',
-        'success' 		=> 'Accessory checked out successfully.',
-        'user_does_not_exist' => 'That user is invalid. Please try again.'
+        'error'   		=> 'Aukabúnaður fór ekki í úttekt, vinsamlegast reyndu aftur!',
+        'success' 		=> 'Aukabúnaður fór í úttekt.',
+        'user_does_not_exist' => 'Notandinn er ónothæfur. Vinsamlegast reyndu aftur.'
     ),
 
     'checkin' => array(
-        'error'   		=> 'Accessory was not checked in, please try again',
-        'success' 		=> 'Accessory checked in successfully.',
-        'user_does_not_exist' => 'That user is invalid. Please try again.'
+        'error'   		=> 'Aukabúnaði var ekki skilað, vinsamlegast reyndu aftur!',
+        'success' 		=> 'Aukabúnaði var skilað inn.',
+        'user_does_not_exist' => 'Þessi notandi er ónothæfur, vinsamlegast reyndu aftur.'
     )
 
 

resources/lang/is/admin/accessories/table.php

@@ -1,11 +1,11 @@
 <?php
 
 return array(
-	'dl_csv'      				=> 'Download CSV',
-	'eula_text'      			=> 'EULA',
-    'id'      					=> 'ID',
-    'require_acceptance'      	=> 'Acceptance',
-    'title'      				=> 'Accessory Name',
+	'dl_csv'      				=> 'Sækja CSV',
+	'eula_text'      			=> 'LSN',
+    'id'      					=> 'Auðkenni',
+    'require_acceptance'      	=> 'Samþykki',
+    'title'      				=> 'Nafn aukabúnaðar',
 
 
 );

resources/lang/is/admin/asset_maintenances/form.php

@@ -1,14 +1,14 @@
 <?php
 
     return [
-        'asset_maintenance_type' => 'Maintenance Type',
-        'title'                  => 'Title',
-        'start_date'             => 'Started',
+        'asset_maintenance_type' => 'Viðhaldgerð',
+        'title'                  => 'Titill',
+        'start_date'             => 'Hafið',
         'completion_date'        => 'Completed',
-        'cost'                   => 'Cost',
+        'cost'                   => 'Kostnaður',
         'is_warranty'            => 'Warranty Improvement',
-        'asset_maintenance_time' => 'Days',
-        'notes'                  => 'Notes',
-        'update'                 => 'Update',
-        'create'                 => 'Create'
+        'asset_maintenance_time' => 'Dagar',
+        'notes'                  => 'Athugasemdir',
+        'update'                 => 'Uppfæra',
+        'create'                 => 'Búa til'
     ];

resources/lang/it/admin/locations/table.php

@@ -3,8 +3,8 @@
 return array(
     'about_locations_title'     => 'Informazioni sulle posizioni',
     'about_locations'           => 'Le posizioni sono usate per tracciare la poszione degli utenti, degli asset, e di altri oggetti',
-    'assets_rtd'                => 'Asset', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted.
-    'assets_checkedout'         => 'Asset Assegnato',
+    'assets_rtd'                => 'Beni', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted.
+    'assets_checkedout'         => 'Bene Assegnato',
     'id'                        => 'ID',
     'city'                      => 'Città',
     'state'                     => 'Stato',

resources/lang/it/admin/settings/general.php

@@ -88,8 +88,8 @@ return array(
     'login_remote_user_custom_logout_url_text' => 'URL di logout personalizzato',
     'login_remote_user_custom_logout_url_help' => 'Se qui viene indicato un URL, gli utenti verranno reindirizzato a questo URL dopo essere usciti da Snipe-IT. Questo è utile per chiudere correttamente le sessioni dell\'utente.',
     'logo'                    	=> 'Logo',
-    'logo_print_assets'         => 'Use in Print',
-    'logo_print_assets_help'    => 'Use branding on printable asset lists ',
+    'logo_print_assets'         => 'Usa in stampa',
+    'logo_print_assets_help'    => 'Usa il brand sulla lista dei beni stampabili ',
     'full_multiple_companies_support_help_text' => 'Restringere gli utenti (amministratori inclusi) assegnati ad una azienda agli asset della propria azienda.',
     'full_multiple_companies_support_text' => 'Supporto completo ad aziende multiple',
     'show_in_model_list'   => 'Mostra in menu a discesa del modello',

resources/lang/it/passwords.php

@@ -2,6 +2,6 @@
 
 return [
     'sent'	        => 'Il tuo collegamento password è stato inviato!',
-    'user'			=> 'No matching active user found with that email.',
+    'user'			=> 'Non risulta nessun utente attivo con questa email.',
 ];
 

resources/lang/no/admin/categories/general.php

@@ -5,8 +5,8 @@ return array(
     'about_categories'  				=> 'Kategorier hjelper deg med å organisere ting. Eksempeler på kategorier kan være "Skrivebord", "Bærbare", "Mobiltelefon", "Tablet" og så videre, men du kan bruke kategorier som gir mening for deg.',
     'asset_categories' 					=> 'Kategorier',
     'category_name'  					=> 'Navn',
-    'checkin_email'                     => 'Send email to user on checkin/checkout.',
-    'checkin_email_notification'        => 'This user will be sent an email on checkin/checkout.',
+    'checkin_email'                     => 'Send epost til bruker ved innsjekking/utsjekking.',
+    'checkin_email_notification'        => 'Det vil bli sendt en e-post til bruker ved innsjekking/utsjekking.',
     'clone'                             => 'Klon kategori',
     'create'  							=> 'Opprett kategori',
     'edit'                              => 'Rediger kategori',

resources/lang/no/admin/hardware/form.php

@@ -38,7 +38,7 @@ return array(
     'tag'				=> 'Eiendelsmerke',
     'update'			=> 'Oppdater eiendel',
     'warranty'			=> 'Garanti',
-		'warranty_expires'		=> 'Warranty Expires',
+		'warranty_expires'		=> 'Garantien utløper',
     'years'				=> 'år',
 )
 ;

resources/lang/no/admin/models/general.php

@@ -14,5 +14,5 @@ return array(
     'view_models'               => 'Vis modeller',
     'fieldset'                  => 'Felt',
     'no_custom_field'           => 'Ingen egendefinerte felt',
-    'add_default_values'        => 'Add default values',
+    'add_default_values'        => 'Legg til standardverdier',
 );