Merge remote-tracking branch 'origin/develop'

Author: snipe

app/commands/AppCommand.php

@@ -187,7 +187,7 @@ protected function askUserPassword()
 		do
 		{
 			// Ask the user to input the user password
-			$password = $this->ask('Please enter your user password: ');
+			$password = $this->ask('Please enter your user password (at least 8 characters): ');
 
 			// Check if email is valid
 			if ($password == '')

app/controllers/AuthController.php

@@ -29,7 +29,7 @@ public function postSignin()
 		// Declare the rules for the form validation
 		$rules = array(
 			'email'    => 'required|email',
-			'password' => 'required|between:8,32',
+			'password' => 'required',
 		);
 
 		// Create a new validator instance from our validation rules
@@ -103,8 +103,8 @@ public function postSignup()
 	{
 		// Declare the rules for the form validation
 		$rules = array(
-			'first_name'       => 'required|min:3',
-			'last_name'        => 'required|min:3',
+			'first_name'       => 'required|min:2',
+			'last_name'        => 'required|min:2',
 			'email'            => 'required|email|unique:users',
 			'email_confirm'    => 'required|email|same:email',
 			'password'         => 'required|between:8,32',
@@ -289,7 +289,7 @@ public function postForgotPasswordConfirm($passwordResetCode = null)
 	{
 		// Declare the rules for the form validation
 		$rules = array(
-			'password'         => 'required',
+			'password'         => 'required|between:8,32',
 			'password_confirm' => 'required|same:password'
 		);
 

app/lang/en/auth/message.php

@@ -2,8 +2,8 @@
 
 return array(
 
-	'account_already_exists' => 'An account with the provided email, already exists.',
-	'account_not_found'      => 'This user account was not found.',
+	'account_already_exists' => 'An account with the this email already exists.',
+	'account_not_found'      => 'The email account or password is incorrect.',
 	'account_not_activated'  => 'This user account is not activated.',
 	'account_suspended'      => 'This user account is suspended.',
 	'account_banned'         => 'This user account is banned.',
@@ -27,7 +27,7 @@
             'error'   => 'There was a problem while trying to reset your password, please try again.',
             'success' => 'Your password has been successfully reset.',
         ),
-    
+
 	'activate' => array(
 		'error'   => 'There was a problem while trying to activate your account, please try again.',
 		'success' => 'Your account has been successfully activated.',

app/views/backend/users/view.blade.php

@@ -141,8 +141,6 @@
 											<a href="{{ route('view/hardware', $log->asset_id) }}">{{ $log->assetlog->asset_tag }}</a>
 										@elseif ((isset($log->assetlog->name)) && ($log->assetlog->deleted_at!=''))
 											<del>{{ $log->assetlog->name }}</del> (deleted)
-										@else
-										missing asset ({{ $log->assetlog->name }}) ({{ $log->assetlog->deleted_at }})
 										@endif
 										</td>
 										<td>{{ $log->adminlog->fullName() }}</td>