Bumped version

Audit tweaks
Fixes #1190 - added basic audit workflow
2017-08-25 13:27:58 -07:00 · 2017-08-25 10:18:18 -07:00 · 2017-08-25 10:04:19 -07:00 · 2017-08-25 10:03:05 -07:00 · 2017-08-25 08:30:48 -07:00 · 2017-08-25 08:23:23 -07:00
410 changed files with 3788 additions and 902 deletions
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -80,7 +80,7 @@ class Handler extends ExceptionHandler

                }
            }
-            // Try to parse 500 Errors ina  bit nicer way when debug is enabled.
+            // Try to parse 500 Errors in a bit nicer way when debug is enabled.
            if (config('app.debug')) {
                return response()->json(Helper::formatStandardApiResponse('error', null, "An Error has occured! " . $e->getMessage()), 500);
            }
--- a/app/Helpers/Helper.php
+++ b/app/Helpers/Helper.php
@@ -683,12 +683,11 @@ class Helper
    public static function formatStandardApiResponse($status, $payload = null, $messages = null) {

        $array['status'] = $status;
-        ($payload) ? $array['payload'] = $payload : '';
-
+        $array['messages'] = $messages;
        if (($messages) && (count($messages) > 0)) {
            $array['messages'] = $messages;
        }
-
+        ($payload) ? $array['payload'] = $payload : $array['payload'] = null;
        return $array;
    }

--- a/app/Http/Controllers/Api/AssetsController.php
+++ b/app/Http/Controllers/Api/AssetsController.php
@@ -31,6 +31,7 @@ use TCPDF;
 use Validator;
 use View;

+
 /**
 * This class controls all actions related to assets for
 * the Snipe-IT Asset Management application.
@@ -231,7 +232,8 @@ class AssetsController extends Controller
     */
    public function store(AssetRequest $request)
    {
-        // $this->authorize('create', Asset::class);
+
+        $this->authorize('create', Asset::class);

        $asset = new Asset();
        $asset->model()->associate(AssetModel::find((int) $request->get('model_id')));
@@ -279,6 +281,7 @@ class AssetsController extends Controller
            }
            return response()->json(Helper::formatStandardApiResponse('success', $asset, trans('admin/hardware/message.create.success')));
        }
+
        return response()->json(Helper::formatStandardApiResponse('error', null, $asset->getErrors()), 200);
    }

@@ -494,4 +497,33 @@ class AssetsController extends Controller

        return response()->json(Helper::formatStandardApiResponse('success', ['asset'=> e($asset->asset_tag)], trans('admin/hardware/message.checkin.error')));
    }
+
+
+    /**
+     * Mark an asset as audited
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @param int $id
+     * @since [v4.0]
+     * @return JsonResponse
+     */
+    public function audit(Request $request, $id) {
+
+        $this->authorize('audit', Asset::class);
+
+        $rules = array(
+            'id'     => 'required'
+        );
+
+        $validator = \Validator::make($request->all(), $rules);
+
+        $asset = Asset::findOrFail($id);
+        $asset->next_audit_date = $request->input('next_audit_date');
+
+        if ($asset->save()) {
+            $asset->logAudit(request('note'));
+            return response()->json(Helper::formatStandardApiResponse('success', ['asset'=> e($asset->asset_tag)], trans('admin/hardware/message.audit.success')));
+        }
+
+    }
 }
--- a/app/Http/Controllers/Api/LocationsController.php
+++ b/app/Http/Controllers/Api/LocationsController.php
@@ -21,7 +21,7 @@ class LocationsController extends Controller
    {
        $this->authorize('view', Location::class);
        $allowed_columns = ['id','name','address','address2','city','state','country','zip','created_at',
-        'updated_at','parent_id'];
+        'updated_at','parent_id', 'manager_id'];

        $locations = Location::select([
            'locations.id',
@@ -33,6 +33,7 @@ class LocationsController extends Controller
            'locations.zip',
            'locations.country',
            'locations.parent_id',
+            'locations.manager_id',
            'locations.created_at',
            'locations.updated_at',
            'locations.currency'
--- a/app/Http/Controllers/Api/ReportsController.php
+++ b/app/Http/Controllers/Api/ReportsController.php
@@ -36,6 +36,10 @@ class ReportsController extends Controller
                ->where('item_type','=',"App\\Models\\".ucwords($request->input('item_type')));
        }

+        if ($request->has('action_type')) {
+            $actionlogs = $actionlogs->where('action_type','=',$request->input('action_type'))->orderBy('created_at', 'desc');
+        }
+
        $allowed_columns = [
            'id',
            'created_at'
--- a/app/Http/Controllers/AssetsController.php
+++ b/app/Http/Controllers/AssetsController.php
@@ -595,9 +595,12 @@ class AssetsController extends Controller
    */
    public function show($assetId = null)
    {
+
        $asset = Asset::withTrashed()->find($assetId);
-        $settings = Setting::getSettings();
        $this->authorize('view', $asset);
+        $settings = Setting::getSettings();
+        $audit_log = Actionlog::where('action_type','=','audit')->where('item_id','=',$assetId)->where('item_type','=',Asset::class)->orderBy('created_at','DESC')->first();
+

        if (isset($asset)) {

@@ -617,7 +620,8 @@ class AssetsController extends Controller
                'url' => route('qr_code/hardware', $asset->id)
            );

-            return view('hardware/view', compact('asset', 'qr_code', 'settings'))->with('use_currency', $use_currency);
+            return view('hardware/view', compact('asset', 'qr_code', 'settings'))
+                ->with('use_currency', $use_currency)->with('audit_log',$audit_log);
        }

        return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.does_not_exist', compact('id')));
@@ -1233,4 +1237,29 @@ class AssetsController extends Controller
          // Redirect to the asset management page with error
            return redirect()->to("hardware/bulk-checkout")->with('error', trans('admin/hardware/message.checkout.error'))->withErrors($errors);
    }
+
+    public function audit(Request $request, $id)
+    {
+        $this->authorize('audit', Asset::class);
+
+        $dt = Carbon::now()->addMonths(12)->toDateString();
+
+        $asset = Asset::findOrFail($id);
+        return view('hardware/audit')->with('asset', $asset)->with('next_audit_date', $dt);
+    }
+
+    public function auditStore(Request $request, $id)
+    {
+        $this->authorize('audit', Asset::class);
+
+        $asset = Asset::findOrFail($id);
+        $asset->next_audit_date = $request->input('next_audit_date');
+
+        if ($asset->save()) {
+            $asset->logAudit(request('note'));
+            return redirect()->to("hardware")->with('success', trans('admin/hardware/message.audit.success'));
+        }
+    }
+
+
 }
--- a/app/Http/Controllers/LocationsController.php
+++ b/app/Http/Controllers/LocationsController.php
@@ -63,7 +63,8 @@ class LocationsController extends Controller

        return view('locations/edit')
            ->with('location_options', $location_options)
-            ->with('item', new Location);
+            ->with('item', new Location)
+            ->with('manager_list', Helper::managerList());
    }


@@ -88,6 +89,7 @@ class LocationsController extends Controller
        $location->state            = Input::get('state');
        $location->country          = Input::get('country');
        $location->zip              = Input::get('zip');
+        $location->manager_id       = Input::get('manager_id');
        $location->user_id          = Auth::id();

        if ($location->save()) {
@@ -154,7 +156,10 @@ class LocationsController extends Controller
        $location_options = Location::flattenLocationsArray($location_options_array);
        $location_options = array('' => 'Top Level') + $location_options;

-        return view('locations/edit', compact('item'))->with('location_options', $location_options);
+
+        return view('locations/edit', compact('item'))
+            ->with('location_options', $location_options)
+            ->with('manager_list', Helper::managerList());
    }


@@ -185,6 +190,7 @@ class LocationsController extends Controller
        $location->country      = Input::get('country');
        $location->zip          = Input::get('zip');
        $location->ldap_ou      = Input::get('ldap_ou');
+        $location->manager_id   = Input::get('manager_id');

        // Was the location updated?
        if ($location->save()) {
@@ -232,8 +238,6 @@ class LocationsController extends Controller
    * the content for the locations detail page.
    *
    * @author [A. Gianotto] [<snipe@snipe.net>]
-    * @see LocationsController::getDataViewUsers() method that returns JSON for location users
-    * @see LocationsController::getDataViewAssets() method that returns JSON for location assets
    * @param int $locationId
    * @since [v1.0]
    * @return \Illuminate\Contracts\View\View
@@ -252,78 +256,4 @@ class LocationsController extends Controller
        return redirect()->route('locations.index')->with('error', $error);
    }

-
-    /**
-     * Returns a JSON response that contains the users association with the
-     * selected location, to be used by the location detail view.
-     *
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @see LocationsController::getView() method that creates the display view
-     * @param $locationID
-     * @return array
-     * @internal param int $locationId
-     * @since [v1.8]
-     */
-    public function getDataViewUsers($locationID)
-    {
-        $location = Location::find($locationID);
-        $users = User::where('location_id', '=', $location->id);
-
-        if (Input::has('search')) {
-            $users = $users->TextSearch(e(Input::get('search')));
-        }
-
-        $users = $users->get();
-        $rows = array();
-
-        foreach ($users as $user) {
-            $rows[] = array(
-              'name' => (string)link_to_route('users.show', e($user->present()->fullName()), ['user'=>$user->id])
-              );
-        }
-
-        $data = array('total' => $users->count(), 'rows' => $rows);
-
-        return $data;
-    }
-
-
-    /**
-    * Returns a JSON response that contains the assets association with the
-    * selected location, to be used by the location detail view.
-    *
-    * @todo This is broken for accessories and consumables.
-    * @todo This is a very naive implementation. Should clean this up with query scopes.
-    * @author [A. Gianotto] [<snipe@snipe.net>]
-    * @see LocationsController::getView() method that creates the display view
-    * @param int $locationID
-    * @since [v1.8]
-    * @return array
-     */
-    public function getDataViewAssets($locationID)
-    {
-        $location = Location::find($locationID)->load('assignedassets.model');
-        $assets = Asset::AssetsByLocation($location);
-
-        if (Input::has('search')) {
-            $assets = $assets->TextSearch(e(Input::get('search')));
-        }
-
-        $assets = $assets->get();
-
-        $rows = array();
-
-        foreach ($assets as $asset) {
-            $rows[] = [
-                'name' => (string)link_to_route('hardware.show', e($asset->present()->name()), ['hardware' => $asset->id]),
-                'asset_tag' => e($asset->asset_tag),
-                'serial' => e($asset->serial),
-                'model' => e($asset->model->name),
-            ];
-        }
-
-        $data = array('total' => $assets->count(), 'rows' => $rows);
-        return $data;
-
-    }
 }
--- a/app/Http/Controllers/ReportsController.php
+++ b/app/Http/Controllers/ReportsController.php
@@ -271,6 +271,20 @@ class ReportsController extends Controller

    }

