Merge remote-tracking branch 'origin/develop'

Conflicts:
	CONTRIBUTING.md

.gitignore

@@ -16,4 +16,5 @@ public/uploads/avatars/*
 /app/storage/logs/*
 /app/storage/debugbar/
 /bin/
-.idea
+.idea
+crowdin.yaml

CONTRIBUTING.md

@@ -6,12 +6,11 @@ Please submit all issues and pull requests to the [snipe/snipe-it](http://github
 
 If you don't have a feature in mind, but would like to contribute back to the project, check out the [open issues](https://github.com/snipe/snipe-it/issues?state=open) and see if there are any you can tackle.
 
-We use Waffle.io to help better communicate our roadmap with users. Our [project page there](http://waffle.io/snipe/snipe-it) will show you the backlog, what's ready to be worked on, what's in progress, and what's completed.
+-----
 
 [![Stories in Ready](https://badge.waffle.io/snipe/snipe-it.png?label=ready&title=Ready)](http://waffle.io/snipe/snipe-it)
 
 
------
 
 ## Translations!
 

README.md

@@ -65,3 +65,7 @@ Whenever you pull down a new version from master or develop, when you grab the [
 	php artisan migrate
 
 Forgetting to do this can mean your DB might end up out of sync with the new files you just pulled, or you may have some funky cached autoloader values. It's a good idea to get into the habit of running these every time you pull anything new down. If there are no database changes to migrate, it won't hurt anything to run migrations anyway.
+
+
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/snipe/snipe-it/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+

app/controllers/admin/AssetsController.php

@@ -212,6 +212,15 @@ class AssetsController extends AdminController
 
             // Was the asset created?
             if($asset->save()) {
+
+				$logaction = new Actionlog();
+				$logaction->asset_id = $asset->id;
+				$logaction->checkedout_to = $asset->assigned_to;
+				$logaction->asset_type = 'hardware';
+				$logaction->user_id = Sentry::getUser()->id;
+				$logaction->note = e(Input::get('note'));
+				$log = $logaction->logaction('checkout');
+
                 // Redirect to the asset listing page
                 return Redirect::to("hardware")->with('success', Lang::get('admin/hardware/message.create.success'));
             }

app/controllers/admin/LicensesController.php

@@ -377,8 +377,9 @@ class LicensesController extends AdminController
         // Left join to get a list of assets and some other helpful info
         $asset = DB::table('assets')
             ->leftJoin('users', 'users.id', '=', 'assets.assigned_to')
-            ->select('assets.id', 'name', 'first_name', 'last_name','asset_tag',
-            DB::raw('concat (first_name," ",last_name) as full_name, assets.id as id'))
+            ->leftJoin('models', 'assets.model_id', '=', 'models.id')
+            ->select('assets.id', 'assets.name', 'first_name', 'last_name','asset_tag',
+            DB::raw('concat (first_name," ",last_name) as full_name, assets.id as id, models.name as modelname'))
             ->whereNull('assets.deleted_at')
             ->get();
 
@@ -389,9 +390,9 @@ class LicensesController extends AdminController
             for ($x=0; $x<count($asset_array); $x++) {
 
                 if ($asset_array[$x]['full_name']!='') {
-                    $full_name = ' ('.$asset_array[$x]['full_name'].')';
+                    $full_name = ' ('.$asset_array[$x]['full_name'].') '.$asset_array[$x]['modelname'];
                 } else {
-                    $full_name = ' (Unassigned)';
+                    $full_name = ' (Unassigned) '.$asset_array[$x]['modelname'];
                 }
                 $asset_element[$asset_array[$x]['id']] = $asset_array[$x]['asset_tag'].' - '.$asset_array[$x]['name'].$full_name;
 

app/lang/en/admin/settings/general.php

@@ -1,6 +1,9 @@
 <?php
 
 return array(
+	'auto_increment_assets'		=> 'Generate auto-incrementing asset IDs',
+	'auto_increment_prefix'		=> 'Prefix (optional)',
+	'auti_incrementing_help'    => 'Enable auto-incrementing asset IDs first to set this',
     'display_asset_name'        => 'Display Asset Name',
     'display_checkout_date'     => 'Display Checkout Date',
     'display_eol'               => 'Display EOL in table view',

app/models/Location.php

@@ -7,8 +7,8 @@ class Location extends Elegant
     protected $rules = array(
             'name'  		=> 'required|alpha_space|min:3|max:255|unique:locations,name,{id}',
             'city'   		=> 'required|alpha_space|min:3|max:255',
-            'state'   		=> 'required|alpha|min:2|max:32',
-            'country'   	=> 'required|alpha|min:2|max:2|max:2',
+            'state'   		=> 'required|alpha_space|min:2|max:32',
+            'country'   	=> 'required|alpha_space|min:2|max:2|max:2',
             'address'		=> 'required|alpha_space|min:5|max:80',
             'address2'		=> 'alpha_space|min:5|max:80',
             'zip'   		=> 'alpha_dash|min:3|max:10',

app/views/backend/hardware/checkout.blade.php

@@ -43,6 +43,17 @@
             </div>
             @endif
 
+            @if ($asset->model->name)
+            <!-- Asset name -->
+            <div class="form-group">
+            <label class="col-sm-2 control-label">@lang('admin/hardware/form.model')</label>
+                <div class="col-md-6">
+                  <p class="form-control-static">{{{ $asset->model->name }}}</p>
+                </div>
+            </div>
+            @endif
+
+
             <!-- User -->
 
             <div class="form-group {{ $errors->has('assigned_to') ? ' has-error' : '' }}">

app/views/backend/licenses/checkout.blade.php

@@ -31,15 +31,15 @@
             <div class="form-group">
             <label class="col-sm-2 control-label">@lang('admin/hardware/form.name')</label>
                 <div class="col-md-6">
-                  <p class="form-control-static">{{ $licenseseat->license->name }}</p>
+                  <p class="form-control-static">{{{ $licenseseat->license->name }}}</p>
                 </div>
             </div>
 
             <!-- Serial -->
             <div class="form-group">
             <label class="col-sm-2 control-label">@lang('admin/hardware/form.serial')</label>
-                <div class="col-md-6">
-                  <p class="form-control-static">{{ $licenseseat->license->serial }}</p>
+                <div class="col-md-10">
+                  <p class="form-control-static" style="word-wrap: break-word;">{{{ $licenseseat->license->serial }}}</p>
                 </div>
             </div>
 
@@ -48,8 +48,8 @@
                 <label for="asset_id" class="col-md-2 control-label">@lang('admin/licenses/form.asset')
                  </label>
 
-                <div class="col-md-9">
-                    {{ Form::select('asset_id', $asset_list , Input::old('asset_id', $licenseseat->asset_id), array('class'=>'select2', 'style'=>'min-width:350px')) }}
+                <div class="col-md-10">
+                    {{ Form::select('asset_id', $asset_list , Input::old('asset_id', $licenseseat->asset_id), array('class'=>'select2', 'style'=>'min-width:600px')) }}
                     {{ $errors->first('asset_id', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
                 </div>
             </div>

app/views/backend/settings/index.blade.php

@@ -91,7 +91,7 @@
                                             @endif
                                     </tr>
                                     <tr>
-                                        <td>@lang('admin/settings/general.qr_text')</td>
+                                        <td>@lang('admin/settings/general.auti_incrementing_help')</td>
                                         <td>{{{ $setting->qr_text }}}</td>
                                     </tr>
                                     @endforeach