Merge remote-tracking branch 'origin/develop'

Bumped version
2016-08-01 10:32:04 -07:00 · 2016-08-01 10:31:46 -07:00 · 2016-08-01 10:18:01 -07:00 · 2016-08-01 10:17:46 -07:00 · 2016-07-30 17:27:29 -07:00 · 2016-07-30 17:27:08 -07:00
297 changed files with 4220 additions and 1270 deletions
@@ -1,49 +1,38 @@
-/vendor
-/node_modules
-Homestead.yaml
-Homestead.json
-.env
-
-tests/_output/*
+.couscous
 .DS_Store
-public/uploads/models/*
-public/uploads/avatars/*
-public/uploads/suppliers/*
-public/uploads/assets/*
-public/uploads/users/*
+.env
+.idea
+/bin/
+/bootstrap/compiled.php
+/node_modules
+/vendor
+app/database/*.sqlite
+app/storage/meta/services.json
+composer.phar
+crowdin.yaml
+Homestead.json
+Homestead.yaml
+output
+phpDocumentor.phar
 public/uploads/*.gif
 public/uploads/*.jpg
 public/uploads/*.png
-public/uploads/*.tif
 public/uploads/*.svg
-storage/app/private_uploads/users/*
-phpDocumentor.phar
-output
-tests/_support/_generated/*
-
-
-/bootstrap/compiled.php
-composer.phar
-app/config/database.php
-app/config/mail.php
-app/database/*.sqlite
-app/storage/meta/services.json
-app/config/*/mail.php
-app/config/*/session.php
-app/config/*/database.php
-app/config/*/app.php
-app/config/*/ldap.php
-public/packages/*
-storage/logs/*
-storage/debugbar/
-/bin/
-.idea
-crowdin.yaml
+public/uploads/*.tif
+public/uploads/assets/*
+public/uploads/avatars/*
 public/uploads/logo.gif
-public/uploads/logo.svg
 public/uploads/logo.png
-.couscous
+public/uploads/logo.svg
+public/uploads/models/*
+public/uploads/suppliers/*
+public/uploads/users/*
+storage/app/private_uploads/users/*
+storage/debugbar/
 storage/dumps/*
-tests/_data/scenarios
 storage/laravel-backups
+storage/logs/*
 storage/private_uploads/users/*
+tests/_data/scenarios
+tests/_output/*
+tests/_support/_generated/*
@@ -63,6 +63,9 @@ class ObjectImportCommand extends Command
    {
        $filename = $this->argument('filename');

+        $tmp_password  = substr(str_shuffle("0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"), 0, 20);
+        $password = bcrypt($tmp_password);
+

        if (!$this->option('web-importer')) {
            $logFile = $this->option('logfile');
@@ -109,7 +112,7 @@ class ObjectImportCommand extends Command
            $bar = $this->output->createProgressBar(count($newarray));
        }
        // Loop through the records
-        DB::transaction(function () use (&$newarray, $bar) {
+        DB::transaction(function () use (&$newarray, $bar, $password) {
            Model::unguard();
            $item_type = strtolower($this->option('item-type'));

@@ -154,7 +157,8 @@ class ObjectImportCommand extends Command
                $this->log('Company Name: ' . $item_company_name);
                $this->log('Status: ' . $item_status_name);

-                $item["user"] = $this->createOrFetchUser($row);
+
+                $item["user"] = $this->createOrFetchUser($row, $password);

                $item["location"] = $this->createOrFetchLocation($item_location);
                $item["category"] = $this->createOrFetchCategory($item_category, $item_type);
@@ -456,6 +460,10 @@ class ObjectImportCommand extends Command
        $status = new Statuslabel();
        $status->name = $asset_statuslabel_name;

+        $status->deployable = 1;
+        $status->pending = 0;
+        $status->archived = 0;
+

        if (!$this->option('testrun')) {
            if ($status->save()) {
@@ -627,7 +635,7 @@ class ObjectImportCommand extends Command
     * @internal param string $first_name
     * @internal param string $last_name
     */