+
+    /**
+     * Displays audit report.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @return View
+     */
+    public function audit()
+    {
+        return view('reports/audit');
+    }
+
+
    /**
    * Displays activity report.
    *
--- a/app/Http/Controllers/SettingsController.php
+++ b/app/Http/Controllers/SettingsController.php
@@ -184,6 +184,7 @@ class SettingsController extends Controller
        $settings->site_name = e(Input::get('site_name'));
        $settings->alert_email = e(Input::get('email'));
        $settings->alerts_enabled = 1;
+        $settings->pwd_secure_min = 10;
        $settings->brand = 1;
        $settings->locale = 'en';
        $settings->default_currency = 'USD';
--- a/app/Http/Controllers/UsersController.php
+++ b/app/Http/Controllers/UsersController.php
@@ -376,7 +376,6 @@ class UsersController extends Controller
            }

            if ($user->licenses()->count() > 0) {
-
                // Redirect to the user management page
                return redirect()->route('users.index')->with('error', 'This user still has ' . $user->licenses()->count() . ' licenses associated with them.');
            }
@@ -386,6 +385,11 @@ class UsersController extends Controller
                return redirect()->route('users.index')->with('error', 'This user still has ' . $user->accessories()->count() . ' accessories associated with them.');
            }

+            if ($user->managedLocations()->count() > 0) {
+                // Redirect to the user management page
+                return redirect()->route('users.index')->with('error', 'This user still has ' . $user->managedLocations()->count() . ' locations that they manage.');
+            }
+
            // Delete the user
            $user->delete();

--- a/app/Http/Transformers/ActionlogsTransformer.php
+++ b/app/Http/Transformers/ActionlogsTransformer.php
@@ -29,6 +29,7 @@ class ActionlogsTransformer
            ] : null,
            'created_at'    => Helper::getFormattedDateObject($actionlog->created_at, 'datetime'),
            'updated_at'    => Helper::getFormattedDateObject($actionlog->updated_at, 'datetime'),
+            'next_audit_date' => ($actionlog->itemType()=='asset') ? Helper::getFormattedDateObject($actionlog->item->next_audit_date, 'datetime'): null,
            'action_type'   => $actionlog->present()->actionType(),
            'admin' => ($actionlog->user) ? [
                'id' => (int) $actionlog->user->id,
--- a/app/Http/Transformers/LocationsTransformer.php
+++ b/app/Http/Transformers/LocationsTransformer.php
@@ -9,7 +9,7 @@ use App\Helpers\Helper;
 class LocationsTransformer
 {

-    public function transformLocations (Collection $locations, $total)
+    public function transformLocations(Collection $locations, $total)
    {
        $array = array();
        foreach ($locations as $location) {
@@ -18,18 +18,16 @@ class LocationsTransformer
        return (new DatatablesTransformer)->transformDatatables($array, $total);
    }

-    public function transformLocation (Location $location = null)
+    public function transformLocation(Location $location = null)
    {
        if ($location) {

-            $assets_arr = [];
-            foreach($location->assets() as $asset) {
-                $assets_arr = ['id' => $asset->id];
-            }
-            
            $children_arr = [];
-            foreach($location->childLocations() as $child) {
-                $children_arr = ['id' => $child->id];
+            foreach($location->childLocations as $child) {
+                $children_arr[] = [
+                    'id' => (int) $child->id,
+                    'name' => $child->name
+                ];
            }

            $array = [
@@ -41,13 +39,15 @@ class LocationsTransformer
                'assets_checkedout' => $location->assets()->count(),
                'assets_default'    => $location->assignedassets()->count(),
                'country' => e($location->country),
-                'assets' => $assets_arr,
                'created_at' => Helper::getFormattedDateObject($location->created_at, 'datetime'),
                'updated_at' => Helper::getFormattedDateObject($location->updated_at, 'datetime'),
                'parent' => ($location->parent) ? [
                    'id' => (int) $location->parent->id,
                    'name'=> e($location->parent->name)
                ] : null,
+                'manager' => ($location->manager) ? (new UsersTransformer)->transformUser($location->manager) : null,
+
+
                'children' => $children_arr,
            ];

--- a/app/Models/Accessory.php
+++ b/app/Models/Accessory.php
@@ -60,6 +60,8 @@ class Accessory extends SnipeModel
        'purchase_cost',
        'purchase_date',
        'model_number',
+        'manufacturer_id',
+        'notes',
        'qty',
        'requestable'
    ];
--- a/app/Models/Asset.php
+++ b/app/Models/Asset.php
@@ -276,13 +276,17 @@ class Asset extends Depreciable
        if (!empty($this->assignedType())) {
            if ($this->assignedType() == self::ASSET) {
                return $this->assignedTo->assetloc(); // Recurse until we have a final location
-            } elseif ($this->assignedType() == self::LOCATION) {
+            }
+            if ($this->assignedType() == self::LOCATION) {
                return $this->assignedTo();
            } elseif (!$this->assignedTo) {
                return $this->defaultLoc();
            } elseif ($this->assignedType() == self::USER) {
                return $this->assignedTo->userLoc();
            }
+            if ($this->assignedType() == self::USER) {
+                return $this->assignedTo->userLoc();
+            }
        }
        return $this->defaultLoc();
    }
@@ -1088,7 +1092,7 @@ class Asset extends Depreciable
        return $query->where(function ($query) use ($search) {
            $query->whereHas('defaultLoc', function ($query) use ($search) {
                $query->where('locations.id', '=', $search);
-            })->whereNull('assigned_to');
+            });
        })->orWhere(function ($query) use ($search) {
            $query->whereHas('assigneduser', function ($query) use ($search) {
                $query->whereHas('userloc', function ($query) use ($search) {
--- a/app/Models/Location.php
+++ b/app/Models/Location.php
@@ -24,6 +24,7 @@ class Location extends SnipeModel
      'address'         => 'max:80|nullable',
      'address2'        => 'max:80|nullable',
      'zip'         => 'min:3|max:10|nullable',
+      // 'manager_id'  => 'exists:users'
    );

    /**
@@ -63,7 +64,12 @@ class Location extends SnipeModel

    public function parent()
    {
-        return $this->belongsTo('\App\Models\Location', 'parent_id');
+        return $this->belongsTo('\App\Models\Location', 'parent_id','id');
+    }
+
+    public function manager()
+    {
+        return $this->belongsTo('\App\Models\User', 'manager_id');
    }

    public function childLocations()
--- a/app/Models/Loggable.php
+++ b/app/Models/Loggable.php
@@ -7,6 +7,7 @@ use App\Models\Asset;
 use App\Models\CheckoutRequest;
 use App\Models\User;
 use App\Notifications\CheckinNotification;
+use App\Notifications\AuditNotification;
 use App\Notifications\CheckoutNotification;
 use Illuminate\Support\Facades\Auth;

@@ -120,6 +121,38 @@ trait Loggable
        return $log;
    }

+
+    /**
+     * @author  A. Gianotto <snipe@snipe.net>
+     * @since [v4.0]
+     * @return \App\Models\Actionlog
+     */
+    public function logAudit($note)
+    {
+        $log = new Actionlog;
+        if (static::class == LicenseSeat::class) {
+            $log->item_type = License::class;
+            $log->item_id = $this->license_id;
+        } else {
+            $log->item_type = static::class;
+            $log->item_id = $this->id;
+        }
+        $log->location_id = null;
+        $log->note = $note;
+        $log->user_id = Auth::user()->id;
+        $log->logaction('audit');
+
+        $params = [
+            'item' => $log->item,
+            'admin' => $log->user,
+            'note' => $note
+        ];
+        Setting::getSettings()->notify(new AuditNotification($params));
+
+        return $log;
+    }
+
+
    /**
     * @author  Daniel Meltzer <parallelgrapefruit@gmail.com
     * @since [v3.5]
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -205,6 +205,14 @@ class User extends SnipeModel implements AuthenticatableContract, CanResetPasswo
        return $this->belongsTo('\App\Models\User', 'manager_id')->withTrashed();
    }

+    /**
+     * Get any locations the user manages.
+     **/
+    public function managedLocations()
+    {
+        return $this->hasMany('\App\Models\Location', 'manager_id')->withTrashed();
+    }
+
    /**
     * Get user groups
     */
--- a/app/Notifications/AuditNotification.php
+++ b/app/Notifications/AuditNotification.php
@@ -0,0 +1,90 @@
+<?php
+
+namespace App\Notifications;
+
+use App\Models\Setting;
+use Illuminate\Bus\Queueable;
+use Illuminate\Notifications\Messages\SlackMessage;
+use Illuminate\Notifications\Notification;
+use Illuminate\Notifications\Messages\MailMessage;
+
+class AuditNotification extends Notification
+{
+    use Queueable;
+    /**
+     * @var
+     */
+    private $params;
+
+    /**
+     * Create a new notification instance.
+     *
+     * @param $params
+     */
+    public function __construct($params)
+    {
+        //
+        $this->params = $params;
+    }
+
+    /**
+     * Get the notification's delivery channels.
+     *
+     * @param  mixed  $notifiable
+     * @return array
+     */
+    public function via($notifiable)
+    {
+        $notifyBy = [];
+        if (Setting::getSettings()->slack_endpoint) {
+            $notifyBy[] = 'slack';
+        }
+
+        return $notifyBy;
+    }
+
+    public function toSlack($notifiable)
+    {
+
+        return (new SlackMessage)
+            ->success()
+            ->content(class_basename(get_class($this->params['item'])) . " Audited")
+            ->attachment(function ($attachment) use ($notifiable) {
+                $item = $this->params['item'];
+                $admin_user = $this->params['admin'];
+                $fields = [
+                    'By' => '<'.$admin_user->present()->viewUrl().'|'.$admin_user->present()->fullName().'>'
+                ];
+                array_key_exists('note', $this->params) && $fields['Notes'] = $this->params['note'];
+
+                $attachment->title($item->name, $item->present()->viewUrl())
+                    ->fields($fields);
+            });
+    }
+    /**
+     * Get the mail representation of the notification.
+     *
+     * @param  mixed  $notifiable
+     * @return \Illuminate\Notifications\Messages\MailMessage
+     */
+    public function toMail($notifiable)
+    {
+        return (new MailMessage)
+            ->line('The introduction to the notification.')
+            ->action('Notification Action', 'https://laravel.com')
+            ->line('Thank you for using our application!');
+    }
+
+    /**
+     * Get the array representation of the notification.
+     *
+     * @param  mixed  $notifiable
+     * @return array
+     */
+    public function toArray($notifiable)
+    {
+        return [
+            //
+        ];
+    }
+}
--- a/app/Observers/AssetObserver.php
+++ b/app/Observers/AssetObserver.php
@@ -20,6 +20,7 @@ class AssetObserver


        if ((isset($asset->getOriginal()['assigned_to'])) && ($asset->getAttributes()['assigned_to'] == $asset->getOriginal()['assigned_to'])
+            && ($asset->getAttributes()['next_audit_date'] == $asset->getOriginal()['next_audit_date'])
            && ($asset->getAttributes()['last_checkout'] == $asset->getOriginal()['last_checkout'])
            && ($asset->getAttributes()['status_id'] == $asset->getOriginal()['status_id']))
        {
--- a/app/Presenters/LocationPresenter.php
+++ b/app/Presenters/LocationPresenter.php
@@ -42,4 +42,8 @@ class LocationPresenter extends Presenter
    {
        return '<i class="fa fa-globe"></i>';
    }
+    
+    public function fullName() {
+        return $this->name;
+    }
 }
--- a/config/permissions.php
+++ b/config/permissions.php
@@ -85,8 +85,8 @@ return array(
        array(
            'permission' => 'assets.audit',
            'label'      => 'Audit ',
-            'note'       => '',
-            'display'    => false,
+            'note'       => 'Allows the user to mark an asset as physically inventoried.',
+            'display'    => true,
        ),


--- a/config/version.php
+++ b/config/version.php
@@ -1,7 +1,7 @@
 <?php
 return array (
  'app_version' => 'v4.0',
-  'build_version' => 'beta 2',
-  'hash_version' => '46',
-  'full_hash' => 'v4.0-beta-246-g73ce5f9',
+  'build_version' => 'beta3',
+  'hash_version' => '22',
+  'full_hash' => 'v4.0-beta3-22-gbd02b9e',
 );
--- a/database/factories/ModelFactory.php
+++ b/database/factories/ModelFactory.php
@@ -210,5 +210,6 @@ $factory->define(App\Models\Setting::class, function ($faker) {
        'brand' => 1,
        'default_currency' => $faker->currencyCode,
        'locale' => $faker->locale,
+        'pwd_secure_min' => 5,
    ];
 });
--- a/database/migrations/2017_05_22_233509_add_manager_to_locations_table.php
+++ b/database/migrations/2017_05_22_233509_add_manager_to_locations_table.php
@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddManagerToLocationsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('locations', function (Blueprint $table) {
+            //
+            $table->integer('manager_id')->nullable()->default(null);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('locations', function (Blueprint $table) {
+            //
+            $table->dropColumn('manager_id');
+        });
+    }
+}
--- a/database/migrations/2017_08_03_160105_set_asset_archived_to_zero_default.php
+++ b/database/migrations/2017_08_03_160105_set_asset_archived_to_zero_default.php
@@ -13,6 +13,9 @@ class SetAssetArchivedToZeroDefault extends Migration
     */
    public function up()
    {
+        $platform = Schema::getConnection()->getDoctrineSchemaManager()->getDatabasePlatform();
+        $platform->registerDoctrineTypeMapping('enum', 'string');
+
        Schema::table('assets', function (Blueprint $table) {
            $table->boolean('archived')->default(0)->change();
        });
--- a/database/migrations/2017_08_25_074822_add_auditing_tables.php
+++ b/database/migrations/2017_08_25_074822_add_auditing_tables.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddAuditingTables extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('assets', function (Blueprint $table) {
+            $table->date('next_audit_date')->nullable()->default(NULL);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('assets', function (Blueprint $table) {
+            $table->dropColumn('next_audit_date');
+        });
+    }
+}
--- a/resources/lang/af/admin/asset_maintenances/message.php
+++ b/resources/lang/af/admin/asset_maintenances/message.php
@@ -12,8 +12,8 @@
            'success' => 'Asset Maintenance created successfully.'
        ],
        'edit'                       => [
-            'error'   => 'Asset Maintenance was not edited, please try again.',
-            'success' => 'Asset Maintenance edited successfully.'
+            'error'   => 'Asset Maintenance was not created, please try again.',
+            'success' => 'Asset Maintenance created successfully.'
        ],
        'asset_maintenance_incomplete' => 'Not Completed Yet',
        'warranty'                     => 'Warranty',