-    public function createOrFetchUser($row)
+    public function createOrFetchUser($row, $password = null)
    {
        $user_name = $this->array_smart_fetch($row, "name");
        $user_email = $this->array_smart_fetch($row, "email");
@@ -685,14 +693,13 @@ class ObjectImportCommand extends Command
                $this->log('User '.$user_username.' already exists');
            } elseif (( $first_name != '') && ($last_name != '') && ($user_username != '')) {
                $user = new \App\Models\User;
-                $password  = substr(str_shuffle("0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"), 0, 20);
-
                $user->first_name = $first_name;
                $user->last_name = $last_name;
                $user->username = $user_username;
                $user->email = $user_email;
-                $user->password = bcrypt($password);
                $user->activated = 1;
+                $user->password = $password;
+
                if ($user->save()) {
                    $this->log('User '.$first_name.' created');
                } else {
@@ -42,7 +42,7 @@ class Versioning extends Command
    {
        // Path to the file containing your version
        // This will be overwritten everything you commit a message
-        $versionFile = app_path().'/config/version.php';
+        $versionFile = 'config/version.php';

        // The git's output
        // get the argument passed in the git command
@@ -50,7 +50,7 @@ class Versioning extends Command

         // discard the commit hash
         $version = explode('-', $hash_version);
-         $realVersion = $version[0] . '-' . $version[1];
+         $realVersion = $version[0];

         // save the version array to a variable
         $array = var_export(array('app_version' => $realVersion,'hash_version' => $hash_version), true);
@@ -403,4 +403,30 @@ class Helper
        return $permissions_arr;
    }

+    /**
+     * Introspects into the model validation to see if the field passed is required.
+     * This is used by the blades to add a required class onto the HTML element.
+     * This isn't critical, but is helpful to keep form fields in sync with the actual
+     * model level validation.
+     *
+     * This does not currently handle form request validation requiredness :(
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v3.0]
+     * @return boolean
+     */
+    public static function checkIfRequired($class, $field) {
+        $rules = $class::rules();
+        foreach ($rules as $rule_name => $rule) {
+            if ($rule_name == $field) {
+                if (strpos($rule, 'required') === false) {
+                    return false;
+                } else {
+                    return true;
+                }
+
+            }
+        }
+    }
+
 }
@@ -549,7 +549,7 @@ class AccessoriesController extends Controller
    **/
    public function getDatatable(Request $request)
    {
-        $accessories = Accessory::select('accessories.*')->with('category', 'company')
+        $accessories = Company::scopeCompanyables(Accessory::select('accessories.*')->with('category', 'company'))
        ->whereNull('accessories.deleted_at');

        if (Input::has('search')) {
@@ -39,6 +39,7 @@ use Symfony\Component\Console\Output\BufferedOutput;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use TCPDF;
 use View;
+use Carbon\Carbon;

 /**
 * This class controls all actions related to assets for
@@ -624,8 +625,13 @@ class AssetsController extends Controller
        // Was the asset updated?
        if ($asset->save()) {

-            $checkout_at = e(Input::get('checkin_at'));
-            $logaction = $asset->createLogRecord('checkin', $asset, $admin, $user, null, e(Input::get('note')), $checkout_at);
+            if ($request->input('checkin_at') == Carbon::now()->format('Y-m-d')) {
+                $checkin_at = Carbon::now();
+            } else {
+                $checkin_at = $request->input('checkin_at').' 00:00:00';
+            }
+            //$checkin_at = e(Input::get('checkin_at'));
+            $logaction = $asset->createLogRecord('checkin', $asset, $admin, $user, null, e(Input::get('note')), $checkin_at);


            $settings = Setting::getSettings();
@@ -1408,7 +1414,7 @@ class AssetsController extends Controller
    {


-        $assets = Asset::select('assets.*')->with('model', 'assigneduser', 'assigneduser.userloc', 'assetstatus', 'defaultLoc', 'assetlog', 'model', 'model.category', 'model.manufacturer', 'model.fieldset', 'assetstatus', 'assetloc', 'company')
+        $assets = Company::scopeCompanyables(Asset::select('assets.*'))->with('model', 'assigneduser', 'assigneduser.userloc', 'assetstatus', 'defaultLoc', 'assetlog', 'model', 'model.category', 'model.manufacturer', 'model.fieldset', 'assetstatus', 'assetloc', 'company')
        ->Hardware();

        if (Input::has('search')) {
@@ -1578,4 +1584,68 @@ class AssetsController extends Controller

        return $data;
    }
+
+      public function getBulkCheckout()
+      {
+          // Get the dropdown of users and then pass it to the checkout view
+          $users_list = Helper::usersList();
+          // Filter out assets that are not deployable.
+          $assets = Asset::RTD()->get();
+  
+          $assets_list = Company::scopeCompanyables($assets, 'assets.company_id')->lists('detailed_name', 'id')->toArray();
+  
+          return View::make('hardware/bulk-checkout')->with('users_list', $users_list)->with('assets_list', $assets_list);
+      }
+  
+      public function postBulkCheckout(Request $request)
+      {
+
+          $this->validate($request, [
+             "assigned_to"   => 'required'
+          ]);
+
+          $user = User::find(e(Input::get('assigned_to')));
+          $admin = Auth::user();
+  
+          $asset_ids = array_filter(Input::get('selected_assets'));
+  
+          if ((Input::has('checkout_at')) && (Input::get('checkout_at')!= date("Y-m-d"))) {
+              $checkout_at = e(Input::get('checkout_at'));
+          } else {
+              $checkout_at = date("Y-m-d H:i:s");
+          }
+  
+          if (Input::has('expected_checkin')) {
+              $expected_checkin = e(Input::get('expected_checkin'));
+          } else {
+              $expected_checkin = '';
+          }
+  
+          $has_errors = false;
+          $errors = [];
+          DB::transaction(function() use ($user, $admin, $checkout_at, $expected_checkin, $errors, $asset_ids)
+          {          
+              foreach($asset_ids as $asset_id)
+              {
+                  $asset = Asset::find($asset_id);
+  
+                  $error = $asset->checkOutToUser($user, $admin, $checkout_at, $expected_checkin, e(Input::get('note')), null);
+  
+                  if($error)
+                  {
+                      $has_errors = true;
+                      array_merge_recursive($errors, $asset->getErrors()->toArray());
+                  }
+              }
+            });
+  
+          if (!$errors) {
+            // Redirect to the new asset page
+              return redirect()->to("hardware")->with('success', trans('admin/hardware/message.checkout.success'));
+          }
+  
+        // Redirect to the asset management page with error
+          return redirect()->to("hardware/bulk-checkout")->with('error', trans('admin/hardware/message.checkout.error'))->withErrors($errors);
+      }
+
 }
@@ -1,6 +1,7 @@
 <?php
 namespace App\Http\Controllers;

+use Illuminate\Http\Request;
 use App\Helpers\Helper;
 use App\Models\Category as Category;
 use App\Models\Company;
@@ -133,7 +134,7 @@ class CategoriesController extends Controller
    * @since [v1.0]
    * @return Redirect
    */
-    public function postEdit($categoryId = null)
+    public function postEdit(Request $request, $categoryId = null)
    {
        // Check if the blog post exists
        if (is_null($category = Category::find($categoryId))) {
@@ -142,12 +143,14 @@ class CategoriesController extends Controller
        }

        // Update the category data
-        $category->name            = e(Input::get('name'));
-        $category->category_type        = e(Input::get('category_type'));
-        $category->eula_text            = e(Input::get('eula_text'));
-        $category->use_default_eula     = e(Input::get('use_default_eula', '0'));
-        $category->require_acceptance   = e(Input::get('require_acceptance', '0'));
-        $category->checkin_email        = e(Input::get('checkin_email', '0'));
+        $category->name            = e($request->input('name'));
+        // If the item count is > 0, we disable the category type in the edit. Disabled items
+        // don't POST, so if the category_type is blank we just set it to the default.
+        $category->category_type        = e($request->input('category_type', $category->category_type));
+        $category->eula_text            = e($request->input('eula_text'));
+        $category->use_default_eula     = e($request->input('use_default_eula', '0'));
+        $category->require_acceptance   = e($request->input('require_acceptance', '0'));
+        $category->checkin_email        = e($request->input('checkin_email', '0'));

        if ($category->save()) {
        // Redirect to the new category page
@@ -410,8 +410,8 @@ class ComponentsController extends Controller
    **/
    public function getDatatable()
    {
-        $components = Component::select('components.*')->whereNull('components.deleted_at')
-            ->with('company', 'location', 'category');
+        $components = Company::scopeCompanyables(Component::select('components.*')->whereNull('components.deleted_at')
+            ->with('company', 'location', 'category'));

        if (Input::has('search')) {
            $components = $components->TextSearch(Input::get('search'));
@@ -503,7 +503,7 @@ class ComponentsController extends Controller

        foreach ($component->assets as $component_assignment) {
            $rows[] = array(
-            'name' => (string)link_to('/hardware/'.$component_assignment->id.'/view', e($component_assignment->name)),
+            'name' => (string)link_to('/hardware/'.$component_assignment->id.'/view', e($component_assignment->showAssetName())),
            'qty' => e($component_assignment->pivot->assigned_qty),
            'created_at' => ($component_assignment->created_at->format('Y-m-d H:i:s')=='-0001-11-30 00:00:00') ? '' : $component_assignment->created_at->format('Y-m-d H:i:s'),
            );
@@ -397,8 +397,8 @@ class ConsumablesController extends Controller
    */
    public function getDatatable()
    {
-        $consumables = Consumable::select('consumables.*')->whereNull('consumables.deleted_at')
-            ->with('company', 'location', 'category', 'users');
+        $consumables = Company::scopeCompanyables(Consumable::select('consumables.*')->whereNull('consumables.deleted_at')
+            ->with('company', 'location', 'category', 'users'));

        if (Input::has('search')) {
            $consumables = $consumables->TextSearch(e(Input::get('search')));
@@ -147,6 +147,25 @@ class CustomFieldsController extends Controller
        }
    }

+
+    /**
+     * Detach a custom field from a fieldset.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v3.0]
+     * @return Redirect
+     */
+    public function deleteFieldFromFieldset($field_id, $fieldset_id)
+    {
+        $field = CustomField::find($field_id);
+
+        if ($field->fieldset()->detach($fieldset_id)) {
+            return redirect()->route("admin.custom_fields.index")->with("success", trans('admin/custom_fields/message.field.delete.success'));
+        }
+
+        return redirect()->back()->withErrors(['message' => "Field is in-use"]);
+    }
+
    /**
    * Delete a custom field.
    *
@@ -158,6 +177,8 @@ class CustomFieldsController extends Controller
    {
        $field=CustomField::find($field_id);

+
+
        if ($field->fieldset->count()>0) {
            return redirect()->back()->withErrors(['message' => "Field is in-use"]);
        } else {
@@ -551,7 +551,7 @@ class LicensesController extends Controller
                $slack_msg = strtoupper($logaction->asset_type).' license <'.config('app.url').'/admin/licenses/'.$license->id.'/view'.'|'.$license->name.'> checked out to <'.config('app.url').'/hardware/'.$asset->id.'/view|'.$asset->showAssetName().'> by <'.config('app.url').'/admin/users/'.$user->id.'/view'.'|'.$user->fullName().'>.';
            } else {
                $logaction->checkedout_to = e(Input::get('assigned_to'));
-                $slack_msg = strtoupper($logaction->asset_type).' license <'.config('app.url').'/admin/licenses/'.$license->id.'/view'.'|'.$license->name.'> checked out to <'.config('app.url').'/admin/users/'.$asset->id.'/view|'.$is_assigned_to->fullName().'> by <'.config('app.url').'/admin/users/'.$user->id.'/view'.'|'.$user->fullName().'>.';
+                $slack_msg = strtoupper($logaction->asset_type).' license <'.config('app.url').'/admin/licenses/'.$license->id.'/view'.'|'.$license->name.'> checked out to <'.config('app.url').'/admin/users/'.$user->id.'/view|'.$is_assigned_to->fullName().'> by <'.config('app.url').'/admin/users/'.$user->id.'/view'.'|'.$user->fullName().'>.';
            }


@@ -965,7 +965,7 @@ class LicensesController extends Controller
    */
    public function getDatatable()
    {
-        $licenses = License::with('company');
+        $licenses = Company::scopeCompanyables(License::with('company'));

        if (Input::has('search')) {
            $licenses = $licenses->TextSearch(Input::get('search'));
@@ -348,6 +348,7 @@ class SettingsController extends Controller
        $setting->qr_text = e(Input::get('qr_text'));
        $setting->auto_increment_prefix = e(Input::get('auto_increment_prefix'));
        $setting->auto_increment_assets = e(Input::get('auto_increment_assets', '0'));
+        $setting->zerofill_count = e(Input::get('zerofill_count'));
        $setting->alert_interval = e(Input::get('alert_interval'));
        $setting->alert_threshold = e(Input::get('alert_threshold'));
        $setting->email_domain = e(Input::get('email_domain'));
@@ -415,6 +416,7 @@ class SettingsController extends Controller
        $setting->ldap_email = e(Input::get('ldap_email'));
        $setting->ad_domain = e(Input::get('ad_domain'));
        $setting->is_ad = e(Input::get('is_ad', '0'));
+        $setting->ldap_tls = e(Input::get('ldap_tls', '0'));

        // If validation fails, we'll exit the operation now.
        if ($setting->save()) {
@@ -33,6 +33,7 @@ use Symfony\Component\HttpFoundation\JsonResponse;
 use URL;
 use View;
 use Illuminate\Http\Request;
+use Gate;

 /**
 * This controller handles all actions related to Users for
@@ -145,7 +146,7 @@ class UsersController extends Controller
            } else {
                $user->groups()->sync(array());
            }
-            
+
            if (($request->input('email_user') == 1) && ($request->has('email'))) {
              // Send the credentials through email
                $data = array();
@@ -853,7 +854,7 @@ class UsersController extends Controller
    * @see UsersController::getIndex() method that consumed this JSON response
    * @return string JSON
    */
-    public function getDatatable($status = null)
+    public function getDatatable(Request $request, $status = null)
    {

        if (Input::has('offset')) {
@@ -922,24 +923,30 @@ class UsersController extends Controller
                $group_names .= '<a href="' . config('app.url') . '/admin/groups/' . $group->id . '/edit" class="label  label-default">' . $group->name . '</a> ';
            }

+            if (Gate::allows('users:edit')) {
+                if (!is_null($user->deleted_at)) {

-            if (!is_null($user->deleted_at)) {
-
-                $actions .= '<a href="' . route('restore/user', $user->id) . '" class="btn btn-warning btn-sm"><i class="fa fa-share icon-white"></i></a> ';
-            } else {
-
-                if ($user->accountStatus() == 'suspended') {
-                    $actions .= '<a href="' . route('unsuspend/user', $user->id) . '" class="btn btn-default btn-sm"><span class="fa fa-clock-o"></span></a> ';
-                }
-
-                $actions .= '<a href="' . route('update/user', $user->id) . '" class="btn btn-warning btn-sm"><i class="fa fa-pencil icon-white"></i></a> ';
-
-                $actions .= '<a href="' . route('clone/user', $user->id) . '" class="btn btn-info btn-sm"><i class="fa fa-clone"></i></a>';
-
-                if ((Auth::user()->id !== $user->id) && (!config('app.lock_passwords'))) {
-                    $actions .= '<a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="' . route('delete/user', $user->id) . '" data-content="Are you sure you wish to delete this user?" data-title="Delete ' . htmlspecialchars($user->first_name) . '?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a> ';
+                    $actions .= '<a href="' . route('restore/user',
+                            $user->id) . '" class="btn btn-warning btn-sm"><i class="fa fa-share icon-white"></i></a> ';
                } else {
-                    $actions .= ' <span class="btn delete-asset btn-danger btn-sm disabled"><i class="fa fa-trash icon-white"></i></span>';
+
+                    if ($user->accountStatus() == 'suspended') {
+                        $actions .= '<a href="' . route('unsuspend/user',
+                                $user->id) . '" class="btn btn-default btn-sm"><span class="fa fa-clock-o"></span></a> ';
+                    }
+
+                    $actions .= '<a href="' . route('update/user',
+                            $user->id) . '" class="btn btn-warning btn-sm"><i class="fa fa-pencil icon-white"></i></a> ';
+
+                    $actions .= '<a href="' . route('clone/user',
+                            $user->id) . '" class="btn btn-info btn-sm"><i class="fa fa-clone"></i></a>';
+
+                    if ((Auth::user()->id !== $user->id) && (!config('app.lock_passwords'))) {
+                        $actions .= '<a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="' . route('delete/user',
+                                $user->id) . '" data-content="Are you sure you wish to delete this user?" data-title="Delete ' . htmlspecialchars($user->first_name) . '?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a> ';
+                    } else {
+                        $actions .= ' <span class="btn delete-asset btn-danger btn-sm disabled"><i class="fa fa-trash icon-white"></i></span>';
+                    }
                }
            }
            $actions .= '</nobr>';
@@ -1079,7 +1086,7 @@ class UsersController extends Controller
                return redirect()->route('users')->with('error', trans('general.insufficient_permissions'));
            } else {
                $log = Actionlog::find($fileId);
-                $file = $log->get_src();
+                $file = $log->get_src('users');
                return Response::download($file);
            }
        } else {
@@ -1180,6 +1187,10 @@ class UsersController extends Controller

        $results = Ldap::findLdapUsers();

+        $tmp_pass = substr(str_shuffle("0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"), 0, 20);
+        $pass = bcrypt($tmp_pass);
+
+
        for ($i = 0; $i < $results["count"]; $i++) {
            if (empty($ldap_result_active_flag) || $results[$i][$ldap_result_active_flag][0] == "TRUE") {

@@ -1194,19 +1205,18 @@ class UsersController extends Controller
                $item["createorupdate"] = 'updated';
                if (!$user = User::where('username', $item["username"])->first()) {
                    $user = new User;
+                    $user->password = $pass;
                    $item["createorupdate"] = 'created';
                }

-
              // Create the user if they don't exist.
-                $pass = substr(str_shuffle("0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"), 0, 20);
+

                $user->first_name = e($item["firstname"]);
                $user->last_name = e($item["lastname"]);
                $user->username = e($item["username"]);
                $user->email = e($item["email"]);
                $user->employee_num = e($item["employee_number"]);
-                $user->password = bcrypt($pass);
                $user->activated = 1;
                $user->location_id = e($location_id);
                $user->notes = 'Imported from LDAP';
@@ -1234,7 +1244,7 @@ class UsersController extends Controller



-        return redirect()->route('ldap/user')->with('success', "OK")->with('summary', $summary);
+        return redirect()->route('ldap/user')->with('success', "LDAP Import successful.")->with('summary', $summary);
    }

    /**
@@ -1246,9 +1256,7 @@ class UsersController extends Controller
    */
    public function getAssetList($userId)
    {
-        $assets = Asset::where('assigned_to', '=', $userId)->get();
+        $assets = Asset::where('assigned_to', '=', $userId)->with('model')->get();
        return response()->json($assets);
-        //$foo = Asset::where('assigned_to','=',$userId)->get();
-        //print_r($foo);
    }
 }
@@ -26,7 +26,6 @@ class SaveUserRequest extends Request
        return [
            'first_name'              => 'required|string|min:1',
            'last_name'               => 'required|string|min:1',
-            'username'                => 'required|string|min:2|unique:users,username,NULL,deleted_at',
            'email'                   => 'email',
            'password'                => 'required|min:6',
            'password_confirm'        => 'sometimes|required_with:password',
@@ -25,7 +25,6 @@ class UpdateUserRequest extends Request
    {
        return [
            'first_name'              => 'required|string|min:1',
-            'last_name'               => 'required|string|min:1',
            'email'                   => 'email',
            'password_confirm'        => 'sometimes|required_with:password',
        ];
@@ -0,0 +1,23 @@
+<?php
+namespace App\Http\Traits;
+
+trait UniqueUndeletedTrait
+{
+
+    /**
+    * Prepare a unique_ids rule, adding a model identifier if required.
+    *
+    * @param  array  $parameters
+    * @param  string $field
+    * @return string
+    */
+    protected function prepareUniqueUndeletedRule($parameters, $field)
+    {
+        // Only perform a replacement if the model has been persisted.
+        if ($this->exists) {
+            return 'unique_undeleted:'.$this->table.','. $this->getKey();
+        }
+
+        return 'unique_undeleted:'.$this->table.',0';
+    }
+}
@@ -275,6 +275,13 @@ Route::group(
            ]
        );

+        # Bulk checkout / checkin
+         Route::get(
+             'bulkcheckout',
+             [ 'as' => 'hardware/bulkcheckout', 'uses' => 'AssetsController@getBulkCheckout' ]
+         );
+         Route::post('bulkcheckout', 'AssetsController@postBulkCheckout');
+
        # Asset Model Management
        Route::group([ 'prefix' => 'models', 'middleware' => 'auth' ], function () {

@@ -638,27 +645,28 @@ Route::group([ 'prefix' => 'admin','middleware' => ['web','auth']], function ()
    Route::get('custom_fields/create-field', ['uses' =>'CustomFieldsController@createField','as' => 'admin.custom_fields.create-field']);
    Route::post('custom_fields/create-field', ['uses' => 'CustomFieldsController@storeField','as' => 'admin.custom_fields.store-field']);
    Route::post('custom_fields/{id}/associate', ['uses' => 'CustomFieldsController@associate','as' => 'admin.custom_fields.associate']);
+    Route::get('custom_fields/{field_id}/{fieldset_id}/disassociate', ['uses' => 'CustomFieldsController@deleteFieldFromFieldset','as' => 'admin.custom_fields.disassociate']);
    Route::match(['DELETE'], 'custom_fields/delete-field/{id}', ['uses' => 'CustomFieldsController@deleteField','as' => 'admin.custom_fields.delete-field']);
    Route::resource('custom_fields', 'CustomFieldsController');

    # User Management
    Route::group([ 'prefix' => 'users', 'middleware' => ['web','auth','authorize:users.view']], function () {

-        Route::get('ldap', ['as' => 'ldap/user', 'uses' => 'UsersController@getLDAP' ]);
+        Route::get('ldap', ['as' => 'ldap/user', 'uses' => 'UsersController@getLDAP', 'middleware' => ['authorize:users.edit'] ]);
        Route::post('ldap', 'UsersController@postLDAP');

-        Route::get('create', [ 'as' => 'create/user', 'uses' => 'UsersController@getCreate' ]);
-        Route::post('create', 'UsersController@postCreate');
-        Route::get('import', [ 'as' => 'import/user', 'uses' => 'UsersController@getImport' ]);
-        Route::post('import', 'UsersController@postImport');
-        Route::get('{userId}/edit', [ 'as' => 'update/user', 'uses' => 'UsersController@getEdit' ]);
-        Route::post('{userId}/edit', 'UsersController@postEdit');
-        Route::get('{userId}/clone', [ 'as' => 'clone/user', 'uses' => 'UsersController@getClone' ]);
-        Route::post('{userId}/clone', 'UsersController@postCreate');
-        Route::get('{userId}/delete', [ 'as' => 'delete/user', 'uses' => 'UsersController@getDelete' ]);
-        Route::get('{userId}/restore', [ 'as' => 'restore/user', 'uses' => 'UsersController@getRestore' ]);
-        Route::get('{userId}/view', [ 'as' => 'view/user', 'uses' => 'UsersController@getView' ]);
-        Route::get('{userId}/unsuspend', [ 'as' => 'unsuspend/user', 'uses' => 'UsersController@getUnsuspend' ]);
+        Route::get('create', [ 'as' => 'create/user', 'uses' => 'UsersController@getCreate', 'middleware' => ['authorize:users.edit']  ]);
+        Route::post('create', [ 'uses' => 'UsersController@postCreate', 'middleware' => ['authorize:users.edit']  ]);
+        Route::get('import', [ 'as' => 'import/user', 'uses' => 'UsersController@getImport', 'middleware' => ['authorize:users.edit']  ]);
+        Route::post('import', [ 'uses' => 'UsersController@postImport', 'middleware' => ['authorize:users.edit']  ]);
+        Route::get('{userId}/edit', [ 'as' => 'update/user', 'uses' => 'UsersController@getEdit', 'middleware' => ['authorize:users.edit']  ]);
+        Route::post('{userId}/edit', [ 'uses' => 'UsersController@postEdit', 'middleware' => ['authorize:users.edit']  ]);
+        Route::get('{userId}/clone', [ 'as' => 'clone/user', 'uses' => 'UsersController@getClone', 'middleware' => ['authorize:users.edit']  ]);
+        Route::post('{userId}/clone', [ 'uses' => 'UsersController@postCreate', 'middleware' => ['authorize:users.edit']  ]);
+        Route::get('{userId}/delete', [ 'as' => 'delete/user', 'uses' => 'UsersController@getDelete', 'middleware' => ['authorize:users.edit']  ]);
+        Route::get('{userId}/restore', [ 'as' => 'restore/user', 'uses' => 'UsersController@getRestore', 'middleware' => ['authorize:users.edit']  ]);
+        Route::get('{userId}/view', [ 'as' => 'view/user', 'uses' => 'UsersController@getView' , 'middleware' => ['authorize:users.view'] ]);
+        Route::get('{userId}/unsuspend', [ 'as' => 'unsuspend/user', 'uses' => 'UsersController@getUnsuspend', 'middleware' => ['authorize:users.edit'] ]);
        Route::get(
            '{userId}/deletefile/{fileId}',
            [ 'as' => 'delete/userfile', 'uses' => 'UsersController@getDeleteFile' ]
@@ -672,14 +680,16 @@ Route::group([ 'prefix' => 'admin','middleware' => ['web','auth']], function ()
            'bulkedit',
            [
                'as'   => 'users/bulkedit',
-                'uses' => 'UsersController@postBulkEdit'
+                'uses' => 'UsersController@postBulkEdit',
+                'middleware' => ['authorize:users.edit'],
            ]
        );
        Route::post(
            'bulksave',
            [
                'as'   => 'users/bulksave',
-                'uses' => 'UsersController@postBulkSave'
+                'uses' => 'UsersController@postBulkSave',
+                'middleware' => ['authorize:users.edit'],
            ]
        );

@@ -10,6 +10,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
 use Log;
 use Parsedown;
 use Watson\Validating\ValidatingTrait;
+use App\Http\Traits\UniqueUndeletedTrait;
 use DateTime;
 use App\Models\Setting;
 use App\Helpers\Helper;
@@ -40,6 +41,7 @@ class Asset extends Depreciable
  */
    protected $injectUniqueIdentifier = true;
    use ValidatingTrait;
+    use UniqueUndeletedTrait;

    protected $rules = [
    'name'            => 'min:2|max:255',
@@ -51,7 +53,7 @@ class Asset extends Depreciable
    'checkout_date'   => 'date|max:10|min:10',
    'checkin_date'    => 'date|max:10|min:10',
    'supplier_id'     => 'integer',
-    'asset_tag'       => 'required|min:1|max:255|unique:assets,asset_tag,NULL,deleted_at',
+    'asset_tag'       => 'required|min:1|max:255|unique_undeleted',
    'status'          => 'integer',
    ];

@@ -70,6 +72,8 @@ class Asset extends Depreciable
    }


+
+
  /**
  * Checkout asset
  */
@@ -175,8 +179,8 @@ class Asset extends Depreciable

    public function getDetailedNameAttribute()
    {
-        if ($this->assigned_user) {
-            $user_name = $user->fullName();
+        if ($this->assignedUser) {
+            $user_name = $this->assignedUser->fullName();
        } else {
            $user_name = "Unassigned";
        }
@@ -328,7 +332,7 @@ class Asset extends Depreciable
    public static function assetcount()
    {

-        return Asset::where('physical', '=', '1')
+        return Company::scopeCompanyables(Asset::where('physical', '=', '1'))
               ->whereNull('deleted_at', 'and')
               ->count();
    }
@@ -372,7 +376,10 @@ class Asset extends Depreciable
    {

        if ($this->name == '') {
-            return $this->model->name;
+            if ($this->model) {
+                return $this->model->name.' ('.$this->asset_tag.')';
+            }
+            return $this->asset_tag;
        } else {
            return $this->name;
        }
@@ -462,13 +469,24 @@ class Asset extends Depreciable
            $asset_tag = \DB::table('assets')
                ->where('physical', '=', '1')
                ->max('id');
+
+            if ($settings->zerofill_count > 0) {
+                return $settings->auto_increment_prefix.Asset::zerofill(($asset_tag + 1),$settings->zerofill_count);
+            }
            return $settings->auto_increment_prefix.($asset_tag + 1);
        } else {
            return false;
        }
    }

-    public function checkin_email()
+
+    public static function zerofill ($num, $zerofill = 3)
+    {
+        return str_pad($num, $zerofill, '0', STR_PAD_LEFT);
+    }
+
+
+public function checkin_email()
    {
        return $this->model->category->checkin_email;
    }
@@ -641,7 +659,7 @@ class Asset extends Depreciable
    public function scopeRequestableAssets($query)
    {

-        return $query->where('requestable', '=', 1)
+        return Company::scopeCompanyables($query->where('requestable', '=', 1))
        ->whereHas('assetstatus', function ($query) {

            $query->where('deployable', '=', 1)
@@ -4,6 +4,7 @@ namespace App\Models;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Watson\Validating\ValidatingTrait;
+use App\Http\Traits\UniqueUndeletedTrait;

 /**
 * Model for Categories. Categories are a higher-level group
@@ -25,7 +26,7 @@ class Category extends Model
    */
    public $rules = array(
        'user_id' => 'numeric',
-        'name'   => 'required|min:1|max:255|unique:categories,name,NULL,deleted_at',
+        'name'   => 'required|min:1|max:255|unique_undeleted',
        'category_type'   => 'required',
    );

@@ -38,6 +39,7 @@ class Category extends Model
    */
    protected $injectUniqueIdentifier = true;
    use ValidatingTrait;
+    use UniqueUndeletedTrait;


    /**
@@ -16,7 +16,11 @@ final class Company extends Model
    protected $table = 'companies';

    // Declare the rules for the model validation
-    protected $rules = ['name' => 'required|min:1|max:255|unique:companies,name'];
+    protected $rules = [
+        'name' => 'required|min:1|max:255|unique:companies,name'
+    ];
+
+
    /**
    * Whether the model should inject it's identifier to the unique
    * validation rules before attempting validation. If this property
@@ -55,11 +59,7 @@ final class Company extends Model
            $company_id = null;
        }

-        if ($company_id == null) {
-            return $query;
-        } else {
-            return $query->where($column, '=', $company_id);
-        }
+        return $query->where($column, '=', $company_id);
    }

    public static function getSelectList()
@@ -86,11 +86,17 @@ final class Company extends Model
        } else {
            $current_user = Auth::user();

-            if ($current_user->company_id != null) {
-                return $current_user->company_id;
-            } else {
+            // Super users should be able to set a company to whatever they need
+            if ($current_user->isSuperUser()) {
                return static::getIdFromInput($unescaped_input);
+            } else {
+                if ($current_user->company_id != null) {
+                    return $current_user->company_id;
+                } else {
+                    return static::getIdFromInput($unescaped_input);
+                }
            }
+
        }
    }

@@ -110,7 +116,7 @@ final class Company extends Model
    public static function isCurrentUserAuthorized()
    {

-        return ((!static::isFullMultipleCompanySupportEnabled()) || (Auth::user()->company_id == null) || (Auth::user()->isSuperUser()));
+        return ((!static::isFullMultipleCompanySupportEnabled()) || (Auth::user()->isSuperUser()));
    }

    public static function canManageUsersCompanies()
@@ -141,7 +147,7 @@ final class Company extends Model
    {
        if (count($companyable_names) == 0) {
            throw new Exception('No Companyable Children to scope');
-        } elseif (!static::isFullMultipleCompanySupportEnabled()) {
+        } elseif (!static::isFullMultipleCompanySupportEnabled() || (Auth::check() && Auth::user()->isSuperUser())) {
            return $query;
        } else {
            $f = function ($q) {
@@ -26,25 +26,29 @@ class Ldap extends Model
        $ldap_host    = Setting::getSettings()->ldap_server;
        $ldap_version = Setting::getSettings()->ldap_version;
        $ldap_server_cert_ignore = Setting::getSettings()->ldap_server_cert_ignore;
+        $ldap_use_tls = Setting::getSettings()->ldap_tls;


        // If we are ignoring the SSL cert we need to setup the environment variable
        // before we create the connection
-        if ($ldap_server_cert_ignore) {
+        if ($ldap_server_cert_ignore=='1') {
            putenv('LDAPTLS_REQCERT=never');
        }

-        // Connecting to LDAP
-        $connection = @ldap_connect($ldap_host) or die("Could not connect to {$ldap_host}");
+        $connection = @ldap_connect($ldap_host);

        if (!$connection) {
-            throw new Exception('Could not connect to LDAP server at '.$ldap_host.': '.ldap_error($connection));
+            throw new Exception('Could not connect to LDAP server at '.$ldap_host.'. Please check your LDAP server name and port number in your settings.');
        }

        // Needed for AD
        ldap_set_option($connection, LDAP_OPT_REFERRALS, 0);
        ldap_set_option($connection, LDAP_OPT_PROTOCOL_VERSION, $ldap_version);

+        if ($ldap_use_tls=='1') {
+            ldap_start_tls($connection);
+        }
+
        return $connection;
    }

@@ -6,6 +6,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
 use App\Models\User;
 use App\Models\Asset;
 use Watson\Validating\ValidatingTrait;
+use App\Http\Traits\UniqueUndeletedTrait;

 class Location extends Model
 {
@@ -13,7 +14,7 @@ class Location extends Model
    protected $dates = ['deleted_at'];
    protected $table = 'locations';
    protected $rules = array(
-      'name'        => 'required|min:3|max:255|unique:locations,name,NULL,deleted_at',
+      'name'        => 'required|min:3|max:255|unique_undeleted',
      'city'        => 'min:3|max:255',
      'state'           => 'min:2|max:32',
      'country'     => 'min:2|max:2|max:2',
@@ -31,6 +32,7 @@ class Location extends Model
    */
    protected $injectUniqueIdentifier = true;
    use ValidatingTrait;
+    use UniqueUndeletedTrait;


    /**
@@ -4,11 +4,13 @@ namespace App\Models;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Watson\Validating\ValidatingTrait;
+use App\Http\Traits\UniqueUndeletedTrait;

 class Statuslabel extends Model
 {
    use SoftDeletes;
    use ValidatingTrait;
+    use UniqueUndeletedTrait;

    protected $injectUniqueIdentifier = true;
    protected $dates = ['deleted_at'];
@@ -16,14 +18,14 @@ class Statuslabel extends Model


    protected $rules = array(
-        'name'  => 'required|string|unique:status_labels,name,NULL,deleted_at',
+        'name'  => 'required|string|unique_undeleted',
        'notes'   => 'string',
        'deployable' => 'required',
        'pending' => 'required',
        'archived' => 'required',
    );

-    protected $fillable = ['name'];
+    protected $fillable = ['name', 'deployable', 'pending', 'archived'];

    /**
     * Show count of assets with status label
@@ -4,14 +4,16 @@ namespace App\Models;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Watson\Validating\ValidatingTrait;
+use App\Http\Traits\UniqueUndeletedTrait;

 class Supplier extends Model
 {
    use SoftDeletes;
    protected $dates = ['deleted_at'];
+    protected $table = 'suppliers';

    protected $rules = array(
-        'name'              => 'required|min:3|max:255|unique:suppliers,name,NULL,deleted_at',
+        'name'              => 'required|min:3|max:255|unique_undeleted',
        'address'           => 'min:3|max:255',
        'address2'          => 'min:2|max:255',
        'city'              => 'min:3|max:255',
@@ -35,6 +37,7 @@ class Supplier extends Model
    */
    protected $injectUniqueIdentifier = true;
    use ValidatingTrait;
+    use UniqueUndeletedTrait;

    /**
     * The attributes that are mass assignable.
@@ -7,8 +7,8 @@ use Illuminate\Auth\Passwords\CanResetPassword;
 use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
 use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract;
 use Watson\Validating\ValidatingTrait;
-use App\Models\Company;
 use Illuminate\Database\Eloquent\SoftDeletes;
+use App\Http\Traits\UniqueUndeletedTrait;

 class User extends Model implements AuthenticatableContract, CanResetPasswordContract
 {
@@ -17,6 +17,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
    use ValidatingTrait;
    use Authenticatable;
    use CanResetPassword;
+    use UniqueUndeletedTrait;

    protected $dates = ['deleted_at'];
    protected $table = 'users';
@@ -32,8 +33,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon

    protected $rules = [
        'first_name'              => 'required|string|min:1',
-        'last_name'               => 'required|string|min:1',
-        'username'                => 'required|string|min:2|unique:users,username,NULL,deleted_at',
+        'username'                => 'required|string|min:2|unique_undeleted',
        'email'                   => 'email',
        'password'                => 'required|min:6',
    ];
@@ -55,7 +55,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon

        $user_permissions = json_decode($this->permissions, true);

-        //If the user is explicitly granted, return false
+        //If the user is explicitly granted, return true
        if (($user_permissions!='') && ((array_key_exists($section, $user_permissions)) && ($user_permissions[$section]=='1'))) {
            return true;
        }
@@ -3,6 +3,8 @@ namespace App\Providers;

 use Validator;
 use Illuminate\Support\ServiceProvider;
+use DB;
+

 /**
 * This service provider handles a few custom validation rules.
@@ -47,6 +49,21 @@ class AppServiceProvider extends ServiceProvider
            }

        });
+
+        // Unique only if undeleted
+        // This works around the use case where multiple deleted items have the same unique attribute.
+        // (I think this is a bug in Laravel's validator?)
+        Validator::extend('unique_undeleted', function($attribute, $value, $parameters, $validator) {
+
+            $count = DB::table($parameters[0])->select('id')->where($attribute,'=',$value)->whereNull('deleted_at')->where('id','!=',$parameters[1])->count();
+
+            if ($count < 1) {
+                return true;
+            } else {
+                return false;
+            }
+
+        });
    }

    /**
@@ -205,7 +205,7 @@ class AuthServiceProvider extends ServiceProvider
        # Components
        # -----------------------------------------
        $gate->define('components.view', function ($user) {
-            if (($user->hasAccess('components.create')) || ($user->hasAccess('admin'))) {
+            if (($user->hasAccess('components.view')) || ($user->hasAccess('admin'))) {
                return true;
            }
        });
@@ -268,6 +268,12 @@ class AuthServiceProvider extends ServiceProvider
            }
        });

+        $gate->define('licenses.keys', function ($user) {
+            if (($user->hasAccess('licenses.keys')) || ($user->hasAccess('admin'))) {
+                return true;
+            }
+        });
+

    }
 }
@@ -117,7 +117,7 @@ return [
    |--------------------------------------------------------------------------
    | This is the path for any uploaded files that have to be run through the
    | auth system to ensure they are not visible to the public. These should be
-    | stored somewhere outside of the web root so that an unautenticated user
+    | stored somewhere outside of the web root so that an unauthenticated user
    | cannot access them.
    |
    | For example: license keys, contracts, etc.
@@ -1,5 +1,5 @@
 <?php
 return array (
-  'app_version' => 'v3.0',
-  'hash_version' => 'v3.0-ebc74a65',
+  'app_version' => 'v3.1',
+  'hash_version' => 'v3.1-84-g139325d',
 );
@@ -18,9 +18,9 @@ class UpdateGroupFieldForReporting extends Migration {
 		// 	//
 		// });

-    DB::update('update groups set permissions = ? where id = ?', ['{"admin":1,"users":1,"reports":1}', 1]);
+    DB::update('update '.DB::getTablePrefix().'groups set permissions = ? where id = ?', ['{"admin":1,"users":1,"reports":1}', 1]);

-    DB::update('update groups set permissions = ? where id = ?', ['{"users":1,"reports":1}', 2]);
+    DB::update('update '.DB::getTablePrefix().'groups set permissions = ? where id = ?', ['{"users":1,"reports":1}', 2]);

      // DB::statement('UPDATE '.$prefix.'groups SET permissions="{\"admin\":1,\"users\":1,\"reports\":1}" where id=1');
      // DB::statement('UPDATE '.$prefix.'groups SET permissions="{\"users\":1,\"reports\":1}" where id=2');
@@ -0,0 +1,78 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class FixCustomFieldsRegexStuff extends Migration
+{
+    /**
+     * Run the migrations.
+     * "ANY" => "",
+     * "ALPHA" => "alpha",
+     * "EMAIL" => "email",
+     * "DATE" => "date",
+     *  "URL" => "url",
+     * "NUMERIC" => "numeric",
+     * "MAC" => "regex:/^[a-fA-F0-9]{2}:[a-fA-F0-9]{2}:[a-fA-F0-9]{2}:[a-fA-F0-9]{2}:[a-fA-F0-9]{2}:[a-fA-F0-9]{2}$/",
+     * "IP" => "ip"
+     *
+     * @return void
+     */
+    public function up()
+    {
+        foreach(\App\Models\CustomField::all() as $custom_field) {
+
+            // Handle alphanumeric
+            if (stripos($custom_field->format, 'ALPHA') !== false) {
+                $custom_field->format='alpha';
+
+            // Numeric
+            } elseif (stripos($custom_field->format, 'NUMERIC') !== false) {
+                $custom_field->format='numeric';
+
+            // IP
+            } elseif (stripos($custom_field->format, 'IP') !== false) {
+                $custom_field->format='ip';
+
+            // Email
+            } elseif (stripos($custom_field->format, 'EMAIL') !== false) {
+                $custom_field->format='email';
+
+            // MAC
+            } elseif (stripos($custom_field->format, 'regex:/^[a-fA-F0-9]{2}:[a-fA-F0-9]{2}:[a-fA-F0-9]{2}:[a-fA-F0-9]{2}:[a-fA-F0-9]{2}:[a-fA-F0-9]{2}$/') !== false) {
+                $custom_field->format='regex:/^[a-fA-F0-9]{2}:[a-fA-F0-9]{2}:[a-fA-F0-9]{2}:[a-fA-F0-9]{2}:[a-fA-F0-9]{2}:[a-fA-F0-9]{2}$/';
+
+            // Date
+            } elseif (stripos($custom_field->format, 'DATE') !== false) {
+                $custom_field->format='date';
+
+
+            // URL
+            } elseif (stripos($custom_field->format, 'URL') !== false) {
+                $custom_field->format='url';
+
+            // ANY
+            } elseif (stripos($custom_field->format, 'ANY') !== false) {
+                $custom_field->format='';
+
+            // Fix any custom regexes
+            } else {
+                $tmp_custom = str_replace('regex:/^', '', $custom_field->format);
+                $tmp_custom = str_replace('$/', '', $tmp_custom);
+                $custom_field->format = 'regex:/^'.$tmp_custom.'$/';
+            }
+
+            $custom_field->save();
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}
@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class OneMoreMacAddrFix extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        foreach(\App\Models\CustomField::all() as $custom_field) {
+
+            if ($custom_field->format=='regex:/^MAC$/') {
+                $custom_field->format = 'regex:/^[a-fA-F0-9]{2}:[a-fA-F0-9]{2}:[a-fA-F0-9]{2}:[a-fA-F0-9]{2}:[a-fA-F0-9]{2}:[a-fA-F0-9]{2}$/';
+            }
+            $custom_field->save();
+
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}
@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddPortToLdapSettings extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('settings', function (Blueprint $table) {
+            $table->string('ldap_port', 5)->default('389');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('settings', function ($table) {
+            $table->dropColumn('ldap_port');
+        });
+    }
+}
@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddTlsToLdapSettings extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('settings', function (Blueprint $table) {
+            $table->boolean('ldap_tls')->default(0);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('settings', function ($table) {
+            $table->dropColumn('ldap_tls');
+        });
+    }
+}
@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddZerofillToSettings extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('settings', function (Blueprint $table) {
+            $table->integer('zerofill_count')->default(5);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('settings', function ($table) {
+            $table->dropColumn('zerofill_count');
+        });
+    }
+}
@@ -1 +1 @@
-See http://docs.snipeitapp.com/installation/server/docker.html for Docker information
+See https://snipe-it.readme.io/docs/docker for Docker information
@@ -2,6 +2,6 @@
 if [ "$(id -u)" != "0" ]; then
  exec sudo "$0" "$@"
 fi
-wget https://raw.githubusercontent.com/snipe/snipe-it/v3/snipeit.sh
+wget https://raw.githubusercontent.com/snipe/snipe-it/master/snipeit.sh
 chmod 744 snipeit.sh
 sudo ./snipeit.sh 2>&1 | sudo tee -a /var/log/snipeit-install.log
@@ -57,6 +57,7 @@ body {
 .content-wrapper,
 .right-side,
 .main-footer {
+  transition: -webkit-transform 0.3s ease-in-out, margin 0.3s ease-in-out;
  transition: transform 0.3s ease-in-out, margin 0.3s ease-in-out;
  margin-left: 230px;
  z-index: 820;
@@ -84,6 +85,7 @@ body {
  .sidebar-open .content-wrapper,
  .sidebar-open .right-side,
  .sidebar-open .main-footer {
+    -webkit-transform: translate(230px, 0);
    transform: translate(230px, 0);
  }
 }
@@ -425,6 +427,7 @@ a:focus {
  min-height: 100%;
  width: 230px;
  z-index: 810;
+  transition: -webkit-transform 0.3s ease-in-out, width 0.3s ease-in-out;
  transition: transform 0.3s ease-in-out, width 0.3s ease-in-out;
 }
@media (max-width: 767px) {
@@ -436,18 +439,21 @@ a:focus {
@media (max-width: 767px) {
  .main-sidebar,
  .left-side {
+    -webkit-transform: translate(-230px, 0);
    transform: translate(-230px, 0);
  }
 }
@media (min-width: 768px) {
  .sidebar-collapse .main-sidebar,
  .sidebar-collapse .left-side {
+    -webkit-transform: translate(-230px, 0);
    transform: translate(-230px, 0);
  }
 }
@media (max-width: 767px) {
  .sidebar-open .main-sidebar,
  .sidebar-open .left-side {
+    -webkit-transform: translate(0, 0);
    transform: translate(0, 0);
  }
 }
@@ -533,6 +539,7 @@ a:focus {
  margin-top: 3px;
 }
 .sidebar-menu li.active > a > .fa-angle-left {
+  -webkit-transform: rotate(-90deg);
  transform: rotate(-90deg);
 }
 .sidebar-menu li.active > .treeview-menu {
@@ -576,6 +583,7 @@ a:focus {
    z-index: 840;
  }
  .sidebar-mini.sidebar-collapse .main-sidebar {
+    -webkit-transform: translate(0, 0);
    transform: translate(0, 0);
    width: 50px!important;
    z-index: 850;
@@ -1142,30 +1150,58 @@ a:focus {
 /* Add fade animation to dropdown menus by appending
 the class .animated-dropdown-menu to the .dropdown-menu ul (or ol)*/
 .open:not(.dropup) > .animated-dropdown-menu {
+  -webkit-backface-visibility: visible !important;
  backface-visibility: visible !important;
+  -webkit-animation: flipInX 0.7s both;
  animation: flipInX 0.7s both;
 }
@keyframes flipInX {
  0% {
+    -webkit-transform: perspective(400px) rotate3d(1, 0, 0, 90deg);
    transform: perspective(400px) rotate3d(1, 0, 0, 90deg);
    transition-timing-function: ease-in;
    opacity: 0;
  }
  40% {
+    -webkit-transform: perspective(400px) rotate3d(1, 0, 0, -20deg);
    transform: perspective(400px) rotate3d(1, 0, 0, -20deg);
    transition-timing-function: ease-in;
  }
  60% {
+    -webkit-transform: perspective(400px) rotate3d(1, 0, 0, 10deg);
    transform: perspective(400px) rotate3d(1, 0, 0, 10deg);
    opacity: 1;
  }
  80% {
+    -webkit-transform: perspective(400px) rotate3d(1, 0, 0, -5deg);
    transform: perspective(400px) rotate3d(1, 0, 0, -5deg);
  }
  100% {
+    -webkit-transform: perspective(400px);
    transform: perspective(400px);
  }
 }
+@-webkit-keyframes flipInX {
+  0% {
+    -webkit-transform: perspective(400px) rotate3d(1, 0, 0, 90deg);
+    -webkit-transition-timing-function: ease-in;
+    opacity: 0;
+  }
+  40% {
+    -webkit-transform: perspective(400px) rotate3d(1, 0, 0, -20deg);
+    -webkit-transition-timing-function: ease-in;
+  }
+  60% {
+    -webkit-transform: perspective(400px) rotate3d(1, 0, 0, 10deg);
+    opacity: 1;
+  }
+  80% {
+    -webkit-transform: perspective(400px) rotate3d(1, 0, 0, -5deg);
+  }
+  100% {
+    -webkit-transform: perspective(400px);
+  }
+}
 /* Fix dropdown menu in navbars */
 .navbar-custom-menu > .navbar-nav > li {
  position: relative;
@@ -2459,9 +2495,11 @@ table.text-center th {
  padding: 0;
 }
 .direct-chat.chat-pane-open .direct-chat-contacts {
+  -webkit-transform: translate(0, 0);
  transform: translate(0, 0);
 }
 .direct-chat-messages {
+  -webkit-transform: translate(0, 0);
  transform: translate(0, 0);
  padding: 10px;
  height: 250px;
@@ -2484,6 +2522,7 @@ table.text-center th {
 }
 .direct-chat-messages,
 .direct-chat-contacts {
+  transition: -webkit-transform 0.5s ease-in-out;
  transition: transform 0.5s ease-in-out;
 }
 .direct-chat-text {
@@ -2547,9 +2586,11 @@ table.text-center th {
  color: #999;
 }
 .direct-chat-contacts-open .direct-chat-contacts {
+  -webkit-transform: translate(0, 0);
  transform: translate(0, 0);
 }
 .direct-chat-contacts {
+  -webkit-transform: translate(101%, 0);
  transform: translate(101%, 0);
  position: absolute;
  top: 0;
@@ -3902,9 +3943,11 @@ fieldset[disabled] .btn-yahoo.active {
  line-height: 30px;
 }
 .fc-color-picker > li .fa {
+  transition: -webkit-transform linear 0.3s;
  transition: transform linear 0.3s;
 }
 .fc-color-picker > li .fa:hover {
+  -webkit-transform: rotate(30deg);
  transform: rotate(30deg);
 }
 #add-new-event {
@@ -4599,6 +4642,7 @@ fieldset[disabled] .btn-yahoo.active {
  .main-footer {
    margin-left: 0!important;
    min-height: 0!important;
+    -webkit-transform: translate(0, 0) !important;
    transform: translate(0, 0) !important;
  }
  .fixed .content-wrapper,
@@ -5114,52 +5158,117 @@ a.accordion-header {
 a.logo.no-hover a:hover {
  background-color: transparent;
 }
+.required {
+  border-right: 6px solid orange;
+}

 /* WRENCHING */
+@-webkit-keyframes wrench {
+  0% {
+    -webkit-transform: rotate(-12deg);
+  }
+  8% {
+    -webkit-transform: rotate(12deg);
+  }
+  10% {
+    -webkit-transform: rotate(24deg);
+  }
+  18% {
+    -webkit-transform: rotate(-24deg);
+  }
+  20% {
+    -webkit-transform: rotate(-24deg);
+  }
+  28% {
+    -webkit-transform: rotate(24deg);
+  }
+  30% {
+    -webkit-transform: rotate(24deg);
+  }
+  38% {
+    -webkit-transform: rotate(-24deg);
+  }
+  40% {
+    -webkit-transform: rotate(-24deg);
+  }
+  48% {
+    -webkit-transform: rotate(24deg);
+  }
+  50% {
+    -webkit-transform: rotate(24deg);
+  }
+  58% {
+    -webkit-transform: rotate(-24deg);
+  }
+  60% {
+    -webkit-transform: rotate(-24deg);
+  }
+  68% {
+    -webkit-transform: rotate(24deg);
+  }
+  75% {
+    -webkit-transform: rotate(0deg);
+  }
+}
@keyframes wrench {
  0% {
+    -webkit-transform: rotate(-12deg);
    transform: rotate(-12deg);
  }
  8% {
+    -webkit-transform: rotate(12deg);
    transform: rotate(12deg);
  }
  10% {
+    -webkit-transform: rotate(24deg);
    transform: rotate(24deg);
  }
  18% {
+    -webkit-transform: rotate(-24deg);
    transform: rotate(-24deg);
  }
  20% {
+    -webkit-transform: rotate(-24deg);
    transform: rotate(-24deg);
  }
  28% {
+    -webkit-transform: rotate(24deg);
    transform: rotate(24deg);
  }
  30% {
+    -webkit-transform: rotate(24deg);
    transform: rotate(24deg);
  }
  38% {
+    -webkit-transform: rotate(-24deg);
    transform: rotate(-24deg);
  }
  40% {
+    -webkit-transform: rotate(-24deg);
    transform: rotate(-24deg);
  }
  48% {
+    -webkit-transform: rotate(24deg);
    transform: rotate(24deg);
  }
  50% {
+    -webkit-transform: rotate(24deg);
    transform: rotate(24deg);
  }
  58% {
+    -webkit-transform: rotate(-24deg);
    transform: rotate(-24deg);
  }
  60% {
+    -webkit-transform: rotate(-24deg);
    transform: rotate(-24deg);
  }
  68% {
+    -webkit-transform: rotate(24deg);
    transform: rotate(24deg);
  }
  75% {
+    -webkit-transform: rotate(0deg);
    transform: rotate(0deg);
  }
 }
@@ -5177,44 +5286,91 @@ a.logo.no-hover a:hover {
  -ms-transform-origin-x: 90%;
  -ms-transform-origin-y: 35%;
  -ms-transform-origin-z: initial;
+  -webkit-animation: wrench 2.5s ease infinite;
  animation: wrench 2.5s ease infinite;
  transform-origin-x: 90%;
  transform-origin-y: 35%;
  transform-origin-z: initial;
 }
 /* BELL */
+@-webkit-keyframes ring {
+  0% {
+    -webkit-transform: rotate(-15deg);
+  }
+  2% {
+    -webkit-transform: rotate(15deg);
+  }
+  4% {
+    -webkit-transform: rotate(-18deg);
+  }
+  6% {
+    -webkit-transform: rotate(18deg);
+  }
+  8% {
+    -webkit-transform: rotate(-22deg);
+  }
+  10% {
+    -webkit-transform: rotate(22deg);
+  }
+  12% {
+    -webkit-transform: rotate(-18deg);
+  }
+  14% {
+    -webkit-transform: rotate(18deg);
+  }
+  16% {
+    -webkit-transform: rotate(-12deg);
+  }
+  18% {
+    -webkit-transform: rotate(12deg);
+  }
+  20% {
+    -webkit-transform: rotate(0deg);
+  }
+}
@keyframes ring {
  0% {
+    -webkit-transform: rotate(-15deg);
    transform: rotate(-15deg);
  }
  2% {
+    -webkit-transform: rotate(15deg);
    transform: rotate(15deg);
  }
  4% {
+    -webkit-transform: rotate(-18deg);
    transform: rotate(-18deg);
  }
  6% {
+    -webkit-transform: rotate(18deg);
    transform: rotate(18deg);
  }
  8% {
+    -webkit-transform: rotate(-22deg);
    transform: rotate(-22deg);
  }
  10% {
+    -webkit-transform: rotate(22deg);
    transform: rotate(22deg);
  }
  12% {
+    -webkit-transform: rotate(-18deg);
    transform: rotate(-18deg);
  }
  14% {
+    -webkit-transform: rotate(18deg);
    transform: rotate(18deg);
  }
  16% {
+    -webkit-transform: rotate(-12deg);
    transform: rotate(-12deg);
  }
  18% {
+    -webkit-transform: rotate(12deg);
    transform: rotate(12deg);
  }
  20% {
+    -webkit-transform: rotate(0deg);
    transform: rotate(0deg);
  }
 }
@@ -5232,68 +5388,142 @@ a.logo.no-hover a:hover {
  -ms-transform-origin-x: 50%;
  -ms-transform-origin-y: 0px;
  -ms-transform-origin-z: initial;
+  -webkit-animation: ring 2s ease infinite;
  animation: ring 2s ease infinite;
  transform-origin-x: 50%;
  transform-origin-y: 0px;
  transform-origin-z: initial;
 }
 /* VERTICAL */
+@-webkit-keyframes vertical {
+  0% {
+    -webkit-transform: translate(0, -3px);
+  }
+  4% {
+    -webkit-transform: translate(0, 3px);
+  }
+  8% {
+    -webkit-transform: translate(0, -3px);
+  }
+  12% {
+    -webkit-transform: translate(0, 3px);
+  }
+  16% {
+    -webkit-transform: translate(0, -3px);
+  }
+  20% {
+    -webkit-transform: translate(0, 3px);
+  }
+  22% {
+    -webkit-transform: translate(0, 0);
+  }
+}
@keyframes vertical {
  0% {
+    -webkit-transform: translate(0, -3px);
    transform: translate(0, -3px);
  }
  4% {
+    -webkit-transform: translate(0, 3px);
    transform: translate(0, 3px);
  }
  8% {
+    -webkit-transform: translate(0, -3px);
    transform: translate(0, -3px);
  }
  12% {
+    -webkit-transform: translate(0, 3px);
    transform: translate(0, 3px);
  }
  16% {
+    -webkit-transform: translate(0, -3px);
    transform: translate(0, -3px);
  }
  20% {
+    -webkit-transform: translate(0, 3px);
    transform: translate(0, 3px);
  }
  22% {
+    -webkit-transform: translate(0, 0);
    transform: translate(0, 0);
  }
 }
 .faa-vertical.animated,
 .faa-vertical.animated-hover:hover {
+  -webkit-animation: vertical 2s ease infinite;
  animation: vertical 2s ease infinite;
 }
 /* HORIZONTAL */
+@-webkit-keyframes horizontal {
+  0% {
+    -webkit-transform: translate(0, 0);
+  }
+  6% {
+    -webkit-transform: translate(5px, 0);
+  }
+  12% {
+    -webkit-transform: translate(0, 0);
+  }
+  18% {
+    -webkit-transform: translate(5px, 0);
+  }
+  24% {
+    -webkit-transform: translate(0, 0);
+  }
+  30% {
+    -webkit-transform: translate(5px, 0);
+  }
+  36% {
+    -webkit-transform: translate(0, 0);
+  }
+}
@keyframes horizontal {
  0% {
+    -webkit-transform: translate(0, 0);
    transform: translate(0, 0);
  }
  6% {
+    -webkit-transform: translate(5px, 0);
    transform: translate(5px, 0);
  }
  12% {
+    -webkit-transform: translate(0, 0);
    transform: translate(0, 0);
  }
  18% {
+    -webkit-transform: translate(5px, 0);
    transform: translate(5px, 0);
  }
  24% {
+    -webkit-transform: translate(0, 0);
    transform: translate(0, 0);
  }
  30% {
+    -webkit-transform: translate(5px, 0);
    transform: translate(5px, 0);
  }
  36% {
+    -webkit-transform: translate(0, 0);
    transform: translate(0, 0);
  }
 }
 .faa-horizontal.animated,
 .faa-horizontal.animated-hover:hover {
+  -webkit-animation: horizontal 2s ease infinite;
  animation: horizontal 2s ease infinite;
 }
 /* FLASHING */
+@-webkit-keyframes flash {
+  0%,
+  100%,
+  50% {
+    opacity: 1;
+  }
+  25%,
+  75% {
+    opacity: 0;
+  }
+}
@keyframes flash {
  0%,
  100%,
@@ -5307,71 +5537,132 @@ a.logo.no-hover a:hover {
 }
 .faa-flash.animated,
 .faa-flash.animated-hover:hover {
+  -webkit-animation: flash 2s ease infinite;
  animation: flash 2s ease infinite;
 }
 /* BOUNCE */
+@-webkit-keyframes bounce {
+  0%,
+  100%,
+  20%,
+  50%,
+  80% {
+    -webkit-transform: translateY(0);
+  }
+  40% {
+    -webkit-transform: translateY(-15px);
+  }
+  60% {
+    -webkit-transform: translateY(-15px);
+  }
+}
@keyframes bounce {
  0%,
  10%,
  20%,
  50%,
  80% {
+    -webkit-transform: translateY(0);
    transform: translateY(0);
  }
  40% {
+    -webkit-transform: translateY(-15px);
    transform: translateY(-15px);
  }
  60% {
+    -webkit-transform: translateY(-15px);
    transform: translateY(-15px);
  }
 }
 .faa-bounce.animated,
 .faa-bounce.animated-hover:hover {
+  -webkit-animation: bounce 2s ease infinite;
  animation: bounce 2s ease infinite;
 }
 /* SPIN */
+@-webkit-keyframes spin {
+  0% {
+    -webkit-transform: rotate(0deg);
+  }
+  100% {
+    -webkit-transform: rotate(359deg);
+  }
+}
@keyframes spin {
  0% {
+    -webkit-transform: rotate(0deg);
    transform: rotate(0deg);
  }
  100% {
+    -webkit-transform: rotate(359deg);
    transform: rotate(359deg);
  }
 }
 .faa-spin.animated,
 .faa-spin.animated-hover:hover {
+  -webkit-animation: spin 1.5s linear infinite;
  animation: spin 1.5s linear infinite;
 }
 /* FLOAT */
+@-webkit-keyframes float {
+  0% {
+    -webkit-transform: translateY(0);
+  }
+  50% {
+    -webkit-transform: translateY(-6px);
+  }
+  100% {
+    -webkit-transform: translateY(0);
+  }
+}
@keyframes float {
  0% {
+    -webkit-transform: translateY(0);
    transform: translateY(0);
  }
  50% {
+    -webkit-transform: translateY(-6px);
    transform: translateY(-6px);
  }
  100% {
+    -webkit-transform: translateY(0);
    transform: translateY(0);
  }
 }
 .faa-float.animated,
 .faa-float.animated-hover:hover {
+  -webkit-animation: float 2s linear infinite;
  animation: float 2s linear infinite;
 }
 /* PULSE */
+@-webkit-keyframes pulse {
+  0% {
+    -webkit-transform: scale(1);
+  }
+  50% {
+    -webkit-transform: scale(0.8);
+  }
+  100% {
+    -webkit-transform: scale(1);
+  }
+}
@keyframes pulse {
  0% {
+    -webkit-transform: scale(1.1);
    transform: scale(1.1);
  }
  50% {
+    -webkit-transform: scale(0.8);
    transform: scale(0.8);
  }
  100% {
+    -webkit-transform: scale(1);
    transform: scale(1);
  }
 }
 .faa-pulse.animated,
 .faa-pulse.animated-hover:hover {
+  -webkit-animation: pulse 2s linear infinite;
  animation: pulse 2s linear infinite;
 }
 /* SHAKE */
@@ -57,6 +57,7 @@ body {
 .content-wrapper,
 .right-side,
 .main-footer {
+  transition: -webkit-transform 0.3s ease-in-out, margin 0.3s ease-in-out;
  transition: transform 0.3s ease-in-out, margin 0.3s ease-in-out;
  margin-left: 230px;
  z-index: 820;
@@ -84,6 +85,7 @@ body {
  .sidebar-open .content-wrapper,
  .sidebar-open .right-side,
  .sidebar-open .main-footer {
+    -webkit-transform: translate(230px, 0);
    transform: translate(230px, 0);
  }
 }
@@ -425,6 +427,7 @@ a:focus {
  min-height: 100%;
  width: 230px;
  z-index: 810;
+  transition: -webkit-transform 0.3s ease-in-out, width 0.3s ease-in-out;
  transition: transform 0.3s ease-in-out, width 0.3s ease-in-out;
 }
@media (max-width: 767px) {
@@ -436,18 +439,21 @@ a:focus {
@media (max-width: 767px) {
  .main-sidebar,
  .left-side {
+    -webkit-transform: translate(-230px, 0);
    transform: translate(-230px, 0);
  }
 }
@media (min-width: 768px) {
  .sidebar-collapse .main-sidebar,
  .sidebar-collapse .left-side {
+    -webkit-transform: translate(-230px, 0);
    transform: translate(-230px, 0);
  }
 }
@media (max-width: 767px) {
  .sidebar-open .main-sidebar,
  .sidebar-open .left-side {
+    -webkit-transform: translate(0, 0);
    transform: translate(0, 0);
  }
 }
@@ -533,6 +539,7 @@ a:focus {
  margin-top: 3px;
 }
 .sidebar-menu li.active > a > .fa-angle-left {
+  -webkit-transform: rotate(-90deg);
  transform: rotate(-90deg);
 }
 .sidebar-menu li.active > .treeview-menu {
@@ -576,6 +583,7 @@ a:focus {
    z-index: 840;
  }
  .sidebar-mini.sidebar-collapse .main-sidebar {
+    -webkit-transform: translate(0, 0);
    transform: translate(0, 0);
    width: 50px!important;
    z-index: 850;
@@ -1142,30 +1150,58 @@ a:focus {
 /* Add fade animation to dropdown menus by appending
 the class .animated-dropdown-menu to the .dropdown-menu ul (or ol)*/
 .open:not(.dropup) > .animated-dropdown-menu {
+  -webkit-backface-visibility: visible !important;
  backface-visibility: visible !important;
+  -webkit-animation: flipInX 0.7s both;
  animation: flipInX 0.7s both;
 }
@keyframes flipInX {
  0% {
+    -webkit-transform: perspective(400px) rotate3d(1, 0, 0, 90deg);
    transform: perspective(400px) rotate3d(1, 0, 0, 90deg);
    transition-timing-function: ease-in;
    opacity: 0;
  }
  40% {
+    -webkit-transform: perspective(400px) rotate3d(1, 0, 0, -20deg);
    transform: perspective(400px) rotate3d(1, 0, 0, -20deg);
    transition-timing-function: ease-in;
  }
  60% {
+    -webkit-transform: perspective(400px) rotate3d(1, 0, 0, 10deg);
    transform: perspective(400px) rotate3d(1, 0, 0, 10deg);
    opacity: 1;
  }
  80% {
+    -webkit-transform: perspective(400px) rotate3d(1, 0, 0, -5deg);
    transform: perspective(400px) rotate3d(1, 0, 0, -5deg);
  }
  100% {
+    -webkit-transform: perspective(400px);
    transform: perspective(400px);
  }
 }
+@-webkit-keyframes flipInX {
+  0% {
+    -webkit-transform: perspective(400px) rotate3d(1, 0, 0, 90deg);
+    -webkit-transition-timing-function: ease-in;
+    opacity: 0;
+  }
+  40% {
+    -webkit-transform: perspective(400px) rotate3d(1, 0, 0, -20deg);
+    -webkit-transition-timing-function: ease-in;
+  }
+  60% {
+    -webkit-transform: perspective(400px) rotate3d(1, 0, 0, 10deg);
+    opacity: 1;
+  }
+  80% {
+    -webkit-transform: perspective(400px) rotate3d(1, 0, 0, -5deg);
+  }
+  100% {
+    -webkit-transform: perspective(400px);
+  }
+}
 /* Fix dropdown menu in navbars */
 .navbar-custom-menu > .navbar-nav > li {
  position: relative;
@@ -2459,9 +2495,11 @@ table.text-center th {
  padding: 0;
 }
 .direct-chat.chat-pane-open .direct-chat-contacts {
+  -webkit-transform: translate(0, 0);
  transform: translate(0, 0);
 }
 .direct-chat-messages {
+  -webkit-transform: translate(0, 0);
  transform: translate(0, 0);
  padding: 10px;
  height: 250px;
@@ -2484,6 +2522,7 @@ table.text-center th {
 }
 .direct-chat-messages,
 .direct-chat-contacts {
+  transition: -webkit-transform 0.5s ease-in-out;
  transition: transform 0.5s ease-in-out;
 }
 .direct-chat-text {
@@ -2547,9 +2586,11 @@ table.text-center th {
  color: #999;
 }
 .direct-chat-contacts-open .direct-chat-contacts {
+  -webkit-transform: translate(0, 0);
  transform: translate(0, 0);
 }
 .direct-chat-contacts {
+  -webkit-transform: translate(101%, 0);
  transform: translate(101%, 0);
  position: absolute;
  top: 0;
@@ -3902,9 +3943,11 @@ fieldset[disabled] .btn-yahoo.active {
  line-height: 30px;
 }
 .fc-color-picker > li .fa {
+  transition: -webkit-transform linear 0.3s;
  transition: transform linear 0.3s;
 }
 .fc-color-picker > li .fa:hover {
+  -webkit-transform: rotate(30deg);
  transform: rotate(30deg);
 }
 #add-new-event {
@@ -4599,6 +4642,7 @@ fieldset[disabled] .btn-yahoo.active {
  .main-footer {
    margin-left: 0!important;
    min-height: 0!important;
+    -webkit-transform: translate(0, 0) !important;
    transform: translate(0, 0) !important;
  }
  .fixed .content-wrapper,
@@ -5114,52 +5158,117 @@ a.accordion-header {
 a.logo.no-hover a:hover {
  background-color: transparent;
 }
+.required {
+  border-right: 6px solid orange;
+}

 /* WRENCHING */
+@-webkit-keyframes wrench {
+  0% {
+    -webkit-transform: rotate(-12deg);
+  }
+  8% {
+    -webkit-transform: rotate(12deg);
+  }
+  10% {
+    -webkit-transform: rotate(24deg);
+  }
+  18% {
+    -webkit-transform: rotate(-24deg);
+  }
+  20% {
+    -webkit-transform: rotate(-24deg);
+  }
+  28% {
+    -webkit-transform: rotate(24deg);
+  }
+  30% {
+    -webkit-transform: rotate(24deg);
+  }
+  38% {
+    -webkit-transform: rotate(-24deg);
+  }
+  40% {
+    -webkit-transform: rotate(-24deg);
+  }
+  48% {
+    -webkit-transform: rotate(24deg);
+  }
+  50% {
+    -webkit-transform: rotate(24deg);
+  }
+  58% {
+    -webkit-transform: rotate(-24deg);
+  }
+  60% {
+    -webkit-transform: rotate(-24deg);
+  }
+  68% {
+    -webkit-transform: rotate(24deg);
+  }
+  75% {
+    -webkit-transform: rotate(0deg);
+  }
+}
@keyframes wrench {
  0% {
+    -webkit-transform: rotate(-12deg);
    transform: rotate(-12deg);
  }
  8% {
+    -webkit-transform: rotate(12deg);
    transform: rotate(12deg);
  }
  10% {
+    -webkit-transform: rotate(24deg);
    transform: rotate(24deg);
  }
  18% {
+    -webkit-transform: rotate(-24deg);
    transform: rotate(-24deg);
  }
  20% {
+    -webkit-transform: rotate(-24deg);
    transform: rotate(-24deg);
  }
  28% {
+    -webkit-transform: rotate(24deg);
    transform: rotate(24deg);
  }
  30% {
+    -webkit-transform: rotate(24deg);
    transform: rotate(24deg);
  }
  38% {
+    -webkit-transform: rotate(-24deg);
    transform: rotate(-24deg);
  }
  40% {
+    -webkit-transform: rotate(-24deg);
    transform: rotate(-24deg);
  }
  48% {
+    -webkit-transform: rotate(24deg);
    transform: rotate(24deg);
  }
  50% {
+    -webkit-transform: rotate(24deg);
    transform: rotate(24deg);
  }
  58% {
+    -webkit-transform: rotate(-24deg);
    transform: rotate(-24deg);
  }
  60% {
+    -webkit-transform: rotate(-24deg);
    transform: rotate(-24deg);
  }
  68% {
+    -webkit-transform: rotate(24deg);
    transform: rotate(24deg);
  }
  75% {
+    -webkit-transform: rotate(0deg);
    transform: rotate(0deg);
  }
 }
@@ -5177,44 +5286,91 @@ a.logo.no-hover a:hover {
  -ms-transform-origin-x: 90%;
  -ms-transform-origin-y: 35%;
  -ms-transform-origin-z: initial;
+  -webkit-animation: wrench 2.5s ease infinite;
  animation: wrench 2.5s ease infinite;
  transform-origin-x: 90%;
  transform-origin-y: 35%;
  transform-origin-z: initial;
 }
 /* BELL */
+@-webkit-keyframes ring {
+  0% {
+    -webkit-transform: rotate(-15deg);
+  }
+  2% {
+    -webkit-transform: rotate(15deg);
+  }
+  4% {
+    -webkit-transform: rotate(-18deg);
+  }
+  6% {
+    -webkit-transform: rotate(18deg);
+  }
+  8% {
+    -webkit-transform: rotate(-22deg);
+  }
+  10% {
+    -webkit-transform: rotate(22deg);
+  }
+  12% {
+    -webkit-transform: rotate(-18deg);
+  }
+  14% {
+    -webkit-transform: rotate(18deg);
+  }
+  16% {
+    -webkit-transform: rotate(-12deg);
+  }
+  18% {
+    -webkit-transform: rotate(12deg);
+  }
+  20% {
+    -webkit-transform: rotate(0deg);
+  }
+}
@keyframes ring {
  0% {
+    -webkit-transform: rotate(-15deg);
    transform: rotate(-15deg);
  }
  2% {
+    -webkit-transform: rotate(15deg);
    transform: rotate(15deg);
  }
  4% {
+    -webkit-transform: rotate(-18deg);
    transform: rotate(-18deg);
  }
  6% {
+    -webkit-transform: rotate(18deg);
    transform: rotate(18deg);
  }
  8% {
+    -webkit-transform: rotate(-22deg);
    transform: rotate(-22deg);
  }
  10% {
+    -webkit-transform: rotate(22deg);
    transform: rotate(22deg);
  }
  12% {
+    -webkit-transform: rotate(-18deg);
    transform: rotate(-18deg);
  }
  14% {
+    -webkit-transform: rotate(18deg);
    transform: rotate(18deg);
  }
  16% {
+    -webkit-transform: rotate(-12deg);
    transform: rotate(-12deg);
  }
  18% {
+    -webkit-transform: rotate(12deg);
    transform: rotate(12deg);
  }
  20% {
+    -webkit-transform: rotate(0deg);
    transform: rotate(0deg);
  }
 }
@@ -5232,68 +5388,142 @@ a.logo.no-hover a:hover {
  -ms-transform-origin-x: 50%;
  -ms-transform-origin-y: 0px;
  -ms-transform-origin-z: initial;
+  -webkit-animation: ring 2s ease infinite;
  animation: ring 2s ease infinite;
  transform-origin-x: 50%;
  transform-origin-y: 0px;
  transform-origin-z: initial;
 }
 /* VERTICAL */
+@-webkit-keyframes vertical {
+  0% {
+    -webkit-transform: translate(0, -3px);
+  }
+  4% {
+    -webkit-transform: translate(0, 3px);
+  }
+  8% {
+    -webkit-transform: translate(0, -3px);
+  }
+  12% {
+    -webkit-transform: translate(0, 3px);
+  }
+  16% {
+    -webkit-transform: translate(0, -3px);
+  }
+  20% {
+    -webkit-transform: translate(0, 3px);
+  }
+  22% {
+    -webkit-transform: translate(0, 0);
+  }
+}
@keyframes vertical {
  0% {
+    -webkit-transform: translate(0, -3px);
    transform: translate(0, -3px);
  }
  4% {
+    -webkit-transform: translate(0, 3px);
    transform: translate(0, 3px);
  }
  8% {
+    -webkit-transform: translate(0, -3px);
    transform: translate(0, -3px);
  }
  12% {
+    -webkit-transform: translate(0, 3px);
    transform: translate(0, 3px);
  }
  16% {
+    -webkit-transform: translate(0, -3px);
    transform: translate(0, -3px);
  }
  20% {
+    -webkit-transform: translate(0, 3px);
    transform: translate(0, 3px);
  }
  22% {
+    -webkit-transform: translate(0, 0);
    transform: translate(0, 0);
  }
 }
 .faa-vertical.animated,
 .faa-vertical.animated-hover:hover {
+  -webkit-animation: vertical 2s ease infinite;
  animation: vertical 2s ease infinite;
 }
 /* HORIZONTAL */
+@-webkit-keyframes horizontal {
+  0% {
+    -webkit-transform: translate(0, 0);
+  }
+  6% {
+    -webkit-transform: translate(5px, 0);
+  }
+  12% {
+    -webkit-transform: translate(0, 0);
+  }
+  18% {
+    -webkit-transform: translate(5px, 0);
+  }
+  24% {
+    -webkit-transform: translate(0, 0);
+  }
+  30% {
+    -webkit-transform: translate(5px, 0);
+  }
+  36% {
+    -webkit-transform: translate(0, 0);
+  }
+}
@keyframes horizontal {
  0% {
+    -webkit-transform: translate(0, 0);
    transform: translate(0, 0);
  }
  6% {
+    -webkit-transform: translate(5px, 0);
    transform: translate(5px, 0);
  }
  12% {
+    -webkit-transform: translate(0, 0);
    transform: translate(0, 0);
  }
  18% {
+    -webkit-transform: translate(5px, 0);
    transform: translate(5px, 0);
  }
  24% {
+    -webkit-transform: translate(0, 0);
    transform: translate(0, 0);
  }
  30% {
+    -webkit-transform: translate(5px, 0);
    transform: translate(5px, 0);
  }
  36% {
+    -webkit-transform: translate(0, 0);
    transform: translate(0, 0);
  }
 }
 .faa-horizontal.animated,
 .faa-horizontal.animated-hover:hover {
+  -webkit-animation: horizontal 2s ease infinite;
  animation: horizontal 2s ease infinite;
 }
 /* FLASHING */
+@-webkit-keyframes flash {
+  0%,
+  100%,
+  50% {
+    opacity: 1;
+  }
+  25%,
+  75% {
+    opacity: 0;
+  }
+}
@keyframes flash {
  0%,
  100%,
@@ -5307,71 +5537,132 @@ a.logo.no-hover a:hover {
 }
 .faa-flash.animated,
 .faa-flash.animated-hover:hover {
+  -webkit-animation: flash 2s ease infinite;
  animation: flash 2s ease infinite;
 }
 /* BOUNCE */
+@-webkit-keyframes bounce {
+  0%,
+  100%,
+  20%,
+  50%,
+  80% {
+    -webkit-transform: translateY(0);
+  }
+  40% {
+    -webkit-transform: translateY(-15px);
+  }
+  60% {
+    -webkit-transform: translateY(-15px);
+  }
+}
@keyframes bounce {
  0%,
  10%,
  20%,
  50%,
  80% {
+    -webkit-transform: translateY(0);
    transform: translateY(0);
  }
  40% {
+    -webkit-transform: translateY(-15px);
    transform: translateY(-15px);
  }
  60% {
+    -webkit-transform: translateY(-15px);
    transform: translateY(-15px);
  }
 }
 .faa-bounce.animated,
 .faa-bounce.animated-hover:hover {
+  -webkit-animation: bounce 2s ease infinite;
  animation: bounce 2s ease infinite;
 }
 /* SPIN */
+@-webkit-keyframes spin {
+  0% {
+    -webkit-transform: rotate(0deg);
+  }
+  100% {
+    -webkit-transform: rotate(359deg);
+  }
+}
@keyframes spin {
  0% {
+    -webkit-transform: rotate(0deg);
    transform: rotate(0deg);
  }
  100% {
+    -webkit-transform: rotate(359deg);
    transform: rotate(359deg);
  }
 }
 .faa-spin.animated,
 .faa-spin.animated-hover:hover {
+  -webkit-animation: spin 1.5s linear infinite;
  animation: spin 1.5s linear infinite;
 }
 /* FLOAT */
+@-webkit-keyframes float {
+  0% {
+    -webkit-transform: translateY(0);
+  }
+  50% {
+    -webkit-transform: translateY(-6px);
+  }
+  100% {
+    -webkit-transform: translateY(0);
+  }
+}
@keyframes float {
  0% {
+    -webkit-transform: translateY(0);
    transform: translateY(0);
  }
  50% {
+    -webkit-transform: translateY(-6px);
    transform: translateY(-6px);
  }
  100% {
+    -webkit-transform: translateY(0);
    transform: translateY(0);
  }
 }
 .faa-float.animated,
 .faa-float.animated-hover:hover {
+  -webkit-animation: float 2s linear infinite;
  animation: float 2s linear infinite;
 }
 /* PULSE */
+@-webkit-keyframes pulse {
+  0% {
+    -webkit-transform: scale(1);
+  }
+  50% {
+    -webkit-transform: scale(0.8);
+  }
+  100% {
+    -webkit-transform: scale(1);
+  }
+}
@keyframes pulse {
  0% {
+    -webkit-transform: scale(1.1);
    transform: scale(1.1);
  }
  50% {
+    -webkit-transform: scale(0.8);
    transform: scale(0.8);
  }
  100% {
+    -webkit-transform: scale(1);
    transform: scale(1);
  }
 }
 .faa-pulse.animated,
 .faa-pulse.animated-hover:hover {
+  -webkit-animation: pulse 2s linear infinite;
  animation: pulse 2s linear infinite;
 }
 /* SHAKE */
@@ -1,4 +1,4 @@
 {
-  "assets/css/app.css": "assets/css/app-ec8e97e7ca.css",
+  "assets/css/app.css": "assets/css/app-de75b6d10a.css",
  "assets/js/all.js": "assets/js/all-edd914620a.js"
 }
@@ -0,0 +1 @@
+!.gitignore
@@ -0,0 +1 @@
+!.gitignore
@@ -0,0 +1 @@
+!.gitignore
@@ -0,0 +1 @@
+!.gitignore
@@ -0,0 +1 @@
+!.gitignore
@@ -283,3 +283,7 @@ a.logo.no-hover a:hover {
 }


+.required {
+  border-right: 6px solid orange;
+}
+
@@ -12,12 +12,12 @@ return array(

    'update' => array(
        'error'   => 'لم يتم تحديث الملحق، الرجاء المحاولة مرة أخرى',
-        'success' => 'تم بنجاح تحديث الملحق.'
+        'success' => 'تم تحديث الملحق بنجاح.'
    ),

    'delete' => array(
        'confirm'   => 'هل أنت متأكد من رغبتك في حذف هذا الملحق؟',
-        'error'   => 'حدث خطأ أثناء محاولة حذف الملحق. الرجاء حاول مرة أخرى.',
+        'error'   => 'حدث خطأ أثناء محاولة حذف الملحق. الرجاء المحاولة مرة أخرى.',
        'success' => 'تم حذف الملحق بنجاح.'
    ),

@@ -30,7 +30,7 @@ return array(
    'checkin' => array(
        'error'   		=> 'لم يتم إيداع الملحق، الرجاء المحاولة مرة أخرى',
        'success' 		=> 'تم إيداع الملحق بنجاح.',
-        'user_does_not_exist' => 'هذا المستخدم خاطئ، الرجاء المحاولة مرة أخرى.'
+        'user_does_not_exist' => 'هذا المستخدم غير صحيح. الرجاء المحاولة مرة أخرى.'
    )


@@ -1,7 +1,7 @@
 <?php

    return [
-        'asset_maintenances' => 'صيانة الاُصول',
+        'asset_maintenances' => 'صيانة الاُصل',
        'edit'               => 'تعديل صيانة الأصل',
        'delete'             => 'حذف صيانة الأصل',
        'view'               => 'عرض تفاصيل صيانة الأصل',
@@ -1,15 +1,15 @@
 <?php

    return [
-        'not_found'                    => 'لم يتم العثور على صيانة الأصل!',
+        'not_found'                    => 'لم يتم العثور على سند صيانة الأصل المطلوب!',
        'delete'                       => [
-            'confirm' => 'هل أنت متأكد من رغبتك في حذف صيانة الأصل؟',
-            'error'   => 'حدثت مشكلة في عملية الحذف لصيانة الأصل. الرجاء المحاولة مرة اُخرى.',
-            'success' => 'تم حذف صيانة الأصل بنجاح.'
+            'confirm' => 'هل أنت متأكد من رغبتك في حذف سند صيانة الأصل؟',
+            'error'   => 'حدثت مشكلة في عملية الحذف لسند صيانة الأصل. الرجاء المحاولة مرة اُخرى.',
+            'success' => 'تم حذف سند صيانة الأصل بنجاح.'
        ],
        'create'                       => [
-            'error'   => 'لم يتم إنشاء صيانة الأصل، الرجاء المحاولة مرة أخرى.',
-            'success' => 'تم إنشاء صيانة الأصل بنجاح.'
+            'error'   => 'لم يتم إنشاء سند صيانة الأصل، الرجاء المحاولة مرة أخرى.',
+            'success' => 'تم إنشاء سند صيانة الأصل بنجاح.'
        ],
        'asset_maintenance_incomplete' => 'لم يكتمل بعد',
        'warranty'                     => 'الضمان',
@@ -3,7 +3,7 @@
    return [
        'title'         => 'صيانة الاُصل',
        'asset_name'    => 'الأصل',
-        'supplier_name' => 'المزود',
+        'supplier_name' => 'المورد',
        'is_warranty'   => 'الضمان',
        'dl_csv'        => 'التنزيل كملف CSV'
    ];
@@ -3,8 +3,8 @@
 return array(

    'does_not_exist' => 'التصنيف غير موجود.',
-    'assoc_models'	 => 'This category is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this category and try again. ',
-    'assoc_items'	 => 'This category is currently associated with at least one :asset_type and cannot be deleted. Please update your :asset_type  to no longer reference this category and try again. ',
+    'assoc_models'	 => 'هذا التصنيف حاليا مرتبط مع نموذج ولا يمكن حذفه. الرجاء القيام بتحديث النماذج بحيث لا تكون مرتبطة بهذا التصنيف، ثم حاول مرة اخرى. ',
+    'assoc_items'	 => 'هذه التصنيف مرتبط حاليا مع واحد على الأقل من أنواع الاصول asset_type: ولا يمكن حذفه. الرجاء تحديث نوع الاصل الخاص بك asset_type: حيث لا يكون مرتبط بهذا التصنيف، ثم حاول مرة أخرى. ',

    'create' => array(
        'error'   => 'فشل إنشاء التصنيف، فضلاً حاول مرة أخرى.',
@@ -3,16 +3,16 @@ return array(
    'does_not_exist' => 'الشركة غير موجودة.',
    'assoc_users'    => 'هذه الشركة مرتبطة حاليا مع نموذج ولا يمكن حذفها. رجاءً قم بتحديث النماذج بحيث لا تكون مرتبطة بهذه الشركة ثم حاول مرة اُخرى. ',
    'create' => array(
-        'error'   => 'لم يتم انشاء الشركة، رجاءً حاول مرة اُخرى.',
+        'error'   => 'لم يتم انشاء الشركة، الرجاء المحاولة مرة اُخرى.',
        'success' => 'تم إنشاء الشركة بنجاح.'
    ),
    'update' => array(
-        'error'   => 'لم يتم تحديث الشركة، رجاءً حاول مرة اُخرى',
+        'error'   => 'لم يتم انشاء الشركة، الرجاء المحاولة مرة اُخرى',
        'success' => 'تم تحديث الشركة بنجاح.'
    ),
    'delete' => array(
        'confirm' => 'هل أنت متأكد من رغبتك في حذف هذه الشركة؟',
-        'error'   => 'حدثت مشكلة اثناء عملية حذف الشركة. رجاءً المحاولة مرة اُخرى.',
+        'error'   => 'حدثت مشكلة اثناء عملية حذف الشركة. الرجاء المحاولة مرة اُخرى.',
        'success' => 'تم حذف الشركة بنجاح.'
    )
 );
@@ -16,7 +16,7 @@ return array(

    'delete' => array(
        'confirm'   => 'هل أنت متأكد من رغبتك في حذف هذا المكون؟',
-        'error'   => 'حدثت مشكلة اثناء عملية حذف المكون. رجاءً المحاولة مرة اُخرى.',
+        'error'   => 'حدثت مشكلة اثناء عملية حذف المكون. الرجاء المحاولة مرة اُخرى.',
        'success' => 'تم حذف المكون بنجاح.'
    ),

@@ -7,7 +7,7 @@ return array(
    'cost'				=> 'تكلفة الشراء',
    'create'                             => 'إنشاء مادة إستهلاكية',
    'date'					=> 'تاريخ الشراء',
-    'item_no'               => 'Item No.',
+    'item_no'               => 'رقم القطعة.',
    'order'					=> 'رقم طلب الشراء',
    'remaining' 			             => 'المتبقية',
    'total' 			                 => 'المجموع',
@@ -2,34 +2,34 @@

 return array(

-    'does_not_exist' => 'Consumable does not exist.',
+    'does_not_exist' => 'المادة الإستهلاكية غير موجودة.',

    'create' => array(
-        'error'   => 'Consumable was not created, please try again.',
-        'success' => 'Consumable created successfully.'
+        'error'   => 'لم يتم انشاء المادة الإستهلاكية، الرجاء المحاولة مرة اخرى.',
+        'success' => 'تم إنشاء المادة الإستهلاكية بنجاح.'
    ),

    'update' => array(
-        'error'   => 'Consumable was not updated, please try again',
-        'success' => 'Consumable updated successfully.'
+        'error'   => 'لم يتم تحديث المادة الإستهلاكية، الرجاء المحاولة مرة اخرى',
+        'success' => 'تم تحديث المادة الإستهلاكية بنجاح.'
    ),

    'delete' => array(
-        'confirm'   => 'Are you sure you wish to delete this consumable?',
-        'error'   => 'There was an issue deleting the consumable. Please try again.',
-        'success' => 'The consumable was deleted successfully.'
+        'confirm'   => 'هل أنت متأكد من رغبتك في حذف هذه المادة الإستهلاكية؟',
+        'error'   => 'لقد حدثت مشكلة لعملية حذف المادة الإستهلاكية، الرجاء المحاولة مرة اخرى.',
+        'success' => 'تم حذف المادة الإستهلاكية بنجاح.'
    ),

     'checkout' => array(
-        'error'   		=> 'Consumable was not checked out, please try again',
-        'success' 		=> 'Consumable checked out successfully.',
-        'user_does_not_exist' => 'That user is invalid. Please try again.'
+        'error'   		=> 'لم يتم إخراج المادة الإستهلاكية، الرجاء المحاولة مرة اخرى',
+        'success' 		=> 'تم إخراج المادة الإستهلاكية بنجاح.',
+        'user_does_not_exist' => 'هذا المستخدم غير صحيح. الرجاء المحاولة مرة أخرى.'
    ),

    'checkin' => array(
-        'error'   		=> 'Consumable was not checked in, please try again',
-        'success' 		=> 'Consumable checked in successfully.',
-        'user_does_not_exist' => 'That user is invalid. Please try again.'
+        'error'   		=> 'لم يتم إيداع المادة الإستهلاكية، الرجاء المحاولة مرة اخرى',
+        'success' 		=> 'تم إخراج المادة الإستهلاكية بنجاح.',
+        'user_does_not_exist' => 'هذا المستخدم غير صحيح. الرجاء المحاولة مرة أخرى.'
    )


@@ -1,5 +1,5 @@
 <?php

 return array(
-    'title'      				=> 'Consumable Name',
+    'title'      				=> 'إسم المادة الإستهلاكية',
 );
@@ -1,23 +1,23 @@
 <?php

 return array(
-    'custom_fields'		        => 'Custom Fields',
-    'field'		                => 'Field',
-    'about_fieldsets_title'		=> 'About Fieldsets',
-    'about_fieldsets_text'		=> 'Fieldsets allow you to create groups of custom fields that are frequently re-used used for specific asset model types.',
-    'fieldset'      	        => 'Fieldset',
-    'qty_fields'      	      => 'Qty Fields',
-    'fieldsets'      	        => 'Fieldsets',
-    'fieldset_name'           => 'Fieldset Name',
-    'field_name'              => 'Field Name',
-    'field_element'           => 'Form Element',
-    'field_element_short'     => 'Element',
-    'field_format'            => 'Format',
-    'field_custom_format'     => 'Custom Format',
-    'required'   		          => 'Required',
-    'req'   		              => 'Req.',
-    'used_by_models'   		    => 'Used By Models',
+    'custom_fields'		        => 'حقول مخصصة',
+    'field'		                => 'حقل',
+    'about_fieldsets_title'		=> 'حول مجموعة الحقول',
+    'about_fieldsets_text'		=> 'مجموعات-الحقول تسمح لك بإنشاء مجموعات من الحقول اللتي يمكن إعادة إستخدامها مع أنواع موديل محدد.',
+    'fieldset'      	        => 'مجموعة-حقول',
+    'qty_fields'      	      => 'الحقول الكمية',
+    'fieldsets'      	        => 'مجموعات-الحقول',
+    'fieldset_name'           => 'إسم مجموعة-الحقل',
+    'field_name'              => 'إسم الحقل',
+    'field_element'           => 'عنصر النموذج',
+    'field_element_short'     => 'عنصر',
+    'field_format'            => 'صيغة',
+    'field_custom_format'     => 'صيغة مخصصة',
+    'required'   		          => 'مطلوب',
+    'req'   		              => 'مطلوب',
+    'used_by_models'   		    => 'مستخدم في الموديلات',
    'order'   		            => 'Order',
-    'create_fieldset'         => 'New Fieldset',
-    'create_field'            => 'New Custom Field',
+    'create_fieldset'         => 'مجموعة-حقول جديدة',
+    'create_field'            => 'حقل جديد مخصص',
 );
@@ -3,25 +3,25 @@
 return array(

    'field' => array(
-        'invalid'   => 'That field does not exist.',
-        'already_added'   => 'Field already added',
+        'invalid'   => 'هذا الحقل غير موجود.',
+        'already_added'   => 'تم إضافة الحقل سابقا',

        'create' => array(
-            'error'   => 'Field was not created, please try again.',
-            'success' => 'Field created successfully.',
-            'assoc_success' => 'Field successfully added to fieldset.'
+            'error'   => 'لم يتم إنشاء الحقل، الرجاء المحاولة مرة اخرى.',
+            'success' => 'تم إنشاء الحقل بنجاح.',
+            'assoc_success' => 'تم اضافة الحقل الى مجموعة-الحقول بنجاح.'
        ),

        'update' => array(
-            'error'   => 'Field was not updated, please try again',
-            'success' => 'Field updated successfully.'
+            'error'   => 'لم يتم تحديث الحقل، الرجاء المحاولة مرة اخرى',
+            'success' => 'تم تحديث الحقل بنجاح.'
        ),

        'delete' => array(
-            'confirm'   	=> 'Are you sure you wish to delete this field?',
-            'error'   => 'There was an issue deleting the field. Please try again.',
-            'success' => 'The field was deleted successfully.',
-            'in_use'   => 'Field is still in use.',
+            'confirm'   	=> 'هل أنت متأكد من رغبتك في حذف هذا الحقل؟',
+            'error'   => 'لقد حدثت مشكلة أثناء عملية حذف الحقل، الرجاء المحاولة مرة اخرى.',
+            'success' => 'تم حذف الحقل بنجاح.',
+            'in_use'   => 'لا يزال الحقل قيد الإستخدام.',
        )

    ),
@@ -31,20 +31,20 @@ return array(


        'create' => array(
-            'error'   => 'Fieldset was not created, please try again.',
-            'success' => 'Fieldset created successfully.'
+            'error'   => 'لم يتم إنشاء مجموعة-الحقول، الرجاء المحاولة مرة اخرى.',
+            'success' => 'تم إنشاء مجموعة-الحقول بنجاح.'
        ),

        'update' => array(
-            'error'   => 'Fieldset was not updated, please try again',
-            'success' => 'Fieldset updated successfully.'
+            'error'   => 'لم يتم تحديث مجموعة-الحقول، الرجاء المحاولة مرة اخرى',
+            'success' => 'تم تحديث مجموعة-الحقول بنجاح.'
        ),

        'delete' => array(
-            'confirm'   	=> 'Are you sure you wish to delete this fieldset?',
-            'error'   => 'There was an issue deleting the fieldset. Please try again.',
-            'success' => 'The fieldset was deleted successfully.',
-            'in_use'   => 'Fieldset is still in use.',
+            'confirm'   	=> 'هل أنت متأكد من رغبتك في حذف مجموعة-الحقول هذه؟',
+            'error'   => 'لقد حدثت مشكلة أثناء عملية حذف مجموعة-الحقول هذه، الرجاء المحاولة مرة اخرى.',
+            'success' => 'تم حذف مجموعة-الحقول بنجاح.',
+            'in_use'   => 'لا تزال مجموعة-الحقول هذه قيد الإستخدام.',
        )

    ),
@@ -2,24 +2,24 @@

 return array(

-    'does_not_exist' => 'Depreciation class does not exist.',
-    'assoc_users'	 => 'This depreciation is currently associated with one or more models and cannot be deleted. Please delete the models, and then try deleting again. ',
+    'does_not_exist' => 'فئة الإستهلاك غير موجود.',
+    'assoc_users'	 => 'لا يزال سند هذا الإستهلاك مرتبط مع أحد الموديلات ولا يمكن حذفه، الرجاء حذف الموديلات، وثم حاول حذف سند الإستهلاك مرة اخرى. ',


    'create' => array(
-        'error'   => 'Depreciation class was not created, please try again. :(',
-        'success' => 'Depreciation class created successfully. :)'
+        'error'   => 'لم يتم إنشاء فئة الإستهلاك، الرجاء المحاولة مرة اخرى',
+        'success' => 'تم إنشاء فئة الإستهلاك بنجاح.'
    ),

    'update' => array(
-        'error'   => 'Depreciation class was not updated, please try again',
-        'success' => 'Depreciation class updated successfully.'
+        'error'   => 'لم يتم تحديث فئة الإستهلاك، الرجاء المحاولة مرة اخرى',
+        'success' => 'تم تحديث فئة الإستهلاك بنجاح.'
    ),

    'delete' => array(
-        'confirm'   => 'Are you sure you wish to delete this depreciation class?',
-        'error'   => 'There was an issue deleting the depreciation class. Please try again.',
-        'success' => 'The depreciation class was deleted successfully.'
+        'confirm'   => 'هل أنت متأكد من رغبتك في حذف فئة الإستهلاك هذه؟',
+        'error'   => 'لقد حدثت مشكلة أثناء عملية حذف فئة الإستهلاك، الرجاء المحاولة مرة اخرى.',
+        'success' => 'تم إنشاء فئة الإستهلاك بنجاح.'
    )

 );
@@ -1,7 +1,7 @@
 <?php

 return array(
-	'bulk_delete'		=> 'Confrm Bulk Delete Assets',
+	'bulk_delete'		=> 'إجراء حذف متعدد للاُصول',
  'bulk_delete_help'	=> 'Review the assets for bulk deletion below. Once deleted, these assets can be restored, but they will no longer be associated with any users they are currently assigned to.',
  'bulk_delete_warn'	=> 'You are about to delete :asset_count assets.',
 	'bulk_update'		=> 'Bulk Update Assets',
@@ -3,6 +3,7 @@
 return array(
 	'archived'  				=> 'Archived',
    'asset'  					=> 'Asset',
+    'bulk_checkout'             => 'Checkout Assets to User',
    'checkin'  					=> 'Checkin Asset',
    'checkout'  				=> 'Checkout Asset to User',
    'clone'  					=> 'Clone Asset',
@@ -1,6 +1,10 @@
 <?php

 return array(
+    'ad'				        => 'Active Directory',
+    'ad_domain'				    => 'Active Directory domain',
+    'ad_domain_help'			=> 'This is sometimes the same as your email domain, but not always.',
+    'is_ad'				        => 'This is an Active Directory server',
 	'alert_email'				=> 'Send alerts to',
 	'alerts_enabled'			=> 'Alerts Enabled',
 	'alert_interval'			=> 'Expiring Alerts Threshold (in days)',
@@ -37,9 +41,12 @@ return array(
    'ldap_integration'          => 'LDAP Integration',
    'ldap_settings'             => 'LDAP Settings',
    'ldap_server'               => 'LDAP Server',
+    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted or TLS) or ldaps:// (for SSL)',
 	'ldap_server_cert'			=> 'LDAP SSL certificate validation',
 	'ldap_server_cert_ignore'	=> 'Allow invalid SSL Certificate',
 	'ldap_server_cert_help'		=> 'Select this checkbox if you are using a self signed SSL cert and would like to accept an invalid SSL certificate.',
+    'ldap_tls'                  => 'Use TLS',
+    'ldap_tls_help'             => 'This should be checked only if you are running STARTTLS on your LDAP server. ',
    'ldap_uname'                => 'LDAP Bind Username',
    'ldap_pword'                => 'LDAP Bind Password',
    'ldap_basedn'               => 'Base Bind DN',
@@ -101,4 +108,5 @@ return array(
    'bottom'        => 'bottom',
    'vertical'        => 'vertical',
    'horizontal'        => 'horizontal',
+    'zerofill_count'        => 'Length of asset tags, including zerofill',
 );
@@ -23,6 +23,7 @@
    'avatar_upload'         => 'رفع صورة رمزية',
    'back'      			=> 'الرجوع للخلف',
    'bad_data'      		=> 'Nothing found. Maybe bad data?',
+    'bulk_checkout'  		=> 'Bulk Checkout',
    'cancel'  				=> 'إلغاء',
    'categories'			=> 'Categories',
    'category'				=> 'Category',
@@ -105,6 +106,7 @@
    'moreinfo'				=> 'المزيد من المعلومات',
    'name'					=> 'الإسم',
    'next'					=> 'Next',
+    'new'					=> 'new!',
    'no_depreciation'		=> 'لا يوجد إستهلاك',
    'no_results'			=> 'لا يوجد نتائج.',
    'no'  					=> 'لا',
@@ -140,6 +142,7 @@
    'select_asset'    		=> 'Select Asset',
    'settings'				=> 'الإعدادات',
    'sign_in'				=> 'تسجيل الدخول',
+    'some_features_disabled' => 'DEMO MODE: Some features are disabled for this installation.',
    'site_name'				=> 'إسم الموقع',
    'state'  				=> 'المنطقة / الولاية',
    'status_labels'			=> 'بطاقات الحالة',
@@ -64,6 +64,8 @@ return array(
    ),
    "unique"           => "The :attribute has already been taken.",
    "url"              => "The :attribute format is invalid.",
+    "statuslabel_type" => "You must select a valid status label type",
+    "unique_undeleted" => "The :attribute must be unique.",


    /*
@@ -3,6 +3,7 @@
 return array(
 	'archived'  				=> 'Архивиран',
    'asset'  					=> 'Актив',
+    'bulk_checkout'             => 'Checkout Assets to User',
    'checkin'  					=> 'Връщане на актив',
    'checkout'  				=> 'Изписване на актив към потребител',
    'clone'  					=> 'Копиране на актив',
@@ -1,6 +1,10 @@
 <?php

 return array(
+    'ad'				        => 'Active Directory',
+    'ad_domain'				    => 'Active Directory domain',
+    'ad_domain_help'			=> 'This is sometimes the same as your email domain, but not always.',
+    'is_ad'				        => 'This is an Active Directory server',
 	'alert_email'				=> 'Изпращане на нотификации към',
 	'alerts_enabled'			=> 'Alerts Enabled',
 	'alert_interval'			=> 'Expiring Alerts Threshold (in days)',
@@ -37,9 +41,12 @@ return array(
    'ldap_integration'          => 'LDAP интеграция',
    'ldap_settings'             => 'LDAP настройки',
    'ldap_server'               => 'LDAP сървър',
+    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted or TLS) or ldaps:// (for SSL)',
 	'ldap_server_cert'			=> 'Валидация на LDAP SSL сертификата',
 	'ldap_server_cert_ignore'	=> 'Допускане на невалиден SSL сертификат',
 	'ldap_server_cert_help'		=> 'Изберете тази опция ако използвате самоподписан SSL сертификат.',
+    'ldap_tls'                  => 'Use TLS',
+    'ldap_tls_help'             => 'This should be checked only if you are running STARTTLS on your LDAP server. ',
    'ldap_uname'                => 'LDAP потребител за връзка',
    'ldap_pword'                => 'LDAP парола на потребител за връзка',
    'ldap_basedn'               => 'Базов DN',
@@ -101,4 +108,5 @@ return array(
    'bottom'        => 'bottom',
    'vertical'        => 'vertical',
    'horizontal'        => 'horizontal',
+    'zerofill_count'        => 'Length of asset tags, including zerofill',
 );
@@ -23,6 +23,7 @@
    'avatar_upload'         => 'Качване на аватар',
    'back'      			=> 'Назад',
    'bad_data'      		=> 'Няма резултати.',
+    'bulk_checkout'  		=> 'Bulk Checkout',
    'cancel'  				=> 'Отказ',
    'categories'			=> 'Категории',
    'category'				=> 'Категория',
@@ -105,6 +106,7 @@
    'moreinfo'				=> 'Повече информация',
    'name'					=> 'Име',
    'next'					=> 'Следващ',
+    'new'					=> 'new!',
    'no_depreciation'		=> 'Без амортизация',
    'no_results'			=> 'Няма резултат.',
    'no'  					=> 'Не',
@@ -140,6 +142,7 @@
    'select_asset'    		=> 'Select Asset',
    'settings'				=> 'Настройки',
    'sign_in'				=> 'Вход',
+    'some_features_disabled' => 'DEMO MODE: Some features are disabled for this installation.',
    'site_name'				=> 'Име на системата',
    'state'  				=> 'Област',
    'status_labels'			=> 'Статус етикети',
@@ -64,6 +64,8 @@ return array(
    ),
    "unique"           => ":attribute вече е вписан.",
    "url"              => "Форматът на :attribute е невалиден.",
+    "statuslabel_type" => "You must select a valid status label type",
+    "unique_undeleted" => "The :attribute must be unique.",


    /*
@@ -6,8 +6,8 @@ return array(
    'accessory_category' 				=> 'Kategorie příslušenství',
    'accessory_name'  					=> 'Název příslušenství',
    'cost'					=> 'Pořizovací cena',
-    'checkout'  							=> 'Checkout Accessory',
-    'checkin'  							=> 'Checkin Accessory',
+    'checkout'  							=> 'Předat příslušenství',
+    'checkin'  							=> 'Převzít příslušenství',
    'create'  							=> 'Vytvoř příslušenství',
    'date'					=> 'Datum pořízení',
    'edit'  							=> 'Upravit Příslušenství',
@@ -3,8 +3,8 @@
 return array(

    'does_not_exist' => 'Kategorie neexistuje.',
-    'assoc_models'	 => 'This category is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this category and try again. ',
-    'assoc_items'	 => 'This category is currently associated with at least one :asset_type and cannot be deleted. Please update your :asset_type  to no longer reference this category and try again. ',
+    'assoc_models'	 => 'Tato kategorie obsahuje nejméně jeden model majetku a nemůže být proto odstraněna. Změňte kategorii v dotyčných modelech majetku a zkuste to znovu. ',
+    'assoc_items'	 => 'Tato kategorie obsahuje nejméně jeden :asset_type a nemůže být proto odstraněna. Změňte kategorii v dotyčných :asset_type a zkuste to znovu. ',

    'create' => array(
        'error'   => 'Kategorie nebyla vytvořena, zkuste to znovu prosím.',
@@ -1,17 +1,17 @@
 <?php

 return array(
-    'about_components_title' 			=> 'About Components',
-    'about_components_text'  			=> 'Components are items that are part of an asset, for example HDD, RAM, etc.',
-    'component_name'                  => 'Component Name',
-    'checkin'                             => 'Checkin Component',
-    'checkout'                             => 'Checkout Component',
-    'cost'				=> 'Purchase Cost',
-    'create'                             => 'Create Component',
-    'edit'                             => 'Edit Component',
+    'about_components_title' 			=> 'O dílech',
+    'about_components_text'  			=> 'Díly jsou položky, které jsou součástí majetku, jako např. HDD, RAM atp.',
+    'component_name'                  => 'Název dílu',
+    'checkin'                             => 'Převzít díl',
+    'checkout'                             => 'Předat díl',
+    'cost'				=> 'Pořizovací cena',
+    'create'                             => 'Vytvořit díl',
+    'edit'                             => 'Upravit díl',
    'date'					=> 'Datum nákupu',
    'order'					=> 'Číslo objednávky',
    'remaining' 			             => 'Zbývá',
    'total' 			                 => 'Celkem',
-    'update'                            => 'Update Component',
+    'update'                            => 'Upravit díl',
 );
@@ -2,34 +2,34 @@

 return array(

-    'does_not_exist' => 'Component does not exist.',
+    'does_not_exist' => 'Takový díl neexistuje.',

    'create' => array(
-        'error'   => 'Component was not created, please try again.',
-        'success' => 'Component created successfully.'
+        'error'   => 'Nepodařilo se vytvořit díl, zkuste to prosím znovu.',
+        'success' => 'Díl byl v pořádku vytvořen.'
    ),

    'update' => array(
-        'error'   => 'Component was not updated, please try again',
-        'success' => 'Component updated successfully.'
+        'error'   => 'Nepodařilo se upravit díl, zkuste to prosím znovu',
+        'success' => 'Díl byl v pořádku upraven.'
    ),

    'delete' => array(
-        'confirm'   => 'Are you sure you wish to delete this component?',
-        'error'   => 'There was an issue deleting the component. Please try again.',
-        'success' => 'The component was deleted successfully.'
+        'confirm'   => 'Opravdu si přejete odstranit tento díl?',
+        'error'   => 'Nepodařilo se díl odstranit. Zkuste to prosím později.',
+        'success' => 'Díl byl v pořádku odstraněn.'
    ),

     'checkout' => array(
-        'error'   		=> 'Component was not checked out, please try again',
-        'success' 		=> 'Component checked out successfully.',
-        'user_does_not_exist' => 'That user is invalid. Please try again.'
+        'error'   		=> 'Díl se nepodařilo předat, zkuste to prosím znovu',
+        'success' 		=> 'Díl byl v pořádku předán.',
+        'user_does_not_exist' => 'Neplatný uživatel. Zkuste to prosím znovu.'
    ),

    'checkin' => array(
-        'error'   		=> 'Component was not checked in, please try again',
-        'success' 		=> 'Component checked in successfully.',
-        'user_does_not_exist' => 'That user is invalid. Please try again.'
+        'error'   		=> 'Díl se nepodařilo převzít, zkuste to prosím znovu',
+        'success' 		=> 'Díl byl v pořádku převzat.',
+        'user_does_not_exist' => 'Neplatný uživatel. Zkuste to prosím znovu.'
    )


@@ -7,7 +7,7 @@ return array(
    'cost'				=> 'Náklady',
    'create'                             => 'Vytvořit sp. materiál',
    'date'					=> 'Datum pořízení',
-    'item_no'               => 'Item No.',
+    'item_no'               => 'Položka č.',
    'order'					=> 'Číslo objednávky',
    'remaining' 			             => 'Zbývá',
    'total' 			                 => 'Celkem',
@@ -3,6 +3,7 @@
 return array(
 	'archived'  				=> 'Archivováno',
    'asset'  					=> 'Majetek',
+    'bulk_checkout'             => 'Checkout Assets to User',
    'checkin'  					=> 'Převzít majetek',
    'checkout'  				=> 'Předat majetek uživateli',
    'clone'  					=> 'Klonovat majetek',
@@ -4,68 +4,68 @@ return array(

    'undeployable' 		=> '<strong>Varování:</strong> Toto zařízení bylo označeno jako momentálně nepřiřaditelné.
                        Pokud se na jeho stavu něco změnilo, upravte jej.',
-    'does_not_exist' 	=> 'Asset does not exist.',
-    'does_not_exist_or_not_requestable' => 'Nice try. That asset does not exist or is not requestable.',
-    'assoc_users'	 	=> 'This asset is currently checked out to a user and cannot be deleted. Please check the asset in first, and then try deleting again. ',
+    'does_not_exist' 	=> 'Majetek nenalezen.',
+    'does_not_exist_or_not_requestable' => 'Hezký pokus, ale majetek buď neexistuje, nebo není možné jej převzít.',
+    'assoc_users'	 	=> 'Majetek je předán svému uživateli a nelze jej odstranit. Před odstraněním jej nejprve převezměte. ',

    'create' => array(
-        'error'   		=> 'Asset was not created, please try again. :(',
-        'success' 		=> 'Asset created successfully. :)'
+        'error'   		=> 'Majetek se nepodařilo vytvořit, zkuste to prosím znovu.',
+        'success' 		=> 'Majetek byl v pořádku vytvořen.'
    ),

    'update' => array(
-        'error'   			=> 'Asset was not updated, please try again',
+        'error'   			=> 'Majetek se nepodařilo upravit, zkuste to prosím znovu',
        'success' 			=> 'Majetek úspěšně aktualizován.',
-        'nothing_updated'	=>  'No fields were selected, so nothing was updated.',
+        'nothing_updated'	=>  'Nebyla zvolena žádná pole, nic se tedy neupravilo.',
    ),

    'restore' => array(
-        'error'   		=> 'Asset was not restored, please try again',
-        'success' 		=> 'Asset restored successfully.'
+        'error'   		=> 'Majetek se nepodařilo obnovit, zkuste to prosím později',
+        'success' 		=> 'Majetek byl v pořádku obnoven.'
    ),

    'deletefile' => array(
-        'error'   => 'File not deleted. Please try again.',
+        'error'   => 'Soubor se nesmazal, prosím zkuste to znovu.',
        'success' => 'Soubor byl úspěšně smazán.',
    ),

    'upload' => array(
-        'error'   => 'File(s) not uploaded. Please try again.',
-        'success' => 'File(s) successfully uploaded.',
-        'nofiles' => 'You did not select any files for upload, or the file you are trying to upload is too large',
-        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.',
+        'error'   => 'Soubor(y) se nepodařilo nahrát, zkuste to prosím znovu.',
+        'success' => 'Soubor(y) byly v pořádku nahrány.',
+        'nofiles' => 'K nahrání jste nevybrali žádný, nebo příliš velký soubor',
+        'invalidfiles' => 'Jeden nebo více označených souborů je příliš velkých nebo nejsou podporované. Povolenými příponami jsou png, gif, pdf a txt.',
    ),

    'import' => array(
-        'error'         => 'Some Items did not import Correctly.',
-        'errorDetail'   => 'The Following Items were not imported because of errors.',
-        'success'       => "Your File has been imported",
+        'error'         => 'Některé položky se nepodařilo správně nahrát.',
+        'errorDetail'   => 'Pro chyby se nepodařilo nahrát následující položky.',
+        'success'       => "Váš soubor byl v pořádku nahrán",
    ),


    'delete' => array(
-        'confirm'   	=> 'Are you sure you wish to delete this asset?',
-        'error'   		=> 'There was an issue deleting the asset. Please try again.',
+        'confirm'   	=> 'Opravdu si přejete tento majetek odstranit?',
+        'error'   		=> 'Nepodařilo se nám tento majetek odstranit. Zkuste to prosím znovu.',
        'success' 		=> 'Majetek byl úspěšně smazán.'
    ),

    'checkout' => array(
-        'error'   		=> 'Asset was not checked out, please try again',
-        'success' 		=> 'Asset checked out successfully.',
-        'user_does_not_exist' => 'That user is invalid. Please try again.'
+        'error'   		=> 'Majetek nebyl předán, zkuste to prosím znovu',
+        'success' 		=> 'Majetek byl v pořádku předán.',
+        'user_does_not_exist' => 'Tento uživatel je neplatný. Zkuste to prosím znovu.'
    ),

    'checkin' => array(
-        'error'   		=> 'Asset was not checked in, please try again',
-        'success' 		=> 'Asset checked in successfully.',
-        'user_does_not_exist' => 'That user is invalid. Please try again.',
-        'already_checked_in'  => 'That asset is already checked in.',
+        'error'   		=> 'Majetek nebyl převzat. Zkuste to prosím znovu',
+        'success' 		=> 'Majetek byl v pořádku převzat.',
+        'user_does_not_exist' => 'Tento uživatel je neplatný. Zkuste to prosím znovu.',
+        'already_checked_in'  => 'Tento majetek je již předaný.',

    ),

    'requests' => array(
-        'error'   		=> 'Asset was not requested, please try again',
-        'success' 		=> 'Asset requested successfully.',
+        'error'   		=> 'Majetek nebyl vyžádán, zkuste to prosím znovu',
+        'success' 		=> 'Vyžádání majetku proběhlo v pořádku.',
    )

 );
@@ -18,7 +18,7 @@ return array(
    'serial'   		=> 'Sériové číslo',
    'status'   		=> 'Stav',
    'title'      	=> 'Majetek ',
-    'image'		=> 'Device Image',
-    'days_without_acceptance' => 'Days Without Acceptance'
+    'image'		=> 'Obrázek zařízení',
+    'days_without_acceptance' => 'Dní bez schválení'

 );
@@ -9,14 +9,14 @@ return array(
    'date'              => 'Datum pořízení',
    'depreciation'      => 'Amortizace',
    'expiration'        => 'Expirace',
-    'license_key'       => 'Product Key',
+    'license_key'       => 'Klíč',
    'maintained'        => 'Údržba',
    'name'              => 'Software',
-    'no_depreciation'   => 'Do Not Depreciate',
+    'no_depreciation'   => 'Neznehodnocovat',
    'notes'             => 'Poznámky',
    'order'             => 'Koupeno',
-    'purchase_order'    => 'Purchase Order Number',
-    'reassignable'      => 'Reassignable',
+    'purchase_order'    => 'Číslo objednávky',
+    'reassignable'      => 'Přeřaditelné',
    'remaining_seats'   => 'Nasazeno',
    'seats'             => 'Počet licencí',
    'serial'            => 'Sériové číslo',
@@ -25,5 +25,5 @@ return array(
    'to_email'          => 'Registrováno na Email',
    'to_name'           => 'Registrace na jméno',
    'update'            => 'Úprava licence',
-    'checkout_help'     => 'You must check a license out to a hardware asset or a person. You can select both, but the owner of the asset must match the person you\'re checking the asset out to.'
+    'checkout_help'     => 'Licence musí být přidělena majetku nebo uživateli. Pokud zvolíte obojí, uživatel zvoleného majetku musí souhlasit se zvoleným uživatelem.'
 );
@@ -2,17 +2,17 @@

 return array(

-    'checkin'  					=> 'Checkin License Seat',
+    'checkin'  					=> 'Převzít jednu licenci',
    'checkout_history'  		=> 'Historie',
-    'checkout'  				=> 'Checkout License Seat',
+    'checkout'  				=> 'Předat jednu licenci',
    'edit'  					=> 'Uprav licenci',
-    'filetype_info'				=> 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.',
+    'filetype_info'				=> 'Povolené druhy souborů jsou png, gif, jpg, jpeg, doc, docx, pdf, txt, zip a rar.',
    'clone'  					=> 'Duplikovat licenci',
    'history_for'  				=> 'Historie uživatele ',
    'in_out'  					=> 'Stav',
    'info'  					=> 'Informace o licenci',
-    'license_seats'  			=> 'License Seats',
-    'seat'  					=> 'Seat',
+    'license_seats'  			=> 'Počet licencí',
+    'seat'  					=> 'Licence',
    'seats'  					=> 'Počet licencí',
    'software_licenses'  		=> 'Softwarové licence',
    'user'  					=> 'Uživatel',
@@ -5,11 +5,11 @@ return array(
    'assigned_to'   	=> 'Přiděleno',
    'checkout'   		=> 'Stav',
    'id'      			=> 'ID',
-    'license_email'   	=> 'License Email',
+    'license_email'   	=> 'E-mail',
    'license_name'   	=> 'Registrováno na',
    'purchase_date'   	=> 'Pořízeno',
    'purchased'   		=> 'Zakoupeno',
-    'seats'   			=> 'Seats',
+    'seats'   			=> 'Počet',
    'hardware'   		=> 'Hardware',
    'serial'   			=> 'Sériové číslo',
    'title'      		=> 'Licence',
@@ -1,8 +1,8 @@
 <?php

 return array(
-    'assets_rtd'		=> 'Assets', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted.
-    'assets_checkedout'		=> 'Assets Assigned',
+    'assets_rtd'		=> 'Zařízení', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted.
+    'assets_checkedout'		=> 'Předaných zař.',
    'id'      		=> 'ID',
    'city'   		=> 'Město',
    'state'   		=> 'Stát',
@@ -13,6 +13,6 @@ return array(
    'address'		=> 'Adresa',
    'zip'			=> 'PSČ',
    'locations'		=> 'Umístění',
-    'parent'		=> 'Parent',
-    'currency'  	=> 'Location Currency',
+    'parent'		=> 'Nadřazené',
+    'currency'  	=> 'Měna',
 );
@@ -4,10 +4,10 @@ return array(

    'deleted'  					        => 'Model byl vymazán. <a href="/hardware/models/:model_id/restore">Klikněte sem pro jeho obnovení</a>.',
    'restore'                   => 'Obnovení Modelu',
-	'show_mac_address'			      => 'Show MAC address field in assets in this model',
+	'show_mac_address'			      => 'Zobrazovat pole MAC adresa u zařízení tohoto druhu',
    'view_deleted'              => 'Zobrazit smazané',
    'view_models'               => 'Zobrazit Modely',
-    'fieldset'                  => 'Fieldset',
-    'no_custom_field'           => 'No custom fields',
+    'fieldset'                  => 'Sada polí',
+    'no_custom_field'           => 'Bez vlastních polí',

 );
@@ -2,16 +2,16 @@

 return array(

-    'create'				=> 'Create Asset Model',
+    'create'				=> 'Vytvořit vzor majetku',
    'created_at' 			=> 'Vytvořeno',
    'eol'	 				=> 'KŽ',
    'modelnumber'   		=> 'Modelová řada',
-    'name'      			=> 'Asset Model Name',
+    'name'      			=> 'Název vzoru majetku',
    'numassets' 			=> 'Počet',
    'title'					=> 'Model',
-    'update'				=> 'Update Asset Model',
-    'view'					=> 'View Asset Model',
-    'update'				=> 'Update Asset Model',
+    'update'				=> 'Upravit vzor majetku',
+    'view'					=> 'Zobrazit vzor majetku',
+    'update'				=> 'Upravit vzor majetku',
    'clone'				=> 'Kopíruj modelovou řadu',
    'edit'				=> 'Edituj model',
 );
@@ -1,5 +1,5 @@
 <?php

 return array(
-    'info'   => 'Select the options you want for your asset report.'
+    'info'   => 'Zvolte možnosti zprávy o majetku.'
 );
@@ -1,17 +1,21 @@
 <?php

 return array(
+    'ad'				        => 'Active Directory',
+    'ad_domain'				    => 'Active Directory domain',
+    'ad_domain_help'			=> 'This is sometimes the same as your email domain, but not always.',
+    'is_ad'				        => 'This is an Active Directory server',
 	'alert_email'				=> 'Zasílat upozornění na',
-	'alerts_enabled'			=> 'Alerts Enabled',
-	'alert_interval'			=> 'Expiring Alerts Threshold (in days)',
-	'alert_inv_threshold'		=> 'Inventory Alert Threshold',
+	'alerts_enabled'			=> 'Upozornění zapnutá',
+	'alert_interval'			=> 'Mez upozornění na vypršení (ve dnech)',
+	'alert_inv_threshold'		=> 'Mez upozornění skladu',
 	'asset_ids'					=> 'ID majetku',
 	'auto_increment_assets'		=> 'Vygenerovat zvyšující se ID majetku',
 	'auto_increment_prefix'		=> 'Předpona (volitnelná)',
 	'auto_incrementing_help'    => 'Nastavte nejdříve automaticky se zvyšující ID majetku pro nastavení tohoto',
 	'backups'					=> 'Zálohy',
 	'barcode_settings'			=> 'Nastavení čárového kódu',
-    'confirm_purge'			    => 'Confirm Purge',
+    'confirm_purge'			    => 'Potvrdit vyčištění',
    'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.',
 	'custom_css'				=> 'Custom CSS',
 	'custom_css_help'			=> 'Enter any custom CSS overrides you would like to use. Do not include the &lt;style&gt;&lt;/style&gt; tags.',
@@ -37,9 +41,12 @@ return array(
    'ldap_integration'          => 'LDAP Integration',
    'ldap_settings'             => 'LDAP Settings',
    'ldap_server'               => 'LDAP Server',
+    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted or TLS) or ldaps:// (for SSL)',
 	'ldap_server_cert'			=> 'LDAP SSL certificate validation',
 	'ldap_server_cert_ignore'	=> 'Allow invalid SSL Certificate',
 	'ldap_server_cert_help'		=> 'Select this checkbox if you are using a self signed SSL cert and would like to accept an invalid SSL certificate.',
+    'ldap_tls'                  => 'Use TLS',
+    'ldap_tls_help'             => 'This should be checked only if you are running STARTTLS on your LDAP server. ',
    'ldap_uname'                => 'LDAP Bind Username',
    'ldap_pword'                => 'LDAP Bind Password',
    'ldap_basedn'               => 'Base Bind DN',
@@ -101,4 +108,5 @@ return array(
    'bottom'        => 'bottom',
    'vertical'        => 'vertical',
    'horizontal'        => 'horizontal',
+    'zerofill_count'        => 'Length of asset tags, including zerofill',
 );
@@ -23,6 +23,7 @@
    'avatar_upload'         => 'Nahrát avatara',
    'back'      			=> 'Zpět',
    'bad_data'      		=> 'Nothing found. Maybe bad data?',
+    'bulk_checkout'  		=> 'Bulk Checkout',
    'cancel'  				=> 'Storno',
    'categories'			=> 'Kategorie',
    'category'				=> 'Kategorie',
@@ -105,6 +106,7 @@
    'moreinfo'				=> 'Další informace',
    'name'					=> 'Název',
    'next'					=> 'Další',
+    'new'					=> 'new!',
    'no_depreciation'		=> 'Žádná amortizace',
    'no_results'			=> 'Žádné výsledky.',
    'no'  					=> 'Ne',
@@ -140,6 +142,7 @@
    'select_asset'    		=> 'Select Asset',
    'settings'				=> 'Nastavení',
    'sign_in'				=> 'Přihlásit se',
+    'some_features_disabled' => 'DEMO MODE: Some features are disabled for this installation.',
    'site_name'				=> 'Název lokality',
    'state'  				=> 'Stát',
    'status_labels'			=> 'Označení stavu',
@@ -64,6 +64,8 @@ return array(
    ),
    "unique"           => ":attribute byl již vybrán.",
    "url"              => "Formát :attribute je neplatný.",
+    "statuslabel_type" => "You must select a valid status label type",
+    "unique_undeleted" => "The :attribute must be unique.",


    /*
@@ -3,6 +3,7 @@
 return array(
 	'archived'  				=> 'Archived',
    'asset'  					=> 'Asset',
+    'bulk_checkout'             => 'Checkout Assets to User',
    'checkin'  					=> 'Checkin Asset',
    'checkout'  				=> 'Checkout Asset to User',
    'clone'  					=> 'Clone Asset',
@@ -1,6 +1,10 @@
 <?php

 return array(
+    'ad'				        => 'Active Directory',
+    'ad_domain'				    => 'Active Directory domain',
+    'ad_domain_help'			=> 'This is sometimes the same as your email domain, but not always.',
+    'is_ad'				        => 'This is an Active Directory server',
 	'alert_email'				=> 'Send alerts to',
 	'alerts_enabled'			=> 'Alerts Enabled',
 	'alert_interval'			=> 'Expiring Alerts Threshold (in days)',
@@ -37,9 +41,12 @@ return array(
    'ldap_integration'          => 'LDAP Integration',
    'ldap_settings'             => 'LDAP Settings',
    'ldap_server'               => 'LDAP Server',
+    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted or TLS) or ldaps:// (for SSL)',
 	'ldap_server_cert'			=> 'LDAP SSL certificate validation',
 	'ldap_server_cert_ignore'	=> 'Allow invalid SSL Certificate',
 	'ldap_server_cert_help'		=> 'Select this checkbox if you are using a self signed SSL cert and would like to accept an invalid SSL certificate.',
+    'ldap_tls'                  => 'Use TLS',
+    'ldap_tls_help'             => 'This should be checked only if you are running STARTTLS on your LDAP server. ',
    'ldap_uname'                => 'LDAP Bind Username',
    'ldap_pword'                => 'LDAP Bind Password',
    'ldap_basedn'               => 'Base Bind DN',
@@ -101,4 +108,5 @@ return array(
    'bottom'        => 'bottom',
    'vertical'        => 'vertical',
    'horizontal'        => 'horizontal',
+    'zerofill_count'        => 'Length of asset tags, including zerofill',
 );
@@ -23,6 +23,7 @@
    'avatar_upload'         => 'Upload Avatar',
    'back'      			=> 'Tilbage',
    'bad_data'      		=> 'Nothing found. Maybe bad data?',
+    'bulk_checkout'  		=> 'Bulk Checkout',
    'cancel'  				=> 'Annuller',
    'categories'			=> 'Categories',
    'category'				=> 'Category',
@@ -105,6 +106,7 @@
    'moreinfo'				=> 'Mere Info',
    'name'					=> 'Navn',
    'next'					=> 'Next',
+    'new'					=> 'new!',
    'no_depreciation'		=> 'Ingen Afskrivning',
    'no_results'			=> 'Ingen Resultater.',
    'no'  					=> 'Nej',
@@ -140,6 +142,7 @@
    'select_asset'    		=> 'Select Asset',
    'settings'				=> 'Instillinger',
    'sign_in'				=> 'Log ind',
+    'some_features_disabled' => 'DEMO MODE: Some features are disabled for this installation.',
    'site_name'				=> 'Site Navn',
    'state'  				=> 'Stat',
    'status_labels'			=> 'Status labels',
@@ -64,6 +64,8 @@ return array(
    ),
    "unique"           => "The :attribute has already been taken.",
    "url"              => ":attribute formatet er ugyldigt.",
+    "statuslabel_type" => "You must select a valid status label type",
+    "unique_undeleted" => "The :attribute must be unique.",


    /*
@@ -3,6 +3,7 @@
 return array(
 	'archived'  				=> 'Archiviert',
    'asset'  					=> 'Asset',
+    'bulk_checkout'             => 'Checkout Assets to User',
    'checkin'  					=> 'Asset zurücknehmen',
    'checkout'  				=> 'Asset an Benutzer herausgeben',
    'clone'  					=> 'Asset duplizieren',
@@ -37,9 +37,9 @@ return array(
    ),

    'import' => array(
-        'error'         => 'Some Items did not import Correctly.',
-        'errorDetail'   => 'The Following Items were not imported because of errors.',
-        'success'       => "Your File has been imported",
+        'error'         => 'Einige Elemente wurden nicht korrekt importiert.',
+        'errorDetail'   => 'Die Folgenden Elemente wurden aufgrund von Fehlern nicht importiert.',
+        'success'       => "Ihre Datei wurde importiert",
    ),


@@ -9,7 +9,7 @@ return array(
    'date'              => 'Kaufdatum',
    'depreciation'      => 'Abschreibung',
    'expiration'        => 'Ablaufdatum',
-    'license_key'       => 'Product Key',
+    'license_key'       => 'Produktschlüssel',
    'maintained'        => 'Verwaltet',
    'name'              => 'Software Name',
    'no_depreciation'   => 'Nicht abschreiben',
@@ -1,6 +1,10 @@
 <?php

 return array(
+    'ad'				        => 'Active Directory',
+    'ad_domain'				    => 'Active Directory domain',
+    'ad_domain_help'			=> 'This is sometimes the same as your email domain, but not always.',
+    'is_ad'				        => 'This is an Active Directory server',
 	'alert_email'				=> 'Alarme senden an',
 	'alerts_enabled'			=> 'Alarme aktiviert',
 	'alert_interval'			=> 'Ablauf Alarmschwelle (in Tagen)',
@@ -23,9 +27,9 @@ return array(
    'display_checkout_date'     => 'Zeige Herausgabedatum',
    'display_eol'               => 'Zeige EOL in der Tabellenansicht',
    'display_qr'                => 'Zeige quadratische Codes',
-	'display_alt_barcode'		=> 'Display 1D barcode',
-	'barcode_type'				=> '2D Barcode Type',
-	'alt_barcode_type'			=> '1D barcode type',
+	'display_alt_barcode'		=> 'Zeige 1D Barcode an',
+	'barcode_type'				=> '2D Barcode Typ',
+	'alt_barcode_type'			=> '1D Barcode Typ',
    'eula_settings'				=> 'EULA Einstellungen',
    'eula_markdown'				=> 'Diese EULA <a href="https://help.github.com/articles/github-flavored-markdown/"> erlaubt Github Flavored Markdown</a>.',
    'general_settings'			=> 'Generelle Einstellungen',
@@ -37,9 +41,12 @@ return array(
    'ldap_integration'          => 'LDAP Integration',
    'ldap_settings'             => 'LDAP Einstellungen',
    'ldap_server'               => 'LDAP Server',
+    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted or TLS) or ldaps:// (for SSL)',
 	'ldap_server_cert'			=> 'LDAP SSL Zertifikatsüberprüfung',
 	'ldap_server_cert_ignore'	=> 'Erlaube ungültige SSL Zertifikate',
 	'ldap_server_cert_help'		=> 'Wählen Sie diese Option, wenn Sie selbstsignierte SSL Zertifikate verwenden und diese gegebenenfalls ungültigen Zertifikate akzeptieren möchten.',
+    'ldap_tls'                  => 'Use TLS',
+    'ldap_tls_help'             => 'This should be checked only if you are running STARTTLS on your LDAP server. ',
    'ldap_uname'                => 'LDAP Bind Nutzername',
    'ldap_pword'                => 'LDAP Bind Passwort',
    'ldap_basedn'               => 'Basis Bind DN',
@@ -101,4 +108,5 @@ return array(
    'bottom'        => 'Unten',
    'vertical'        => 'Vertikal',
    'horizontal'        => 'Horizontal',
+    'zerofill_count'        => 'Length of asset tags, including zerofill',
 );
@@ -2,24 +2,24 @@

 return array(

-    'does_not_exist' => 'Status Label does not exist.',
-    'assoc_assets'	 => 'This Status Label is currently associated with at least one Asset and cannot be deleted. Please update your assets to no longer reference this status and try again. ',
+    'does_not_exist' => 'Diese Statusbezeichnung existiert nicht.',
+    'assoc_assets'	 => 'Auf diese Statusbezeichnung bezieht sich momentan mindestens ein Asset und kann daher nicht gelöscht werden. Bitte sorgen Sie dafür, dass sich kein Asset mehr auf diese Statusbezeichnung bezieht und versuchen Sie es erneut. ',


    'create' => array(
-        'error'   => 'Status Label was not created, please try again.',
-        'success' => 'Status Label created successfully.'
+        'error'   => 'Statusbezeichnung wurde nicht erstellt. Bitte versuchen Sie es erneut.',
+        'success' => 'Statusbezeichnung wurde erfolgreich erstellt.'
    ),

    'update' => array(
-        'error'   => 'Status Label was not updated, please try again',
-        'success' => 'Status Label updated successfully.'
+        'error'   => 'Statusbezeichnung wurde nicht aktualisiert. Bitte versuchen Sie es erneut.',
+        'success' => 'Statusbezeichnung wurde erfolgreich aktualisiert.'
    ),

    'delete' => array(
-        'confirm'   => 'Are you sure you wish to delete this Status Label?',
-        'error'   => 'There was an issue deleting the Status Label. Please try again.',
-        'success' => 'The Status Label was deleted successfully.'
+        'confirm'   => 'Sind Sie sicher, dass Sie diese Statusbezeichnung löschen wollen?',
+        'error'   => 'Es trat ein Fehler beim Löschen der Statusbezeichnung auf. Bitte versuchen Sie es erneut.',
+        'success' => 'Die Statusbezeichnung wurde erfolgreich gelöscht.'
    )

 );
@@ -23,6 +23,7 @@
    'avatar_upload'         => 'Avatar hochladen',
    'back'      			=> 'Zurück',
    'bad_data'      		=> 'Nichts gefunden. Vielleicht defekte Daten?',
+    'bulk_checkout'  		=> 'Bulk Checkout',
    'cancel'  				=> 'Abbrechen',
    'categories'			=> 'Kategorien',
    'category'				=> 'Kategorie',
@@ -56,14 +57,14 @@
    'depreciation'			=> 'Abschreibung',
    'editprofile'  			=> 'Profil bearbeiten',
    'eol'					=> 'EOL',
-    'email_domain'			=> 'Email Domain',
-    'email_format'			=> 'Email Format',
-    'email_domain_help'		=> 'This is used to generate email addresses when importing',
-    'filastname_format'			=> 'First Initial Last Name (jsmith@example.com)',
-    'firstname_lastname_format'	=> 'First Name Last Name (jane.smith@example.com)',
+    'email_domain'			=> 'E-Mail-Domain',
+    'email_format'			=> 'E-Mail-Format',
+    'email_domain_help'		=> 'Dieses wird verwendet, um beim importieren E-Mail-Adressen zu generieren',
+    'filastname_format'			=> 'Initial des Vornamen + Nachname (jsmith@example.com)',
+    'firstname_lastname_format'	=> 'Vorname Nachname (jane.smith@example.com)',
    'first'					=> 'Erstes',
    'first_name'			=> 'Vorname',
-    'first_name_format'		=> 'First Name (jane@example.com)',
+    'first_name_format'		=> 'Vorname (jane@example.com)',
    'file_name'				=> 'Datei',
    'file_uploads'			=> 'Datei-Uploads',
    'generate'				=> 'Generieren',
@@ -94,7 +95,7 @@
    'location'              => 'Standort',
    'locations'				=> 'Standorte',
    'logout'				=> 'Abmelden',
-    'lookup_by_tag'     => 'Lookup by Asset Tag',
+    'lookup_by_tag'     => 'Nach Asset Tag suchen',
    'manufacturer'			=> 'Hersteller',
    'manufacturers'			=> 'Hersteller',
    'markdown'				=> 'Dieses Feld erlaubt <a href="https://help.github.com/articles/github-flavored-markdown/"> Github Flavored Markdown</a>.',
@@ -105,6 +106,7 @@
    'moreinfo'				=> 'Mehr Informationen',
    'name'					=> 'Location Name',
    'next'					=> 'Nächstes',
+    'new'					=> 'new!',
    'no_depreciation'		=> 'Do Not Depreciate',
    'no_results'			=> 'Keine Treffer.',
    'no'  					=> 'Nein',
@@ -127,7 +129,7 @@
    'save'  				=> 'Speichern',
    'select'				=> 'auswählen',
    'search'				=> 'Suche',
-    'select_category'       => 'Select a Category',
+    'select_category'       => 'Kategorie auswählen',
    'select_depreciation'	=> 'Wähle einen Abschreibungstyp',
    'select_location'		=> 'Wählen Sie einen Standort',
    'select_manufacturer'	=> 'Wählen Sie einen Hersteller',
@@ -140,6 +142,7 @@
    'select_asset'    		=> 'Asset auswählen',
    'settings'				=> 'Einstellungen',
    'sign_in'				=> 'Einloggen',
+    'some_features_disabled' => 'DEMO MODE: Some features are disabled for this installation.',
    'site_name'				=> 'Seitenname',
    'state'  				=> 'Zustand',
    'status_labels'			=> 'Statusbezeichnungen',
@@ -150,7 +153,7 @@
    'type'  				=> 'Typ',
    'undeployable'			=> 'Nicht herausgebbar',
    'unknown_admin'			=> 'Unbekannter Administrator',
-    'username_format'		=> 'Username Format',
+    'username_format'		=> 'Format der Benutzernamen',
    'update'                => 'Aktualisieren',
    'uploaded'              => 'Hochgeladen',
    'user'					=> 'Nutzer',
@@ -64,6 +64,8 @@ return array(
    ),
    "unique"           => ":attribute schon benutzt.",
    "url"              => ":attribute Format ist ungültig.",
+    "statuslabel_type" => "You must select a valid status label type",
+    "unique_undeleted" => "The :attribute must be unique.",


    /*
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
snipe	1fa2fe3c24	Merge remote-tracking branch 'origin/develop'	2016-08-01 10:32:04 -07:00
snipe	b6986ad808	Bumped version	2016-08-01 10:31:46 -07:00
snipe	715c9aa780	Merge remote-tracking branch 'origin/develop'	2016-08-01 10:18:01 -07:00
snipe	139325d8ba	Small tweaks for bad data	2016-08-01 10:17:46 -07:00
snipe	d65a9091c8	Merge remote-tracking branch 'origin/develop'	2016-07-30 17:27:29 -07:00
snipe	1f30bdee99	Fixes #2361	2016-07-30 17:27:08 -07:00
snipe	4e4f338680	Merge remote-tracking branch 'origin/develop'	2016-07-29 14:32:49 -07:00
snipe	0f72989953	Updated language strings	2016-07-29 14:32:31 -07:00
snipe	93e038006c	Merge remote-tracking branch 'origin/develop'	2016-07-29 14:18:21 -07:00
snipe	b63a3abf70	Bumped hash	2016-07-29 14:18:05 -07:00
snipe	46eca54b44	Moved bulk checkout into assets nav	2016-07-29 14:17:59 -07:00
zjean	fcb1d6ac15	Fixed feedback on #2349 (#2359 )	2016-07-29 13:59:50 -07:00
snipe	3f54c034dd	Merge remote-tracking branch 'origin/develop'	2016-07-29 12:15:45 -07:00
snipe	a53346be1f	Merge branch 'develop' of github.com:snipe/snipe-it into develop	2016-07-29 12:15:14 -07:00
snipe	fd94c76874	Fixes asset created_at	2016-07-29 12:15:09 -07:00
zjean	108a3c9dad	Updated view for #2324 (#2357 )	2016-07-29 11:55:16 -07:00
snipe	85232c47da	Merge branch 'develop' of github.com:snipe/snipe-it into develop	2016-07-28 21:31:58 -07:00
snipe	47f6635992	A few more permissions tweaks	2016-07-28 21:31:53 -07:00
Daniel Meltzer	eef8d1609e	Small fixes (#2350 ) * components.view should point to view, not create * Fix comment * Rename variable to accurately reflect its responsibility * Fix line breaks in serial key, remove places where adding line breaks makes no sense. Fixes #2344	2016-07-28 20:59:42 -07:00
snipe	8a9307f357	Wordwrap license key	2016-07-28 18:56:02 -07:00
snipe	0a73297f24	Merge remote-tracking branch 'origin/develop'	2016-07-28 12:51:01 -07:00
snipe	1f0737cfb7	Allow super admins to override company	2016-07-28 12:40:19 -07:00
snipe	fae9755ffb	Merge remote-tracking branch 'origin/develop'	2016-07-28 09:16:46 -07:00
snipe	c07ad03e74	Removed unique from form request	2016-07-28 09:16:30 -07:00
snipe	011cb1120d	Merge remote-tracking branch 'origin/develop'	2016-07-28 08:51:15 -07:00
snipe	68b7b8f932	Fixes Carbon date	2016-07-28 08:51:01 -07:00
snipe	f78a577210	Merge remote-tracking branch 'origin/develop'	2016-07-28 08:41:47 -07:00
snipe	c0f4e621ea	Bumped version	2016-07-28 08:41:33 -07:00
snipe	c78dbfc21f	Merge remote-tracking branch 'origin/develop'	2016-07-28 08:39:59 -07:00
snipe	f31637adb4	Fixes #2346	2016-07-28 08:39:28 -07:00
snipe	3e5d2b5385	Ability to remove field from fieldset	2016-07-28 08:10:15 -07:00
snipe	fbd0059bbb	Fixes #2317	2016-07-28 08:07:14 -07:00
snipe	f53c5706f6	Fixes #2341	2016-07-28 07:36:58 -07:00
snipe	214a7d548d	Bumped version	2016-07-28 06:44:59 -07:00
snipe	0ee5dea1a1	Fixes #2344	2016-07-28 06:43:31 -07:00
snipe	29c60ee6b5	Merge remote-tracking branch 'origin/develop'	2016-07-28 05:50:22 -07:00
snipe	075f8fd021	Fixed typo	2016-07-28 05:49:55 -07:00
snipe	14b0a6315f	Pass users path to get_src	2016-07-28 05:49:41 -07:00
snipe	b99d300ab2	Merge remote-tracking branch 'origin/develop'	2016-07-27 21:47:25 -07:00
snipe	9dda0d02ea	Change default zerofill to 5	2016-07-27 21:47:03 -07:00
snipe	8e6c157e7e	Merge remote-tracking branch 'origin/develop'	2016-07-27 21:33:00 -07:00
snipe	9fbe6c68ac	Fixes #2304	2016-07-27 21:30:38 -07:00
snipe	eb508901c5	Zerofilling for auto-increment	2016-07-27 21:28:00 -07:00
snipe	07b70a8cd0	Merge remote-tracking branch 'origin/develop'	2016-07-27 20:30:25 -07:00
snipe	e9eb5ad372	Bumped version	2016-07-27 20:30:11 -07:00
snipe	3fd5fb836f	Restore linebreaks in notes	2016-07-27 20:24:09 -07:00
snipe	3514ae2c0d	Merge branch 'develop' of github.com:snipe/snipe-it into develop	2016-07-27 20:16:54 -07:00
snipe	1493251794	Gitignore cleanup	2016-07-27 20:16:46 -07:00
Daniel Meltzer	b4e54225a2	Fix exports (#2338 ) * Update tableexport.js to the new version. * Give the export file in each table a useful name. The name takes the form of tabletype-export-YYYY-MM-DD.extension.	2016-07-27 19:45:45 -07:00
Daniel Meltzer	4c9e75cec9	Install php-zip so backups work. Not needed in 14.04 because it looks like this is part of the php7 split. (#2340 ) Issue #2269	2016-07-27 19:44:46 -07:00
Daniel Meltzer	a401986ef5	Only set the category_type in postEdit if the category is empty. (#2337 ) Fixes #2333	2016-07-27 16:13:54 -07:00
snipe	288584cb60	Merge branch 'master' of github.com:snipe/snipe-it	2016-07-26 16:33:32 -07:00
Daniel Meltzer	399e70763b	Scope requestable assets to company as well. Updates to #2206 . (#2326 )	2016-07-26 16:22:56 -07:00
Brady Wetherington	f145d6cc8c	Change README to point to new documentation site	2016-07-26 13:56:40 -07:00
Daniel Meltzer	9e4ac018ea	Don't allow users without a company to change the company of items if full company support is enabled. (#2321 )	2016-07-26 13:31:36 -07:00
Daniel Meltzer	0bf5c6978e	Make sure the assigned user is actually shown in the dropdown list. Not sure why this wasn't throwing an error for me, but this makes it actually behave. (#2322 )	2016-07-26 13:06:38 -07:00
snipe	9a9b214c1d	Fixes #2319	2016-07-26 06:07:47 -07:00
snipe	b76dc25ac0	Duh, we don’t soft-delete companies	2016-07-26 02:11:41 -07:00
snipe	b30369f7ce	Added table name for trait	2016-07-26 02:04:31 -07:00
snipe	16fe53928c	Updated undeleted validation	2016-07-26 01:49:21 -07:00
snipe	2e665e128f	Putting uniqueUndeleted into a trait for use across models	2016-07-26 01:39:30 -07:00
snipe	60560e4994	Remove unused Log statement	2016-07-26 00:50:16 -07:00
snipe	a44b90dfc9	Custom validator for multiple deleted items with the same unique field	2016-07-26 00:44:26 -07:00
snipe	987b969e88	Move bcrypt out of loop for object importer	2016-07-25 22:31:33 -07:00
snipe	ad531d6d59	Merge branch 'develop' of github.com:snipe/snipe-it into develop	2016-07-25 22:10:38 -07:00
snipe	261d2f133b	Only bcrypt temp passwords once for performance	2016-07-25 22:10:33 -07:00
Daniel Meltzer	e0938cf82d	Scope to company when viewing assets (#2315 ) * If a user doesn't belong to a company, when scoping to a company we should only show items that don't belong to a company. * Scope tables/items to the company they belong to when fetching items for the index. * Fix asset count to also scope to company. This fixes dashboard view * Exempt super users from the child company check to be consistent. Fixes license count on dashboard now that we scope everything	2016-07-25 19:46:29 -07:00
snipe	eec22c5aeb	Removed port stuff, since LDAP ignores it anyway :-/	2016-07-22 16:21:16 -07:00
snipe	b03330aae0	Added TLS option in settings for LDAP	2016-07-22 16:00:37 -07:00
snipe	7f5ea72dc7	Bumped version	2016-07-22 15:11:03 -07:00
snipe	ba25972b49	Add LDAP port number option	2016-07-22 15:09:49 -07:00
snipe	cc6b2a0081	FIxes #2280 This shouldn’t ever happen though. Bad data somwhere, I’m guessing.	2016-07-22 07:48:46 -07:00
snipe	a590cc3dd2	One more fix for MAC address weirdness	2016-07-22 05:56:00 -07:00
snipe	d4138f4364	Fixes #2299	2016-07-22 03:10:25 -07:00
snipe	128290bd82	Cleanup checkin blade	2016-07-22 02:34:25 -07:00
snipe	114540d836	Cleanup checkout form	2016-07-22 02:20:05 -07:00
snipe	0b57f74e36	Check for model name (this should never be blank, but…)	2016-07-22 02:14:12 -07:00
snipe	03d7d01e12	Fixes #2300	2016-07-22 02:12:04 -07:00
snipe	a1640d7fe3	Form cleanup	2016-07-22 02:11:57 -07:00
snipe	1f85f4b337	Clearer demo mode text	2016-07-22 02:11:46 -07:00
snipe	b2d958724b	Removed commented code	2016-07-22 02:11:37 -07:00
snipe	297820d347	Newer required style	2016-07-22 01:33:55 -07:00
snipe	094c5ac8df	Fixes #2292	2016-07-22 01:16:18 -07:00
snipe	78fda31379	Helper method to introspect into the model level validation to see if the field is required (This does not yet handle form request validation)	2016-07-22 00:29:23 -07:00
snipe	3a04686ade	Nicer demo mode message	2016-07-22 00:28:22 -07:00
snipe	ca5d3e3006	Nicer license form display	2016-07-22 00:25:41 -07:00
snipe	d427dcc8e2	updated version	2016-07-22 00:24:42 -07:00
snipe	f0c00897ca	Required class	2016-07-22 00:21:56 -07:00
snipe	e256bdc9f7	Clearer version in footer	2016-07-21 21:39:23 -07:00
snipe	2e6e0e8911	Fixed versioning path	2016-07-21 21:30:49 -07:00
snipe	b0dc5b4183	Fixes #2290	2016-07-21 21:28:17 -07:00
snipe	9385c3e9cf	Remove last name requirement from Form Request	2016-07-21 19:46:46 -07:00
snipe	61108102d7	No longer require last name I may regret this…	2016-07-21 19:44:07 -07:00
snipe	8ba9399de7	Merge branch 'master' into develop	2016-07-21 19:42:11 -07:00
snipe	f6a4d4aaab	Better display for some features disabled for demo mode	2016-07-21 19:40:23 -07:00
Daniel Meltzer	df664bdc9d	Fix categories acceptance test as it stands. We need to choose a category type to pass validation, and we need to see the elemnt alert-danger, not the text, to make the test fail when it should. (#2289 )	2016-07-20 21:36:43 -07:00
Daniel Meltzer	c2f6e0cfd8	Don't escape html in default eula. Fixes #2277 (#2279 )	2016-07-20 19:39:48 -07:00
Daniel Meltzer	ba6f26cef9	If a category has items in it, disable changing the category type (#2288 )	2016-07-20 19:27:33 -07:00
Daniel Meltzer	68b0bbbec9	Fix tests (#2273 ) * Update installer script for v3 now that things have moved around. * Make Statuslabel attributes fillable and add them to the generated array. Fixes status label tests.	2016-07-19 15:50:21 -07:00
snipe	52425f62c5	Set default values for status labels in import	2016-07-19 15:49:04 -07:00
Daniel Meltzer	54a0d0de0e	Fetch the installer from master instead of v3 branch. (#2266 )	2016-07-19 09:41:00 -07:00
Daniel Meltzer	099f5d4cfd	Update installer script for v3 now that things have moved around. (#2263 )	2016-07-19 08:41:56 -07:00