--- a/resources/lang/af/admin/custom_fields/message.php
+++ b/resources/lang/af/admin/custom_fields/message.php
@@ -28,7 +28,7 @@ return array(

    'fieldset' => array(

-
+        'does_not_exist' => 'Fieldset does not exist',

        'create' => array(
            'error'   => 'Fieldset was not created, please try again.',
--- a/resources/lang/af/admin/settings/general.php
+++ b/resources/lang/af/admin/settings/general.php
@@ -63,6 +63,8 @@ return array(
    'ldap_email'                => 'LDAP Email',
    'load_remote_text'          => 'Remote Scripts',
    'load_remote_help_text'		=> 'This Snipe-IT install can load scripts from the outside world.',
+    'login_note'                => 'Login Note',
+    'login_note_help'           => 'Optionally include a few sentences on your login screen, for example to assist people who have found a lost or stolen device. This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>',
    'logo'                    	=> 'Logo',
    'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.',
    'full_multiple_companies_support_text' => 'Full Multiple Companies Support',
@@ -71,6 +73,12 @@ return array(
    'php'                       => 'PHP Version',
    'php_gd_info'               => 'You must install php-gd to display QR codes, see install instructions.',
    'php_gd_warning'            => 'PHP Image Processing and GD plugin is NOT installed.',
+    'pwd_secure_complexity'     => 'Password Complexity',
+    'pwd_secure_complexity_help' => 'Select whichever password complexity rules you wish to enforce.',
+    'pwd_secure_min'            => 'Password minimum characters',
+    'pwd_secure_min_help'       => 'Minimum permitted value is 5',
+    'pwd_secure_uncommon'       => 'Prevent common passwords',
+    'pwd_secure_uncommon_help'  => 'This will disallow users from using common passwords from the top 10,000 passwords reported in breaches.',
    'qr_help'                   => 'Enable QR Codes first to set this',
    'qr_text'                   => 'QR Code Text',
    'setting'                   => 'Setting',
@@ -105,6 +113,8 @@ return array(
    'width_w'        => 'w',
    'height_h'        => 'h',
    'text_pt'        => 'pt',
+    'thumbnail_max_h'   => 'Max thumbnail height',
+    'thumbnail_max_h_help'   => 'Maximum height in pixels that thumbnails may display in the listing view. Min 25, max 500.',
    'two_factor'        => 'Two Factor Authentication',
    'two_factor_secret'        => 'Two-Factor Code',
    'two_factor_enrollment'        => 'Two-Factor Enrollment',
--- a/resources/lang/af/admin/users/message.php
+++ b/resources/lang/af/admin/users/message.php
@@ -31,6 +31,7 @@ return array(
        'create' => 'There was an issue creating the user. Please try again.',
        'update' => 'There was an issue updating the user. Please try again.',
        'delete' => 'There was an issue deleting the user. Please try again.',
+        'delete_has_assets' => 'This user has items assigned and could not be deleted.',
        'unsuspend' => 'There was an issue unsuspending the user. Please try again.',
        'import'    => 'There was an issue importing users. Please try again.',
        'asset_already_accepted' => 'This asset has already been accepted.',
@@ -40,6 +41,7 @@ return array(
        'ldap_could_not_bind' => 'Could not bind to the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server: ',
        'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
        'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
+        'password_ldap' => 'The password for this account is managed by LDAP/Active Directory. Please contact your IT department to change your password. ',
    ),

    'deletefile' => array(
--- a/resources/lang/af/admin/users/table.php
+++ b/resources/lang/af/admin/users/table.php
@@ -19,6 +19,7 @@ return array(
    'location'  			=> 'Location',
    'lock_passwords'		=> 'Login details cannot be changed on this installation.',
    'manager' 				=> 'Manager',
+    'managed_locations'     => 'Managed Locations',
    'name' 					=> 'Name',
    'notes'                 => 'Notes',
    'password_confirm' 		=> 'Confirm Password',
--- a/resources/lang/af/validation.php
+++ b/resources/lang/af/validation.php
@@ -35,6 +35,8 @@ return array(
    "email"            => "The :attribute format is invalid.",
    "exists"           => "The selected :attribute is invalid.",
    "email_array"      => "One or more email addresses is invalid.",
+    "hashed_pass"      => "Your current password is incorrect",
+    'dumbpwd'          => 'That password is too common.',
    "image"            => "The :attribute must be an image.",
    "in"               => "The selected :attribute is invalid.",
    "integer"          => "The :attribute must be an integer.",
--- a/resources/lang/ar/admin/asset_maintenances/message.php
+++ b/resources/lang/ar/admin/asset_maintenances/message.php
@@ -12,8 +12,8 @@
            'success' => 'تم إنشاء سند صيانة الأصل بنجاح.'
        ],
        'edit'                       => [
-            'error'   => 'Asset Maintenance was not edited, please try again.',
-            'success' => 'Asset Maintenance edited successfully.'
+            'error'   => 'Asset Maintenance was not created, please try again.',
+            'success' => 'Asset Maintenance created successfully.'
        ],
        'asset_maintenance_incomplete' => 'لم يكتمل بعد',
        'warranty'                     => 'الضمان',
--- a/resources/lang/ar/admin/custom_fields/message.php
+++ b/resources/lang/ar/admin/custom_fields/message.php
@@ -28,7 +28,7 @@ return array(

    'fieldset' => array(

-
+        'does_not_exist' => 'Fieldset does not exist',

        'create' => array(
            'error'   => 'لم يتم إنشاء مجموعة-الحقول، الرجاء المحاولة مرة اخرى.',
--- a/resources/lang/ar/admin/settings/general.php
+++ b/resources/lang/ar/admin/settings/general.php
@@ -63,6 +63,8 @@ return array(
    'ldap_email'                => 'LDAP Email',
    'load_remote_text'          => 'Remote Scripts',
    'load_remote_help_text'		=> 'This Snipe-IT install can load scripts from the outside world.',
+    'login_note'                => 'Login Note',
+    'login_note_help'           => 'Optionally include a few sentences on your login screen, for example to assist people who have found a lost or stolen device. This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>',
    'logo'                    	=> 'Logo',
    'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.',
    'full_multiple_companies_support_text' => 'Full Multiple Companies Support',
@@ -71,6 +73,12 @@ return array(
    'php'                       => 'PHP Version',
    'php_gd_info'               => 'You must install php-gd to display QR codes, see install instructions.',
    'php_gd_warning'            => 'PHP Image Processing and GD plugin is NOT installed.',
+    'pwd_secure_complexity'     => 'Password Complexity',
+    'pwd_secure_complexity_help' => 'Select whichever password complexity rules you wish to enforce.',
+    'pwd_secure_min'            => 'Password minimum characters',
+    'pwd_secure_min_help'       => 'Minimum permitted value is 5',
+    'pwd_secure_uncommon'       => 'Prevent common passwords',
+    'pwd_secure_uncommon_help'  => 'This will disallow users from using common passwords from the top 10,000 passwords reported in breaches.',
    'qr_help'                   => 'Enable QR Codes first to set this',
    'qr_text'                   => 'QR Code Text',
    'setting'                   => 'Setting',
@@ -105,6 +113,8 @@ return array(
    'width_w'        => 'w',
    'height_h'        => 'h',
    'text_pt'        => 'pt',
+    'thumbnail_max_h'   => 'Max thumbnail height',
+    'thumbnail_max_h_help'   => 'Maximum height in pixels that thumbnails may display in the listing view. Min 25, max 500.',
    'two_factor'        => 'Two Factor Authentication',
    'two_factor_secret'        => 'Two-Factor Code',
    'two_factor_enrollment'        => 'Two-Factor Enrollment',
--- a/resources/lang/ar/admin/users/message.php
+++ b/resources/lang/ar/admin/users/message.php
@@ -31,6 +31,7 @@ return array(
        'create' => 'حدث خطأ ما أثناء إنشاء هذا المستخدم. حاول مرة أخرى.',
        'update' => 'حدث خطأ أثناء تحديث هذا المستخدم. حاول مرة أخرى.',
        'delete' => 'حدث خطأ ما أثناء حذف هذا المستخدم. حاول مرة أخرى.',
+        'delete_has_assets' => 'This user has items assigned and could not be deleted.',
        'unsuspend' => 'حدث خطأ ما أثناء إلغاء التعليق عن المستخدم. حاول مرة أخرى.',
        'import'    => 'حدث خطأ أثناء استيراد المستخدمين. حاول مرة أخرى.',
        'asset_already_accepted' => 'هذا الجهاز تم قبوله مسبقاً.',
@@ -40,6 +41,7 @@ return array(
        'ldap_could_not_bind' => 'Could not bind to the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server: ',
        'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
        'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
+        'password_ldap' => 'The password for this account is managed by LDAP/Active Directory. Please contact your IT department to change your password. ',
    ),

    'deletefile' => array(
--- a/resources/lang/ar/admin/users/table.php
+++ b/resources/lang/ar/admin/users/table.php
@@ -19,6 +19,7 @@ return array(
    'location'  			=> 'الموقع',
    'lock_passwords'		=> 'لا يمكن تغيير تفاصيل الدخول بالنسبة لهذا التنصيب.',
    'manager' 				=> 'المدير',
+    'managed_locations'     => 'Managed Locations',
    'name' 					=> 'الاسم',
    'notes'                 => 'مُلاحظات',
    'password_confirm' 		=> 'تأكيد كلمة المرور',
--- a/resources/lang/ar/validation.php
+++ b/resources/lang/ar/validation.php
@@ -35,6 +35,8 @@ return array(
    "email"            => "The :attribute format is invalid.",
    "exists"           => "The selected :attribute is invalid.",
    "email_array"      => "One or more email addresses is invalid.",
+    "hashed_pass"      => "Your current password is incorrect",
+    'dumbpwd'          => 'That password is too common.',
    "image"            => "The :attribute must be an image.",
    "in"               => "The selected :attribute is invalid.",
    "integer"          => "The :attribute must be an integer.",
--- a/resources/lang/bg/admin/asset_maintenances/message.php
+++ b/resources/lang/bg/admin/asset_maintenances/message.php
@@ -12,8 +12,8 @@
            'success' => 'Поддръжката на актив създадена успешно.'
        ],
        'edit'                       => [
-            'error'   => 'Поддръжката на активи не беше редактирана, моля опитайте отново.',
-            'success' => 'Поддръжката на активи редактирана успешно.'
+            'error'   => 'Asset Maintenance was not created, please try again.',
+            'success' => 'Asset Maintenance created successfully.'
        ],
        'asset_maintenance_incomplete' => 'Все още неприключила',
        'warranty'                     => 'Гаранция',
--- a/resources/lang/bg/admin/custom_fields/message.php
+++ b/resources/lang/bg/admin/custom_fields/message.php
@@ -28,7 +28,7 @@ return array(

    'fieldset' => array(

-
+        'does_not_exist' => 'Fieldset does not exist',

        'create' => array(
            'error'   => 'Fieldset не беше създаден, моля опитайте отново.',
--- a/resources/lang/bg/admin/settings/general.php
+++ b/resources/lang/bg/admin/settings/general.php
@@ -63,6 +63,8 @@ return array(
    'ldap_email'                => 'LDAP електронна поща',
    'load_remote_text'          => 'Отдалечени скриптове',
    'load_remote_help_text'		=> 'Тази Snipe-IT инсталация може да зарежда и изпълнява външни скриптове.',
+    'login_note'                => 'Login Note',
+    'login_note_help'           => 'Optionally include a few sentences on your login screen, for example to assist people who have found a lost or stolen device. This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>',
    'logo'                    	=> 'Лого',
    'full_multiple_companies_support_help_text' => 'Ограничаване на потребителите (включително административните) до активите на собствената им компания.',
    'full_multiple_companies_support_text' => 'Поддръжка на множество компании',
@@ -71,6 +73,12 @@ return array(
    'php'                       => 'PHP версия',
    'php_gd_info'               => 'Необходимо е да инсталирате php-gd, за да визуализирате QR кодове. Моля прегледайте инструкцията за инсталация.',
    'php_gd_warning'            => 'php-gd НЕ е инсталиран.',
+    'pwd_secure_complexity'     => 'Password Complexity',
+    'pwd_secure_complexity_help' => 'Select whichever password complexity rules you wish to enforce.',
+    'pwd_secure_min'            => 'Password minimum characters',
+    'pwd_secure_min_help'       => 'Minimum permitted value is 5',
+    'pwd_secure_uncommon'       => 'Prevent common passwords',
+    'pwd_secure_uncommon_help'  => 'This will disallow users from using common passwords from the top 10,000 passwords reported in breaches.',
    'qr_help'                   => 'Първо включете QR кодовете, за да извършите тези настройки.',
    'qr_text'                   => 'Съдържание на QR код',
    'setting'                   => 'Настройка',
@@ -105,6 +113,8 @@ return array(
    'width_w'        => 'w',
    'height_h'        => 'h',
    'text_pt'        => 'pt',
+    'thumbnail_max_h'   => 'Max thumbnail height',
+    'thumbnail_max_h_help'   => 'Maximum height in pixels that thumbnails may display in the listing view. Min 25, max 500.',
    'two_factor'        => 'Двуфакторно удостоверяване',
    'two_factor_secret'        => 'Двуфакторен код',
    'two_factor_enrollment'        => 'Двуфакторово записване',
--- a/resources/lang/bg/admin/users/message.php
+++ b/resources/lang/bg/admin/users/message.php
@@ -31,6 +31,7 @@ return array(
        'create' => 'Възникна проблем при създаването на този потребител. Моля, опитайте отново.',
        'update' => 'Възникна проблем при обновяването на този потребител. Моля, опитайте отново.',
        'delete' => 'Възникна проблем при изтриването на този потребител. Моля, опитайте отново.',
+        'delete_has_assets' => 'This user has items assigned and could not be deleted.',
        'unsuspend' => 'Проблем при активирането на потребителя. Моля опитайте отново.',
        'import'    => 'Проблем при зареждането на потребителите. Моля опитайте отново.',
        'asset_already_accepted' => 'Този актив е вече приет.',
@@ -40,6 +41,7 @@ return array(
        'ldap_could_not_bind' => 'Проблем при връзката с LDAP сървъра. Моля прегледайте конфигурацията на LDAP.<br/>Грешка от LDAP сървъра: ',
        'ldap_could_not_search' => 'Проблем при търсенето в LDAP сървъра. Моля прегледайте конфигурацията на LDAP.<br/>Грешка от LDAP сървъра: ',
        'ldap_could_not_get_entries' => 'Проблем при извличането на резултат от LDAP сървъра. Моля прегледайте конфигурацията на LDAP.<br/>Грешка от LDAP сървъра:',
+        'password_ldap' => 'The password for this account is managed by LDAP/Active Directory. Please contact your IT department to change your password. ',
    ),

    'deletefile' => array(
--- a/resources/lang/bg/admin/users/table.php
+++ b/resources/lang/bg/admin/users/table.php
@@ -19,6 +19,7 @@ return array(
    'location'  			=> 'Местоположение',
    'lock_passwords'		=> 'Настройките за вход не могат да бъдат променяни в текущата инсталация.',
    'manager' 				=> 'Ръководител',
+    'managed_locations'     => 'Managed Locations',
    'name' 					=> 'Име',
    'notes'                 => 'Бележки',
    'password_confirm' 		=> 'Потвърждение на паролата',
--- a/resources/lang/bg/validation.php
+++ b/resources/lang/bg/validation.php
@@ -35,6 +35,8 @@ return array(
    "email"            => ":attribute е с невалиден формат.",
    "exists"           => "Избраният :attribute е невалиден.",
    "email_array"      => "Един или повече email адреси е невалиден.",
+    "hashed_pass"      => "Your current password is incorrect",
+    'dumbpwd'          => 'That password is too common.',
    "image"            => ":attribute трябва да бъде изображение.",
    "in"               => "Избраният :attribute е невалиден.",
    "integer"          => ":attribute трябва да бъде целочислен.",
--- a/resources/lang/cs/admin/asset_maintenances/message.php
+++ b/resources/lang/cs/admin/asset_maintenances/message.php
@@ -12,8 +12,8 @@
            'success' => 'Údržba zařízení byla v pořádku vytvořena.'
        ],
        'edit'                       => [
-            'error'   => 'Údržbu zařízení se nepodařilo vytvořit, zkuste to prosím znovu.',
-            'success' => 'Údržba zařízení byla upravena.'
+            'error'   => 'Asset Maintenance was not created, please try again.',
+            'success' => 'Asset Maintenance created successfully.'
        ],
        'asset_maintenance_incomplete' => 'Prozatím nedokončeno',
        'warranty'                     => 'Záruka',
--- a/resources/lang/cs/admin/custom_fields/message.php
+++ b/resources/lang/cs/admin/custom_fields/message.php
@@ -28,7 +28,7 @@ return array(

    'fieldset' => array(

-
+        'does_not_exist' => 'Fieldset does not exist',

        'create' => array(
            'error'   => 'Sadu se nám nepodařilo vytvořit, pokuste se o to znovu.',
--- a/resources/lang/cs/admin/departments/message.php
+++ b/resources/lang/cs/admin/departments/message.php
@@ -2,20 +2,20 @@

 return array(

-    'does_not_exist' => 'Department does not exist.',
-    'assoc_users'	 => 'This department is currently associated with at least one user and cannot be deleted. Please update your users to no longer reference this department and try again. ',
+    'does_not_exist' => 'Oddělení neexistuje.',
+    'assoc_users'	 => 'Toto oddělení je momentálně přiřazeno alespoň jednomu uživateli a nelze jej smazat. Aktualizujte své uživatele tak, aby již neodkázali na toto oddělení a zkuste to znovu.',
    'create' => array(
-        'error'   => 'Department was not created, please try again.',
-        'success' => 'Department created successfully.'
+        'error'   => 'Oddělení nebylo vytvořeno, zkuste to prosím znovu.',
+        'success' => 'Oddělení bylo úspěšně vytvořeno.'
    ),
    'update' => array(
-        'error'   => 'Department was not updated, please try again',
-        'success' => 'Department updated successfully.'
+        'error'   => 'Oddělení nebylo aktualizováno, zkuste to prosím znovu',
+        'success' => 'Oddělení se úspěšně aktualizovalo.'
    ),
    'delete' => array(
-        'confirm'   	=> 'Are you sure you wish to delete this department?',
-        'error'   => 'There was an issue deleting the department. Please try again.',
-        'success' => 'The department was deleted successfully.'
+        'confirm'   	=> 'Opravdu chcete smazat toto oddělení?',
+        'error'   => 'Byl problém odstranit oddělení. Prosím zkuste to znovu.',
+        'success' => 'Oddělení bylo úspěšně smazáno.'
    )

 );
--- a/resources/lang/cs/admin/departments/table.php
+++ b/resources/lang/cs/admin/departments/table.php
@@ -3,9 +3,9 @@
 return array(

    'id'                        => 'ID',
-    'name'                      => 'Department Name',
-    'manager'                   => 'Manager',
-    'location'                  => 'Location',
-    'create'                    => 'Create Department',
-    'update'                    => 'Update Department',
+    'name'                      => 'Název Oddělení',
+    'manager'                   => 'Manažer',
+    'location'                  => 'Umístění',
+    'create'                    => 'Vytvořit Oddělení',
+    'update'                    => 'Aktualizovat Oddělení',
    );
--- a/resources/lang/cs/admin/hardware/message.php
+++ b/resources/lang/cs/admin/hardware/message.php
@@ -48,7 +48,7 @@ return array(
    'delete' => array(
        'confirm'   	=> 'Opravdu si přejete tento majetek odstranit?',
        'error'   		=> 'Nepodařilo se nám tento majetek odstranit. Zkuste to prosím znovu.',
-        'nothing_updated'   => 'No assets were selected, so nothing was deleted.',
+        'nothing_updated'   => 'Žádný majetek nebyl vybrán, takže nic nebylo odstraněno.',
        'success' 		=> 'Majetek byl úspěšně smazán.'
    ),

--- a/resources/lang/cs/admin/models/message.php
+++ b/resources/lang/cs/admin/models/message.php
@@ -29,8 +29,8 @@ return array(
    ),

    'bulkedit' => array(
-        'error'   		=> 'No fields were changed, so nothing was updated.',
-        'success' 		=> 'Models updated.'
+        'error'   		=> 'Žádné pole nebyly změněny, takže nic nebylo aktualizováno.',
+        'success' 		=> 'Modely byly aktualizovány.'
    ),

 );
--- a/resources/lang/cs/admin/settings/general.php
+++ b/resources/lang/cs/admin/settings/general.php
@@ -63,6 +63,8 @@ return array(
    'ldap_email'                => 'LDAP email',
    'load_remote_text'          => 'Vzdálené skripty',
    'load_remote_help_text'		=> 'Tato instalace Snipe-IT může nahrávat skripty z vnějšího světa.',
+    'login_note'                => 'Login Note',
+    'login_note_help'           => 'Optionally include a few sentences on your login screen, for example to assist people who have found a lost or stolen device. This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>',
    'logo'                    	=> 'Logo',
    '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í',
@@ -71,6 +73,12 @@ return array(
    'php'                       => 'Verze PHP',
    'php_gd_info'               => 'Je nutné nainstalovat php-gd pro zobrazení QR kódů. Více v instalační příručce.',
    'php_gd_warning'            => 'PHP pluginy pro zpracování obrazu a GD nejsou nainstalovány.',
+    'pwd_secure_complexity'     => 'Password Complexity',
+    'pwd_secure_complexity_help' => 'Select whichever password complexity rules you wish to enforce.',
+    'pwd_secure_min'            => 'Password minimum characters',
+    'pwd_secure_min_help'       => 'Minimum permitted value is 5',
+    'pwd_secure_uncommon'       => 'Prevent common passwords',
+    'pwd_secure_uncommon_help'  => 'This will disallow users from using common passwords from the top 10,000 passwords reported in breaches.',
    'qr_help'                   => 'Nejprve povolte QR kódy',
    'qr_text'                   => 'Text QR kódu',
    'setting'                   => 'Nastavení',
@@ -90,7 +98,7 @@ return array(
    'about_settings_text'       => 'Tato nastavení umožňují zvolit určité prvky instalace.',
    'labels_per_page'           => 'Štítků na stránku',
    'label_dimensions'          => 'Rozměry štítku (palce)',
-    'next_auto_tag_base'        => 'Next auto-increment',
+    'next_auto_tag_base'        => 'Další auto přírůstek',
    'page_padding'             => 'Okraje stránky (palce)',
    'purge'                    => 'Vyčištění odstraněných záznamů',
    'labels_display_bgutter'    => 'Spodní okraj štítku',
@@ -105,6 +113,8 @@ return array(
    'width_w'        => 'š',
    'height_h'        => 'v',
    'text_pt'        => 'pt',
+    'thumbnail_max_h'   => 'Max thumbnail height',
+    'thumbnail_max_h_help'   => 'Maximum height in pixels that thumbnails may display in the listing view. Min 25, max 500.',
    'two_factor'        => 'Dvoufaktorové ověření',
    'two_factor_secret'        => 'Dvojfaktorový kód',
    'two_factor_enrollment'        => 'Dvojfaktorový zápis',
--- a/resources/lang/cs/admin/users/message.php
+++ b/resources/lang/cs/admin/users/message.php
@@ -31,6 +31,7 @@ return array(
        'create' => 'Vyskytl se problém při vytvářením uživatele. Zkuste to znovu.',
        'update' => 'Vyskytl se problém při aktualizování uživatele. Zkuste to znovu.',
        'delete' => 'Vyskytl se problém při mazání uživatele. Zkuste to znovu.',
+        'delete_has_assets' => 'This user has items assigned and could not be deleted.',
        'unsuspend' => 'Vyskytl se problém při rušení uživatele. Zkuste to znovu.',
        'import'    => 'Vyskytl se problém při importu uživatelů. Zkuste to znovu.',
        'asset_already_accepted' => 'Tento majetek již byl odsouhlasen.',
@@ -40,6 +41,7 @@ return array(
        'ldap_could_not_bind' => 'Nelze svázat server LDAP. Zkontrolujte prosím konfiguraci serveru LDAP v konfiguračním souboru LDAP. <br>Chyba serveru LDAP: ',
        'ldap_could_not_search' => 'Nelze vyhledat server LDAP. Zkontrolujte prosím konfiguraci serveru LDAP v konfiguračním souboru LDAP. <br>Chyba serveru LDAP:',
        'ldap_could_not_get_entries' => 'Nelze získat záznamy ze serveru LDAP. Zkontrolujte prosím konfiguraci serveru LDAP v konfiguračním souboru LDAP. <br>Chyba serveru LDAP:',
+        'password_ldap' => 'The password for this account is managed by LDAP/Active Directory. Please contact your IT department to change your password. ',
    ),

    'deletefile' => array(
--- a/resources/lang/cs/admin/users/table.php
+++ b/resources/lang/cs/admin/users/table.php
@@ -19,6 +19,7 @@ return array(
    'location'  			=> 'Umístění',
    'lock_passwords'		=> 'Přihlašovací údaje nelze v této instalaci měnit.',
    'manager' 				=> 'Nadřízený',
+    'managed_locations'     => 'Managed Locations',
    'name' 					=> 'Položka',
    'notes'                 => 'Poznámky',
    'password_confirm' 		=> 'Potvrzení hesla',
--- a/resources/lang/cs/general.php
+++ b/resources/lang/cs/general.php
@@ -27,7 +27,7 @@
    'cancel'  				=> 'Storno',
    'categories'			=> 'Kategorie',
    'category'				=> 'Kategorie',
-    'change' 		        => 'In/Out',
+    'change' 		        => 'Příjem/Výdej',
    'changeemail'  			=> 'Změnit e-mailovou adresu',
    'changepassword'  		=> 'Změnit heslo',
    'checkin'  				=> 'Příjem',
@@ -58,8 +58,8 @@
    'delete'  				=> 'Odstranit',
    'deleted'  				=> 'Odstraněno',
    'delete_seats'  		=> 'Vymazaná licenční místa',
-    'departments'           => 'Departments',
-    'department'           => 'Department',
+    'departments'           => 'Oddělení',
+    'department'           => 'Oddělení',
    'deployed'				=> 'Vydané',
    'depreciation_report'	=> 'Report zastarání',
    'download'				=> 'Stáhnout',
@@ -145,14 +145,14 @@
    'select'				=> 'Zvolit',
    'search'				=> 'Hledat',
    'select_category'       => 'Vyberte kategorii',
-    'select_department'       => 'Select a Department',
+    'select_department'       => 'Vyberte Oddělení',
    'select_depreciation'	=> 'Zvolit typ amortizace',
    'select_location'		=> 'Zvolit místo',
    'select_manufacturer'	=> 'Zvolit výrobce',
    'select_model'			=> 'Zvolit model',
    'select_supplier'		=> 'Zvolit dodavatele',
    'select_user'			=> 'Zvolit uživatele',
-    'select_date'			=> 'Select Date (YYYY-MM-DD)',
+    'select_date'			=> 'Vyberte Datum (RRRR-MM-DD)',
    'select_statuslabel'	=> 'Vybrat stav',
    'select_company'    	=> 'Zvolte společnost',
    'select_asset'    		=> 'Zvolte majetek',
--- a/resources/lang/cs/validation.php
+++ b/resources/lang/cs/validation.php
@@ -35,6 +35,8 @@ return array(
    "email"            => "Formát :attribute je neplatný.",
    "exists"           => "Zvolený :attribute je neplatný.",
    "email_array"      => "Jedna nebo více e-mailových adres je neplatná.",
+    "hashed_pass"      => "Your current password is incorrect",
+    'dumbpwd'          => 'That password is too common.',
    "image"            => ":attribute musí být obrázek.",
    "in"               => "Zvolený :attribute je neplatný.",
    "integer"          => ":attribute musí být celočíselný.",
--- a/resources/lang/da/admin/asset_maintenances/message.php
+++ b/resources/lang/da/admin/asset_maintenances/message.php
@@ -12,8 +12,8 @@
            'success' => 'Aktivets vedligeholdelse blev oprettet med succes.'
        ],
        'edit'                       => [
-            'error'   => 'Asset Maintenance was not edited, please try again.',
-            'success' => 'Asset Maintenance edited successfully.'
+            'error'   => 'Asset Maintenance was not created, please try again.',
+            'success' => 'Asset Maintenance created successfully.'
        ],
        'asset_maintenance_incomplete' => 'Ikke afsluttet endnu',
        'warranty'                     => 'Garanti',
--- a/resources/lang/da/admin/custom_fields/message.php
+++ b/resources/lang/da/admin/custom_fields/message.php
@@ -28,7 +28,7 @@ return array(

    'fieldset' => array(

-
+        'does_not_exist' => 'Fieldset does not exist',

        'create' => array(
            'error'   => 'Fieldset was not created, please try again.',
--- a/resources/lang/da/admin/settings/general.php
+++ b/resources/lang/da/admin/settings/general.php
@@ -63,6 +63,8 @@ return array(
    'ldap_email'                => 'LDAP Email',
    'load_remote_text'          => 'Remote Scripts',
    'load_remote_help_text'		=> 'This Snipe-IT install can load scripts from the outside world.',
+    'login_note'                => 'Login Note',
+    'login_note_help'           => 'Optionally include a few sentences on your login screen, for example to assist people who have found a lost or stolen device. This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>',
    'logo'                    	=> 'Logo',
    'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.',
    'full_multiple_companies_support_text' => 'Full Multiple Companies Support',
@@ -71,6 +73,12 @@ return array(
    'php'                       => 'PHP Version',
    'php_gd_info'               => 'You must install php-gd to display QR codes, see install instructions.',
    'php_gd_warning'            => 'PHP Image Processing and GD plugin is NOT installed.',
+    'pwd_secure_complexity'     => 'Password Complexity',
+    'pwd_secure_complexity_help' => 'Select whichever password complexity rules you wish to enforce.',
+    'pwd_secure_min'            => 'Password minimum characters',
+    'pwd_secure_min_help'       => 'Minimum permitted value is 5',
+    'pwd_secure_uncommon'       => 'Prevent common passwords',
+    'pwd_secure_uncommon_help'  => 'This will disallow users from using common passwords from the top 10,000 passwords reported in breaches.',
    'qr_help'                   => 'Enable QR Codes first to set this',
    'qr_text'                   => 'QR Code Text',
    'setting'                   => 'Setting',
@@ -105,6 +113,8 @@ return array(
    'width_w'        => 'w',
    'height_h'        => 'h',
    'text_pt'        => 'pt',
+    'thumbnail_max_h'   => 'Max thumbnail height',
+    'thumbnail_max_h_help'   => 'Maximum height in pixels that thumbnails may display in the listing view. Min 25, max 500.',
    'two_factor'        => 'Two Factor Authentication',
    'two_factor_secret'        => 'Two-Factor Code',
    'two_factor_enrollment'        => 'Two-Factor Enrollment',
--- a/resources/lang/da/admin/users/message.php
+++ b/resources/lang/da/admin/users/message.php
@@ -31,6 +31,7 @@ return array(
        'create' => 'There was an issue creating the user. Please try again.',
        'update' => 'There was an issue updating the user. Please try again.',
        'delete' => 'There was an issue deleting the user. Please try again.',
+        'delete_has_assets' => 'This user has items assigned and could not be deleted.',
        'unsuspend' => 'There was an issue unsuspending the user. Please try again.',
        'import'    => 'There was an issue importing users. Please try again.',
        'asset_already_accepted' => 'This asset has already been accepted.',
@@ -40,6 +41,7 @@ return array(
        'ldap_could_not_bind' => 'Could not bind to the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server: ',
        'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
        'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
+        'password_ldap' => 'The password for this account is managed by LDAP/Active Directory. Please contact your IT department to change your password. ',
    ),

    'deletefile' => array(
--- a/resources/lang/da/admin/users/table.php
+++ b/resources/lang/da/admin/users/table.php
@@ -19,6 +19,7 @@ return array(
    'location'  			=> 'Location',
    'lock_passwords'		=> 'Login details cannot be changed on this installation.',
    'manager' 				=> 'Manager',
+    'managed_locations'     => 'Managed Locations',
    'name' 					=> 'Name',
    'notes'                 => 'Notes',
    'password_confirm' 		=> 'Confirm Password',
--- a/resources/lang/da/validation.php
+++ b/resources/lang/da/validation.php
@@ -35,6 +35,8 @@ return array(
    "email"            => ":attribute formatet er ugylidgt.",
    "exists"           => "Den valgte :attribute er ugyldig.",
    "email_array"      => "En eller flere email-adresser er ugyldige.",
+    "hashed_pass"      => "Your current password is incorrect",
+    'dumbpwd'          => 'That password is too common.',
    "image"            => ":attribute skal være et billede.",
    "in"               => "Det valgte :attribute er ugyldigt.",
    "integer"          => ":attribute skal være et heltal.",
--- a/resources/lang/de/admin/asset_maintenances/message.php
+++ b/resources/lang/de/admin/asset_maintenances/message.php
@@ -12,8 +12,8 @@
            'success' => 'Wartungsvertrag erfolgreich erstellt.'
        ],
        'edit'                       => [
-            'error'   => 'Wartungsvertrag konnte nicht bearbeitet werden, bitte versuchen Sie es noch einmal.',
-            'success' => 'Wartungsvertrag erfolgreich bearbeitet.'
+            'error'   => 'Asset Maintenance was not created, please try again.',
+            'success' => 'Asset Maintenance created successfully.'
        ],
        'asset_maintenance_incomplete' => 'Wartungsvertrag noch nicht komplett ausgefüllt',
        'warranty'                     => 'Garantie',
--- a/resources/lang/de/admin/custom_fields/message.php
+++ b/resources/lang/de/admin/custom_fields/message.php
@@ -28,7 +28,7 @@ return array(

    'fieldset' => array(

-
+        'does_not_exist' => 'Fieldset does not exist',

        'create' => array(
            'error'   => 'Feldsatz wurde nicht erstellt. Bitte erneut versuchen.',
--- a/resources/lang/de/admin/departments/message.php
+++ b/resources/lang/de/admin/departments/message.php
@@ -2,20 +2,20 @@

 return array(

-    'does_not_exist' => 'Department does not exist.',
-    'assoc_users'	 => 'This department is currently associated with at least one user and cannot be deleted. Please update your users to no longer reference this department and try again. ',
+    'does_not_exist' => 'Diese Abteilung existiert nicht.',
+    'assoc_users'	 => 'Diese Abteilung ist mit mindestens einem Benutzer verknüpft und kann nicht gelöscht werden. Bitte Benutzer updaten, so dass diese Abteilung nicht mehr verknüpft ist und erneut versuchen. ',
    'create' => array(
-        'error'   => 'Department was not created, please try again.',
-        'success' => 'Department created successfully.'
+        'error'   => 'Abteilung wurde nicht erstellt, bitte versuchen Sie es erneut.',
+        'success' => 'Abteilung erfolgreich erstellt.'
    ),
    'update' => array(
-        'error'   => 'Department was not updated, please try again',
-        'success' => 'Department updated successfully.'
+        'error'   => 'Abteilung wurde nicht verändert, bitte versuchen Sie es erneut',
+        'success' => 'Abteilung erfolgreich aktualisiert.'
    ),
    'delete' => array(
-        'confirm'   	=> 'Are you sure you wish to delete this department?',
-        'error'   => 'There was an issue deleting the department. Please try again.',
-        'success' => 'The department was deleted successfully.'
+        'confirm'   	=> 'Sind Sie sicher, dass Sie diese Abteilung entfernen möchten?',
+        'error'   => 'Beim Löschen der Abteilung ist ein Fehler aufgetreten. Bitte versuchen Sie erneut.',
+        'success' => 'Die Abteilung wurde erfolgreich gelöscht.'
    )

 );
--- a/resources/lang/de/admin/departments/table.php
+++ b/resources/lang/de/admin/departments/table.php
@@ -3,9 +3,9 @@
 return array(

    'id'                        => 'ID',
-    'name'                      => 'Department Name',
+    'name'                      => 'Name der Abteilung',
    'manager'                   => 'Manager',
-    'location'                  => 'Location',
-    'create'                    => 'Create Department',
-    'update'                    => 'Update Department',
+    'location'                  => 'Standort',
+    'create'                    => 'Abteilung erstellen',
+    'update'                    => 'Abteilung aktualisieren',
    );
--- a/resources/lang/de/admin/hardware/message.php
+++ b/resources/lang/de/admin/hardware/message.php
@@ -48,7 +48,7 @@ return array(
    'delete' => array(
        'confirm'   	=> 'Sind Sie sicher, dass Sie dieses Asset entfernen möchten?',
        'error'   		=> 'Beim Entfernen dieses Assets ist ein Fehler aufgetreten. Bitte versuchen Sie es erneut.',
-        'nothing_updated'   => 'No assets were selected, so nothing was deleted.',
+        'nothing_updated'   => 'Es wurden keine Assets ausgewählt, somit wurde auch nichts gelöscht.',
        'success' 		=> 'Dieses Asset wurde erfolgreich entfernt.'
    ),

--- a/resources/lang/de/admin/models/message.php
+++ b/resources/lang/de/admin/models/message.php
@@ -29,8 +29,8 @@ return array(
    ),

    'bulkedit' => array(
-        'error'   		=> 'No fields were changed, so nothing was updated.',
-        'success' 		=> 'Models updated.'
+        'error'   		=> 'Es wurden keine Felder ausgewählt, somit wurde auch nichts aktualisiert.',
+        'success' 		=> 'Modelle aktualisiert.'
    ),

 );
--- a/resources/lang/de/admin/settings/general.php
+++ b/resources/lang/de/admin/settings/general.php
@@ -63,6 +63,8 @@ return array(
    'ldap_email'                => 'LDAP E-Mail',
    'load_remote_text'          => 'Remote Skripte',
    'load_remote_help_text'		=> 'Diese Installation von Snipe-IT kann Skripte von außerhalb laden.',
+    'login_note'                => 'Login Note',
+    'login_note_help'           => 'Optionally include a few sentences on your login screen, for example to assist people who have found a lost or stolen device. This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>',
    'logo'                    	=> 'Logo',
    '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',
@@ -71,6 +73,12 @@ return array(
    'php'                       => 'PHP Version',
    'php_gd_info'               => 'Um QR-Codes anzeigen zu können muss php-gd installiert sein, siehe Installationshinweise.',
    'php_gd_warning'            => 'PHP Image Processing and GD Plugin ist NICHT installiert.',
+    'pwd_secure_complexity'     => 'Password Complexity',
+    'pwd_secure_complexity_help' => 'Select whichever password complexity rules you wish to enforce.',
+    'pwd_secure_min'            => 'Password minimum characters',
+    'pwd_secure_min_help'       => 'Minimum permitted value is 5',
+    'pwd_secure_uncommon'       => 'Prevent common passwords',
+    'pwd_secure_uncommon_help'  => 'This will disallow users from using common passwords from the top 10,000 passwords reported in breaches.',
    'qr_help'                   => 'Schalte zuerst QR Codes an um dies zu setzen',
    'qr_text'                   => 'QR Code Text',
    'setting'                   => 'Einstellung',
@@ -90,7 +98,7 @@ return array(
    'about_settings_text'       => 'Mit diesen Einstellungen können Sie verschiedene Aspekte Ihrer Installation anpassen.',
    'labels_per_page'           => 'Etiketten pro Seite',
    'label_dimensions'          => 'Etikettengröße (Zoll)',
-    'next_auto_tag_base'        => 'Next auto-increment',
+    'next_auto_tag_base'        => 'Nächster Auto-Inkrement',
    'page_padding'             => 'Seiten Ränder (Zoll)',
    'purge'                    => 'Gelöschte Einträge bereinigen',
    'labels_display_bgutter'    => 'Ettiketten Spaltenzwischenraum unterhalb',
@@ -105,6 +113,8 @@ return array(
    'width_w'        => 'b',
    'height_h'        => 'h',
    'text_pt'        => 'pt',
+    'thumbnail_max_h'   => 'Max thumbnail height',
+    'thumbnail_max_h_help'   => 'Maximum height in pixels that thumbnails may display in the listing view. Min 25, max 500.',
    'two_factor'        => 'Zwei-Faktor-Authentifizierung',
    'two_factor_secret'        => 'Zwei-Faktor Code',
    'two_factor_enrollment'        => 'Zwei-Faktor Registrierung',
--- a/resources/lang/de/admin/users/message.php
+++ b/resources/lang/de/admin/users/message.php
@@ -31,6 +31,7 @@ return array(
        'create' => 'Beim Erstellen des Benutzers ist ein Fehler aufgetreten. Bitte probieren Sie es noch einmal.',
        'update' => 'Beim Aktualisieren des Benutzers ist ein Fehler aufgetreten. Bitte probieren Sie es noch einmal.',
        'delete' => 'Beim Entfernen des Benutzers ist ein Fehler aufgetreten. Bitte versuchen Sie es erneut.',
+        'delete_has_assets' => 'This user has items assigned and could not be deleted.',
        'unsuspend' => 'Es gab ein Problem beim reaktivieren des Benutzers. Bitte versuche es erneut.',
        'import'    => 'Es gab ein Problem beim importieren der Benutzer. Bitte noch einmal versuchen.',
        'asset_already_accepted' => 'Dieses Asset wurde bereits akzeptiert.',
@@ -40,6 +41,7 @@ return array(
        'ldap_could_not_bind' => 'Konnte keine Verbindung zum LDAP Server herstellen. Bitte LDAP Einstellungen in der LDAP Konfigurationsdatei prüfen. <br>Fehler vom LDAP Server: ',
        'ldap_could_not_search' => 'Konnte LDAP Server nicht suchen. Bitte LDAP Einstellungen in der LDAP Konfigurationsdatei prüfen. <br>Fehler vom LDAP Server:',
        'ldap_could_not_get_entries' => 'Konnte keine Einträge vom LDAP Server abrufen. Bitte LDAP Einstellungen in der LDAP Konfigurationsdatei prüfen. <br>Fehler vom LDAP Server:',
+        'password_ldap' => 'The password for this account is managed by LDAP/Active Directory. Please contact your IT department to change your password. ',
    ),

    'deletefile' => array(
--- a/resources/lang/de/admin/users/table.php
+++ b/resources/lang/de/admin/users/table.php
@@ -19,6 +19,7 @@ return array(
    'location'  			=> 'Ort',
    'lock_passwords'		=> 'Die Login-Daten können auf dieser Installation nicht geändert werden.',
    'manager' 				=> 'Manager',
+    'managed_locations'     => 'Managed Locations',
    'name' 					=> 'Name',
    'notes'                 => 'Notizen',
    'password_confirm' 		=> 'Kennwort bestätigen',
--- a/resources/lang/de/general.php
+++ b/resources/lang/de/general.php
@@ -27,7 +27,7 @@
    'cancel'  				=> 'Abbrechen',
    'categories'			=> 'Kategorien',
    'category'				=> 'Kategorie',
-    'change' 		        => 'In/Out',
+    'change' 		        => 'Eingang/Ausgang',
    'changeemail'  			=> 'E-Mail Adresse ändern',
    'changepassword'  		=> 'Passwort ändern',
    'checkin'  				=> 'Checkin Asset',
@@ -58,8 +58,8 @@
    'delete'  				=> 'Löschen',
    'deleted'  				=> 'Gelöscht',
    'delete_seats'  		=> 'Gelöschte Lizenzen',
-    'departments'           => 'Departments',
-    'department'           => 'Department',
+    'departments'           => 'Abteilungen',
+    'department'           => 'Abteilung',
    'deployed'				=> 'Herausgegeben',
    'depreciation_report'	=> 'Abschreibunsgreport',
    'download'				=> 'Download',
@@ -145,14 +145,14 @@
    'select'				=> 'auswählen',
    'search'				=> 'Suche',
    'select_category'       => 'Kategorie auswählen',
-    'select_department'       => 'Select a Department',
+    'select_department'       => 'Abteilung auswählen',
    'select_depreciation'	=> 'Wähle einen Abschreibungstyp',
    'select_location'		=> 'Wählen Sie einen Standort',
    'select_manufacturer'	=> 'Wählen Sie einen Hersteller',
    'select_model'			=> 'Wählen Sie ein Model',
    'select_supplier'		=> 'wählen Sie einen Lieferant',
    'select_user'			=> 'wähle einen Benutzer',
-    'select_date'			=> 'Select Date (YYYY-MM-DD)',
+    'select_date'			=> 'Wählen Sie ein Datum (JJJJ-MM-DD)',
    'select_statuslabel'	=> 'Status auswählen',
    'select_company'    	=> 'Firma auswählen',
    'select_asset'    		=> 'Asset auswählen',
--- a/resources/lang/de/validation.php
+++ b/resources/lang/de/validation.php
@@ -35,6 +35,8 @@ return array(
    "email"            => "Das Format von :attribute ist ungültig.",
    "exists"           => "Das ausgewählte :attribute ist ungültig.",
    "email_array"      => "Eine oder mehrere Email Adressen sind ungültig.",
+    "hashed_pass"      => "Your current password is incorrect",
+    'dumbpwd'          => 'That password is too common.',
    "image"            => ":attribute muss ein Bild sein.",
    "in"               => "Auswahl :attribute ist ungültig.",
    "integer"          => ":attribute muss eine ganze Zahl sein.",
--- a/resources/lang/el/admin/asset_maintenances/message.php
+++ b/resources/lang/el/admin/asset_maintenances/message.php
@@ -12,8 +12,8 @@
            'success' => 'Επιτυχής δημιουργία συντήρησης παγίου.'
        ],
        'edit'                       => [
-            'error'   => 'Η συντήρηση του παγίου δεν επεξεργάστηκε, παρακαλώ προσπαθήστε ξανά.',
-            'success' => 'Επιτυχής δημιουργία συντήρησης παγίου.'
+            'error'   => 'Asset Maintenance was not created, please try again.',
+            'success' => 'Asset Maintenance created successfully.'
        ],
        'asset_maintenance_incomplete' => 'Δεν ολοκληρώθηκε ακόμη',
        'warranty'                     => 'Εγγύηση',
--- a/resources/lang/el/admin/custom_fields/message.php
+++ b/resources/lang/el/admin/custom_fields/message.php
@@ -28,7 +28,7 @@ return array(

    'fieldset' => array(

-
+        'does_not_exist' => 'Fieldset does not exist',

        'create' => array(
            'error'   => 'Fieldset was not created, please try again.',
--- a/resources/lang/el/admin/settings/general.php
+++ b/resources/lang/el/admin/settings/general.php
@@ -63,6 +63,8 @@ return array(
    'ldap_email'                => 'LDAP Email',
    'load_remote_text'          => 'Remote Scripts',
    'load_remote_help_text'		=> 'This Snipe-IT install can load scripts from the outside world.',
+    'login_note'                => 'Login Note',
+    'login_note_help'           => 'Optionally include a few sentences on your login screen, for example to assist people who have found a lost or stolen device. This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>',
    'logo'                    	=> 'Logo',
    'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.',
    'full_multiple_companies_support_text' => 'Full Multiple Companies Support',
@@ -71,6 +73,12 @@ return array(
    'php'                       => 'PHP Version',
    'php_gd_info'               => 'You must install php-gd to display QR codes, see install instructions.',
    'php_gd_warning'            => 'PHP Image Processing and GD plugin is NOT installed.',
+    'pwd_secure_complexity'     => 'Password Complexity',
+    'pwd_secure_complexity_help' => 'Select whichever password complexity rules you wish to enforce.',
+    'pwd_secure_min'            => 'Password minimum characters',
+    'pwd_secure_min_help'       => 'Minimum permitted value is 5',
+    'pwd_secure_uncommon'       => 'Prevent common passwords',
+    'pwd_secure_uncommon_help'  => 'This will disallow users from using common passwords from the top 10,000 passwords reported in breaches.',
    'qr_help'                   => 'Enable QR Codes first to set this',
    'qr_text'                   => 'QR Code Text',
    'setting'                   => 'Ρύθμιση',
@@ -105,6 +113,8 @@ return array(
    'width_w'        => 'w',
    'height_h'        => 'h',
    'text_pt'        => 'pt',
+    'thumbnail_max_h'   => 'Max thumbnail height',
+    'thumbnail_max_h_help'   => 'Maximum height in pixels that thumbnails may display in the listing view. Min 25, max 500.',
    'two_factor'        => 'Έλεγχος ταυτότητας δύο παραγόντων',
    'two_factor_secret'        => 'Two-Factor Code',
    'two_factor_enrollment'        => 'Two-Factor Enrollment',
--- a/resources/lang/el/admin/users/message.php
+++ b/resources/lang/el/admin/users/message.php
@@ -31,6 +31,7 @@ return array(
        'create' => 'There was an issue creating the user. Please try again.',
        'update' => 'There was an issue updating the user. Please try again.',
        'delete' => 'There was an issue deleting the user. Please try again.',
+        'delete_has_assets' => 'This user has items assigned and could not be deleted.',
        'unsuspend' => 'There was an issue unsuspending the user. Please try again.',
        'import'    => 'There was an issue importing users. Please try again.',
        'asset_already_accepted' => 'This asset has already been accepted.',
@@ -40,6 +41,7 @@ return array(
        'ldap_could_not_bind' => 'Could not bind to the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server: ',
        'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
        'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
+        'password_ldap' => 'The password for this account is managed by LDAP/Active Directory. Please contact your IT department to change your password. ',
    ),

    'deletefile' => array(
--- a/resources/lang/el/admin/users/table.php
+++ b/resources/lang/el/admin/users/table.php
@@ -19,6 +19,7 @@ return array(
    'location'  			=> 'Τοποθεσία',
    'lock_passwords'		=> 'Οι λεπτομέρειες σύνδεσης δεν μπορούν να αλλάξουν σε αυτήν την εγκατάσταση.',
    'manager' 				=> 'Διευθυντής',
+    'managed_locations'     => 'Managed Locations',
    'name' 					=> 'Όνομα',
    'notes'                 => 'Σημειώσεις',
    'password_confirm' 		=> 'Επιβεβαίωση Κωδικού Πρόσβασης',
--- a/resources/lang/el/validation.php
+++ b/resources/lang/el/validation.php
@@ -35,6 +35,8 @@ return array(
    "email"            => "The :attribute format is invalid.",
    "exists"           => "Το επιλεγμένο: χαρακτηριστικό δεν είναι έγκυρο.",
    "email_array"      => "One or more email addresses is invalid.",
+    "hashed_pass"      => "Your current password is incorrect",
+    'dumbpwd'          => 'That password is too common.',
    "image"            => "Το: χαρακτηριστικό πρέπει να είναι μια εικόνα.",
    "in"               => "The selected :attribute is invalid.",
    "integer"          => "The :attribute must be an integer.",
--- a/resources/lang/en-GB/admin/custom_fields/message.php
+++ b/resources/lang/en-GB/admin/custom_fields/message.php
@@ -28,7 +28,7 @@ return array(

    'fieldset' => array(

-
+        'does_not_exist' => 'Fieldset does not exist',

        'create' => array(
            'error'   => 'Fieldset was not created, please try again.',
--- a/resources/lang/en-GB/admin/settings/general.php
+++ b/resources/lang/en-GB/admin/settings/general.php
@@ -63,6 +63,8 @@ return array(
    'ldap_email'                => 'LDAP Email',
    'load_remote_text'          => 'Remote Scripts',
    'load_remote_help_text'		=> 'This Snipe-IT install can load scripts from the outside world.',
+    'login_note'                => 'Login Note',
+    'login_note_help'           => 'Optionally include a few sentences on your login screen, for example to assist people who have found a lost or stolen device. This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>',
    'logo'                    	=> 'Logo',
    'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.',
    'full_multiple_companies_support_text' => 'Full Multiple Companies Support',
@@ -71,6 +73,12 @@ return array(
    'php'                       => 'PHP Version',
    'php_gd_info'               => 'You must install php-gd to display QR codes, see install instructions.',
    'php_gd_warning'            => 'PHP Image Processing and GD plugin is NOT installed.',
+    'pwd_secure_complexity'     => 'Password Complexity',
+    'pwd_secure_complexity_help' => 'Select whichever password complexity rules you wish to enforce.',
+    'pwd_secure_min'            => 'Password minimum characters',
+    'pwd_secure_min_help'       => 'Minimum permitted value is 5',
+    'pwd_secure_uncommon'       => 'Prevent common passwords',
+    'pwd_secure_uncommon_help'  => 'This will disallow users from using common passwords from the top 10,000 passwords reported in breaches.',
    'qr_help'                   => 'Enable QR Codes first to set this',
    'qr_text'                   => 'QR Code Text',
    'setting'                   => 'Setting',
@@ -105,6 +113,8 @@ return array(
    'width_w'        => 'w',
    'height_h'        => 'h',
    'text_pt'        => 'pt',
+    'thumbnail_max_h'   => 'Max thumbnail height',
+    'thumbnail_max_h_help'   => 'Maximum height in pixels that thumbnails may display in the listing view. Min 25, max 500.',
    'two_factor'        => 'Two Factor Authentication',
    'two_factor_secret'        => 'Two-Factor Code',
    'two_factor_enrollment'        => 'Two-Factor Enrollment',
--- a/resources/lang/en-GB/admin/users/message.php
+++ b/resources/lang/en-GB/admin/users/message.php
@@ -31,6 +31,7 @@ return array(
        'create' => 'There was an issue creating the user. Please try again.',
        'update' => 'There was an issue updating the user. Please try again.',
        'delete' => 'There was an issue deleting the user. Please try again.',
+        'delete_has_assets' => 'This user has items assigned and could not be deleted.',
        'unsuspend' => 'There was an issue unsuspending the user. Please try again.',
        'import'    => 'There was an issue importing users. Please try again.',
        'asset_already_accepted' => 'This asset has already been accepted.',
@@ -40,6 +41,7 @@ return array(
        'ldap_could_not_bind' => 'Could not bind to the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server: ',
        'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
        'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
+        'password_ldap' => 'The password for this account is managed by LDAP/Active Directory. Please contact your IT department to change your password. ',
    ),

    'deletefile' => array(
--- a/resources/lang/en-GB/admin/users/table.php
+++ b/resources/lang/en-GB/admin/users/table.php
@@ -19,6 +19,7 @@ return array(
    'location'  			=> 'Location',
    'lock_passwords'		=> 'Login details cannot be changed on this installation.',
    'manager' 				=> 'Manager',
+    'managed_locations'     => 'Managed Locations',
    'name' 					=> 'Name',
    'notes'                 => 'Notes',
    'password_confirm' 		=> 'Confirm Password',
--- a/resources/lang/en-GB/validation.php
+++ b/resources/lang/en-GB/validation.php
@@ -35,6 +35,8 @@ return array(
    "email"            => "The :attribute format is invalid.",
    "exists"           => "The selected :attribute is invalid.",
    "email_array"      => "One or more email addresses is invalid.",
+    "hashed_pass"      => "Your current password is incorrect",
+    'dumbpwd'          => 'That password is too common.',
    "image"            => "The :attribute must be an image.",
    "in"               => "The selected :attribute is invalid.",
    "integer"          => "The :attribute must be an integer.",
--- a/resources/lang/en-ID/admin/asset_maintenances/message.php
+++ b/resources/lang/en-ID/admin/asset_maintenances/message.php
@@ -12,8 +12,8 @@
            'success' => 'Pemeliharaan Aset berhasil dibuat.'
        ],
        'edit'                       => [
-            'error'   => 'Pemeliharaan Aset gagal dirubah, silakan coba lagi.',
-            'success' => 'Pemeliharaan Aset berhasil dibuat.'
+            'error'   => 'Asset Maintenance was not created, please try again.',
+            'success' => 'Asset Maintenance created successfully.'
        ],
        'asset_maintenance_incomplete' => 'Belum selesai',
        'warranty'                     => 'Jaminan',
--- a/resources/lang/en-ID/admin/custom_fields/message.php
+++ b/resources/lang/en-ID/admin/custom_fields/message.php
@@ -28,7 +28,7 @@ return array(

    'fieldset' => array(

-
+        'does_not_exist' => 'Fieldset does not exist',

        'create' => array(
            'error'   => 'Fieldset was not created, please try again.',
--- a/resources/lang/en-ID/admin/settings/general.php
+++ b/resources/lang/en-ID/admin/settings/general.php
@@ -63,6 +63,8 @@ return array(
    'ldap_email'                => 'LDAP Email',
    'load_remote_text'          => 'Remote Scripts',
    'load_remote_help_text'		=> 'This Snipe-IT install can load scripts from the outside world.',
+    'login_note'                => 'Login Note',
+    'login_note_help'           => 'Optionally include a few sentences on your login screen, for example to assist people who have found a lost or stolen device. This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>',
    'logo'                    	=> 'Logo',
    'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.',
    'full_multiple_companies_support_text' => 'Full Multiple Companies Support',
@@ -71,6 +73,12 @@ return array(
    'php'                       => 'PHP Version',
    'php_gd_info'               => 'You must install php-gd to display QR codes, see install instructions.',
    'php_gd_warning'            => 'PHP Image Processing and GD plugin is NOT installed.',
+    'pwd_secure_complexity'     => 'Password Complexity',
+    'pwd_secure_complexity_help' => 'Select whichever password complexity rules you wish to enforce.',
+    'pwd_secure_min'            => 'Password minimum characters',
+    'pwd_secure_min_help'       => 'Minimum permitted value is 5',
+    'pwd_secure_uncommon'       => 'Prevent common passwords',
+    'pwd_secure_uncommon_help'  => 'This will disallow users from using common passwords from the top 10,000 passwords reported in breaches.',
    'qr_help'                   => 'Enable QR Codes first to set this',
    'qr_text'                   => 'QR Code Text',
    'setting'                   => 'Setting',
@@ -105,6 +113,8 @@ return array(
    'width_w'        => 'w',
    'height_h'        => 'h',
    'text_pt'        => 'pt',
+    'thumbnail_max_h'   => 'Max thumbnail height',
+    'thumbnail_max_h_help'   => 'Maximum height in pixels that thumbnails may display in the listing view. Min 25, max 500.',
    'two_factor'        => 'Two Factor Authentication',
    'two_factor_secret'        => 'Two-Factor Code',
    'two_factor_enrollment'        => 'Two-Factor Enrollment',
--- a/resources/lang/en-ID/admin/users/message.php
+++ b/resources/lang/en-ID/admin/users/message.php
@@ -31,6 +31,7 @@ return array(
        'create' => 'There was an issue creating the user. Please try again.',
        'update' => 'There was an issue updating the user. Please try again.',
        'delete' => 'There was an issue deleting the user. Please try again.',
+        'delete_has_assets' => 'This user has items assigned and could not be deleted.',
        'unsuspend' => 'There was an issue unsuspending the user. Please try again.',
        'import'    => 'There was an issue importing users. Please try again.',
        'asset_already_accepted' => 'This asset has already been accepted.',
@@ -40,6 +41,7 @@ return array(
        'ldap_could_not_bind' => 'Could not bind to the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server: ',
        'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
        'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
+        'password_ldap' => 'The password for this account is managed by LDAP/Active Directory. Please contact your IT department to change your password. ',
    ),

    'deletefile' => array(
--- a/resources/lang/en-ID/admin/users/table.php
+++ b/resources/lang/en-ID/admin/users/table.php
@@ -19,6 +19,7 @@ return array(
    'location'  			=> 'Location',
    'lock_passwords'		=> 'Login details cannot be changed on this installation.',
    'manager' 				=> 'Manager',
+    'managed_locations'     => 'Managed Locations',
    'name' 					=> 'Name',
    'notes'                 => 'Notes',
    'password_confirm' 		=> 'Confirm Password',
--- a/resources/lang/en-ID/validation.php
+++ b/resources/lang/en-ID/validation.php
@@ -35,6 +35,8 @@ return array(
    "email"            => "The :attribute format is invalid.",
    "exists"           => "The selected :attribute is invalid.",
    "email_array"      => "One or more email addresses is invalid.",
+    "hashed_pass"      => "Your current password is incorrect",
+    'dumbpwd'          => 'That password is too common.',
    "image"            => "The :attribute must be an image.",
    "in"               => "The selected :attribute is invalid.",
    "integer"          => "The :attribute must be an integer.",
--- a/resources/lang/en/admin/hardware/message.php
+++ b/resources/lang/en/admin/hardware/message.php
@@ -24,6 +24,12 @@ return array(
        'success' 		=> 'Asset restored successfully.'
    ),

+    'audit' => array(
+        'error'   		=> 'Asset audit was unsuccessful. Please try again.',
+        'success' 		=> 'Asset audit successfully logged.'
+    ),
+
+
    'deletefile' => array(
        'error'   => 'File not deleted. Please try again.',
        'success' => 'File successfully deleted.',
--- a/resources/lang/en/admin/users/table.php
+++ b/resources/lang/en/admin/users/table.php
@@ -19,6 +19,7 @@ return array(
    'location'  			=> 'Location',
    'lock_passwords'		=> 'Login details cannot be changed on this installation.',
    'manager' 				=> 'Manager',
+    'managed_locations'     => 'Managed Locations',
    'name' 					=> 'Name',
    'notes'                 => 'Notes',
    'password_confirm' 		=> 'Confirm Password',
--- a/resources/lang/en/general.php
+++ b/resources/lang/en/general.php
@@ -18,6 +18,8 @@
    'asset_report'          => 'Asset Report',
    'asset_tag'				=> 'Asset Tag',
    'assets_available'		=> 'assets available',
+    'audit'				    => 'Audit',
+    'audit_report'			=> 'Audit Log',
    'assets'				=> 'Assets',
    'avatar_delete'         => 'Delete Avatar',
    'avatar_upload'         => 'Upload Avatar',
@@ -117,6 +119,8 @@
    'moreinfo'				=> 'More Info',
    'name'					=> 'Name',
    'next'					=> 'Next',
+    'next_audit_date'		=> 'Next Audit Date',
+    'last_audit'		    => 'Last Audit',
    'new'					=> 'new!',
    'no_depreciation'		=> 'No Depreciation',
    'no_results'			=> 'No Results.',
--- a/resources/lang/es-CO/admin/asset_maintenances/message.php
+++ b/resources/lang/es-CO/admin/asset_maintenances/message.php
@@ -12,8 +12,8 @@
            'success' => 'Mantenimiento de Activo creado correctamente.'
        ],
        'edit'                       => [
-            'error'   => 'El mantenimiento de activo no fue editado. Por favor, intenta de nuevo.',
-            'success' => 'Mantenimiento de activo editado con éxito.'
+            'error'   => 'Asset Maintenance was not created, please try again.',
+            'success' => 'Asset Maintenance created successfully.'
        ],
        'asset_maintenance_incomplete' => 'Sin Completar',
        'warranty'                     => 'Garantía',
--- a/resources/lang/es-CO/admin/custom_fields/message.php
+++ b/resources/lang/es-CO/admin/custom_fields/message.php
@@ -28,7 +28,7 @@ return array(

    'fieldset' => array(

-
+        'does_not_exist' => 'Fieldset does not exist',

        'create' => array(
            'error'   => 'El grupo de campos no ha sido creado, por favor inténtelo de nuevo.',
--- a/resources/lang/es-CO/admin/departments/message.php
+++ b/resources/lang/es-CO/admin/departments/message.php
@@ -15,7 +15,7 @@ return array(
    'delete' => array(
        'confirm'   	=> 'Are you sure you wish to delete this department?',
        'error'   => 'There was an issue deleting the department. Please try again.',
-        'success' => 'The department was deleted successfully.'
+        'success' => 'El departamento ha sido borrado exitosamente'
    )

 );
--- a/resources/lang/es-CO/admin/settings/general.php
+++ b/resources/lang/es-CO/admin/settings/general.php
@@ -63,6 +63,8 @@ return array(
    'ldap_email'                => 'Email LDAP',
    'load_remote_text'          => 'Scripts remotos',
    'load_remote_help_text'		=> 'Esta instalación de Snipe-IT puede cargar scripts desde fuera.',
+    'login_note'                => 'Login Note',
+    'login_note_help'           => 'Optionally include a few sentences on your login screen, for example to assist people who have found a lost or stolen device. This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>',
    'logo'                    	=> 'Logo',
    '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',
@@ -71,6 +73,12 @@ return array(
    'php'                       => 'Versión de PHP',
    'php_gd_info'               => 'Debes instalar php-gd para mostrar Códigos QR, ver instrucciones de instalación en <a href="http://www.php.net/manual/en/image.installation.php"></a>.',
    'php_gd_warning'            => 'PHP Image Processing y GD plugin NO instalados.',
+    'pwd_secure_complexity'     => 'Password Complexity',
+    'pwd_secure_complexity_help' => 'Select whichever password complexity rules you wish to enforce.',
+    'pwd_secure_min'            => 'Password minimum characters',
+    'pwd_secure_min_help'       => 'Minimum permitted value is 5',
+    'pwd_secure_uncommon'       => 'Prevent common passwords',
+    'pwd_secure_uncommon_help'  => 'This will disallow users from using common passwords from the top 10,000 passwords reported in breaches.',
    'qr_help'                   => 'Activa Códigos QR antes para poder ver esto',
    'qr_text'                   => 'Texto Código QR',
    'setting'                   => 'Parámetro',
@@ -105,6 +113,8 @@ return array(
    'width_w'        => 'an',
    'height_h'        => 'al',
    'text_pt'        => 'pt',
+    'thumbnail_max_h'   => 'Max thumbnail height',
+    'thumbnail_max_h_help'   => 'Maximum height in pixels that thumbnails may display in the listing view. Min 25, max 500.',
    'two_factor'        => 'Autenticación en dos pasos',
    'two_factor_secret'        => 'Código de verificación en dos pasos',
    'two_factor_enrollment'        => 'Enrolamiento en verificación en dos pasos',
--- a/resources/lang/es-CO/admin/users/message.php
+++ b/resources/lang/es-CO/admin/users/message.php
@@ -31,6 +31,7 @@ return array(
        'create' => 'Ha habido un problema creando el Usuario. Intentalo de nuevo.',
        'update' => 'Ha habido un problema actualizando el Usuario. Intentalo de nuevo.',
        'delete' => 'Ha habido un problema eliminando el  Usuario. Intentalo de nuevo.',
+        'delete_has_assets' => 'This user has items assigned and could not be deleted.',
        'unsuspend' => 'Ha habido un problema marcando como no suspendido el Usuario. Intentalo de nuevo.',
        'import'    => 'Ha habido un problema importando los usuarios. Por favor intente nuevamente.',
        'asset_already_accepted' => 'Este equipo ya ha sido aceptado.',
@@ -40,6 +41,7 @@ return array(
        'ldap_could_not_bind' => 'No se ha podido vincular con el servidor LDAP. Por favor verifique la configuración de su servidor LDAP en su archivo de configuración.<br> Error del servidor LDAP: ',
        'ldap_could_not_search' => 'No se ha podido buscar en el servidor LDAP. Por favor verifique la configuración de su servidor LDAP en su archivo de configuración.<br> Error del servidor LDAP:',
        'ldap_could_not_get_entries' => 'No se han podido obtener entradas del servidor LDAP. Por favor verifique la configuración de su servidor LDAP en su archivo de configuración.<br> Error del servidor LDAP:',
+        'password_ldap' => 'The password for this account is managed by LDAP/Active Directory. Please contact your IT department to change your password. ',
    ),

    'deletefile' => array(
--- a/resources/lang/es-CO/admin/users/table.php
+++ b/resources/lang/es-CO/admin/users/table.php
@@ -19,6 +19,7 @@ return array(
    'location'  			=> 'Localización',
    'lock_passwords'		=> 'Los detalles de acceso no pueden ser cambiados en esta instalación.',
    'manager' 				=> 'Responsable',
+    'managed_locations'     => 'Managed Locations',
    'name' 					=> 'Usuario',
    'notes'                 => 'Notas',
    'password_confirm' 		=> 'Confirmar Password',
--- a/resources/lang/es-CO/validation.php
+++ b/resources/lang/es-CO/validation.php
@@ -35,6 +35,8 @@ return array(
    "email"            => ":attribute formato incorrecto.",
    "exists"           => "El :attribute seleccionado no es correcto.",
    "email_array"      => "Una o más direcciones de correo electrónico no es válido.",
+    "hashed_pass"      => "Your current password is incorrect",
+    'dumbpwd'          => 'That password is too common.',
    "image"            => ":attribute debe ser una imagen.",
    "in"               => "El :attribute seleccionado no es correcto.",
    "integer"          => ":attribute debe ser un número entero.",
--- a/resources/lang/es-ES/admin/asset_maintenances/message.php
+++ b/resources/lang/es-ES/admin/asset_maintenances/message.php
@@ -12,8 +12,8 @@
            'success' => 'El Mantenimiento de Equipo fue creado de manera exitosa.'
        ],
        'edit'                       => [
-            'error'   => 'El mantenimiento de activo no fue editado. Por favor, intenta de nuevo.',
-            'success' => 'Mantenimiento de activo editado con éxito.'
+            'error'   => 'Asset Maintenance was not created, please try again.',
+            'success' => 'Asset Maintenance created successfully.'
        ],
        'asset_maintenance_incomplete' => 'Sin Completar',
        'warranty'                     => 'Garantía',
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
snipe	a7a10455ae	Bumped version	2017-08-25 13:27:58 -07:00
snipe	bd02b9ed62	Audit tweaks	2017-08-25 10:18:18 -07:00
snipe	16f57e16cb	Fixes #1190 - added basic audit workflow	2017-08-25 10:04:19 -07:00
snipe	af6f208c43	Reordered settings nav	2017-08-25 10:03:05 -07:00
snipe	52270fa4db	Derp	2017-08-25 08:30:48 -07:00
snipe	bf3731d65c	Set default min password to 10	2017-08-25 08:23:23 -07:00
snipe	233ebf06ee	ANOTHER fix for enum fuckery	2017-08-25 07:36:44 -07:00
snipe	e27f6a483d	Updated translations	2017-08-25 07:32:57 -07:00
snipe	19670f9dd8	Remove assigned_to constraint	2017-08-25 06:30:10 -07:00
snipe	1448229cd2	Fixes location user route	2017-08-25 06:30:00 -07:00
snipe	4721cab928	Grr.	2017-08-25 06:08:19 -07:00
snipe	08f3e78d26	Merge branch 'checkout-to-location-v2' of https://github.com/dmeltzer/snipe-it into dmeltzer-checkout-to-location-v2 # Conflicts: # app/Http/Controllers/Api/UsersController.php # app/Http/Transformers/LocationsTransformer.php # resources/views/locations/view.blade.php # routes/api.php # tests/_data/dump.sql	2017-08-25 06:04:22 -07:00
snipe	62227ec27d	Link to location in user view	2017-08-25 05:48:32 -07:00
snipe	10711245ba	Fixes #3792 - parent/child locations in API	2017-08-25 05:32:12 -07:00
snipe	29a7c8577d	Fixes #3849 - fillable for accessories	2017-08-25 03:48:07 -07:00
snipe	dfb1ff81e6	Fixes settings problem in unit tests	2017-08-25 03:40:56 -07:00
snipe	021e723acf	Fixed typo	2017-08-25 03:27:41 -07:00
snipe	14c0c314aa	Make sure payload is always passed, even if null	2017-08-25 03:27:31 -07:00
snipe	d23ea70b08	Added auth check back to asset store	2017-08-25 03:26:50 -07:00
snipe	1b047c768b	Added fullName() presenter for locations	2017-08-25 03:26:10 -07:00
Daniel Meltzer	54279f22a3	Update DB to fix tests.	2017-06-12 18:24:20 -05:00
Daniel Meltzer	dfea47a272	Fix location view display. Migrate to api controller methods and fix missing bits to make this happen. Show manager on the location view page.	2017-06-12 18:24:20 -05:00
Daniel Meltzer	f0d78091d2	Add a manager field to locations. This is round one of the rethink of checkout-to-everything. A location now has a manager field, and the manager (by default) be responsible for assets checked out to the location.	2017-06-12 18:23:50 -05:00