From 1be22cf05191e08d39e2a18beb5b723293e3b4bc Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 1 Dec 2016 02:53:41 -0800
Subject: [PATCH 01/14] Improved versioning script

---
 app/Console/Commands/Versioning.php       | 24 +++++++++++------------
 config/version.php                        |  4 +++-
 resources/views/layouts/default.blade.php |  2 +-
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/Console/Commands/Versioning.php b/app/Console/Commands/Versioning.php
index de0ac022ab..91f1d93d3e 100644
--- a/app/Console/Commands/Versioning.php
+++ b/app/Console/Commands/Versioning.php
@@ -40,20 +40,19 @@ class Versioning extends Command
      */
     public function fire()
     {
-        // Path to the file containing your version
-        // This will be overwritten everything you commit a message
+
         $versionFile = 'config/version.php';
+        $hash_version = str_replace("\n",'',shell_exec('git describe --tags'));
 
-        // The git's output
-        // get the argument passed in the git command
-         $hash_version = $this->argument('app_version');
+        $version = explode('-', $hash_version);
 
-         // discard the commit hash
-         $version = explode('-', $hash_version);
-         $realVersion = $version[0];
-
-         // save the version array to a variable
-         $array = var_export(array('app_version' => $realVersion,'hash_version' => $hash_version), true);
+        $array = var_export(
+            array(
+            'app_version' => $version[0],
+            'build_version' => $version[1],
+            'hash_version' => $version[2],
+            'full_hash' => $hash_version),
+        true);
 
 
         // Construct our file content
@@ -64,7 +63,7 @@ CON;
 
         // And finally write the file and output the current version
         \File::put($versionFile, $content);
-        $this->line('Setting version: '. \config('version.latest'));
+        $this->line('Setting version: '. config('version.app_version').' build '.config('version.build_version').' ('.config('version.hash_version').')');
     }
 
     /**
@@ -75,7 +74,6 @@ CON;
     protected function getArguments()
     {
         return array(
-            array('app_version', InputArgument::REQUIRED, 'version number is required.'),
         );
     }
 
diff --git a/config/version.php b/config/version.php
index 93fd0611ce..38e96f24cc 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,5 +1,7 @@
 <?php
 return array (
   'app_version' => 'v3.6.0',
-  'hash_version' => 'v3.6.0-67-g7ccef51',
+  'build_version' => '68',
+  'hash_version' => 'ge62f3f9',
+  'full_hash' => 'v3.6.0-68-ge62f3f9',
 );
\ No newline at end of file
diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index a621a7bb8f..acb53a8cfe 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -584,7 +584,7 @@
 
       <footer class="main-footer">
         <div class="pull-right hidden-xs">
-          <b>Version</b> {{  config('version.hash_version') }}
+          <b>Version</b> {{ config('version.app_version') }}  build {{ config('version.build_version') }} ({{ config('version.hash_version') }})
           <a target="_blank" class="btn btn-default btn-xs" href="https://snipe-it.readme.io">Documentation</a>
           <a target="_blank" class="btn btn-default btn-xs" href="https://snipe-it-manual.readme.io">User's Manual</a>
           <a target="_blank" class="btn btn-default btn-xs" href="https://snipeitapp.com/support/">Report a Bug</a>

From 59617cc7d3e9d3d33e0757ab5801014bfe4e826e Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 1 Dec 2016 02:57:47 -0800
Subject: [PATCH 02/14] Updated version in settings

---
 resources/views/settings/index.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/settings/index.blade.php b/resources/views/settings/index.blade.php
index b96d15f16e..aafb5b5a1d 100755
--- a/resources/views/settings/index.blade.php
+++ b/resources/views/settings/index.blade.php
@@ -210,7 +210,7 @@
                     <tr>
                           <td class="col-md-4">{{ trans('admin/settings/general.snipe_version') }}</td>
                           <td class="col-md-8">
-                              {{  config('version.hash_version') }}
+                              {{ config('version.app_version') }}  build {{ config('version.build_version') }} ({{ config('version.hash_version') }})
                           </td>
                       </tr>
                       <tr>

From 5a7ea0e90830754b8ca9e3f4f8554098cf460313 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 1 Dec 2016 02:59:11 -0800
Subject: [PATCH 03/14] Updated hash

---
 config/version.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/version.php b/config/version.php
index 38e96f24cc..1b9d4313fb 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,7 +1,7 @@
 <?php
 return array (
   'app_version' => 'v3.6.0',
-  'build_version' => '68',
-  'hash_version' => 'ge62f3f9',
-  'full_hash' => 'v3.6.0-68-ge62f3f9',
+  'build_version' => '70',
+  'hash_version' => 'g59617cc',
+  'full_hash' => 'v3.6.0-70-g59617cc',
 );
\ No newline at end of file

From c3b4342df4c8608d2aa11448d86441deee75a704 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 1 Dec 2016 02:59:17 -0800
Subject: [PATCH 04/14] Automatically updated version hash

---
 config/version.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/version.php b/config/version.php
index 1b9d4313fb..745af1f0ee 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,7 +1,7 @@
 <?php
 return array (
   'app_version' => 'v3.6.0',
-  'build_version' => '70',
-  'hash_version' => 'g59617cc',
-  'full_hash' => 'v3.6.0-70-g59617cc',
+  'build_version' => '71',
+  'hash_version' => 'g5a7ea0e',
+  'full_hash' => 'v3.6.0-71-g5a7ea0e',
 );
\ No newline at end of file

From e587b2dcee246bc1464d87368c9fcbf49d2b2389 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 1 Dec 2016 03:00:02 -0800
Subject: [PATCH 05/14] Automatically updated version hash

---
 config/version.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/version.php b/config/version.php
index 745af1f0ee..2256c9a0da 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,7 +1,7 @@
 <?php
 return array (
   'app_version' => 'v3.6.0',
-  'build_version' => '71',
-  'hash_version' => 'g5a7ea0e',
-  'full_hash' => 'v3.6.0-71-g5a7ea0e',
+  'build_version' => '72',
+  'hash_version' => 'gc3b4342',
+  'full_hash' => 'v3.6.0-72-gc3b4342',
 );
\ No newline at end of file

From a7a9f027fbd038d3086355b19933275a9f6beee7 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 1 Dec 2016 03:00:18 -0800
Subject: [PATCH 06/14] Automatically updated version hash

---
 config/version.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/version.php b/config/version.php
index 2256c9a0da..13c9a1a719 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,7 +1,7 @@
 <?php
 return array (
   'app_version' => 'v3.6.0',
-  'build_version' => '72',
-  'hash_version' => 'gc3b4342',
-  'full_hash' => 'v3.6.0-72-gc3b4342',
+  'build_version' => '73',
+  'hash_version' => 'ge587b2d',
+  'full_hash' => 'v3.6.0-73-ge587b2d',
 );
\ No newline at end of file

From a2ffe77d5553394b78f4f56c7cea277e9ad7109c Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 1 Dec 2016 03:06:46 -0800
Subject: [PATCH 07/14] Automatically updated version hash

---
 config/version.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/version.php b/config/version.php
index 13c9a1a719..acad5d4247 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,7 +1,7 @@
 <?php
 return array (
   'app_version' => 'v3.6.0',
-  'build_version' => '73',
-  'hash_version' => 'ge587b2d',
-  'full_hash' => 'v3.6.0-73-ge587b2d',
+  'build_version' => '74',
+  'hash_version' => 'ga7a9f02',
+  'full_hash' => 'v3.6.0-74-ga7a9f02',
 );
\ No newline at end of file

From e42da293ee9d6bedd930997427665e2e01b0cb59 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 1 Dec 2016 03:07:21 -0800
Subject: [PATCH 08/14] Updated version for pre-release

---
 config/version.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/config/version.php b/config/version.php
index acad5d4247..80d46e0230 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,7 +1,7 @@
 <?php
 return array (
-  'app_version' => 'v3.6.0',
-  'build_version' => '74',
-  'hash_version' => 'ga7a9f02',
-  'full_hash' => 'v3.6.0-74-ga7a9f02',
-);
\ No newline at end of file
+  'app_version' => 'v3.6.1-pre',
+  'build_version' => '73',
+  'hash_version' => 'ge587b2d',
+  'full_hash' => 'v3.6.1-pre-73-ge587b2d',
+);

From 47c77fe042a66a6986e13e3fb621a1338bd1c590 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 1 Dec 2016 03:07:47 -0800
Subject: [PATCH 09/14] Halp! Stuck in pre-commit loop hell. :(

---
 config/version.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/config/version.php b/config/version.php
index 80d46e0230..fa0209a792 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,7 +1,7 @@
 <?php
 return array (
-  'app_version' => 'v3.6.1-pre',
-  'build_version' => '73',
-  'hash_version' => 'ge587b2d',
-  'full_hash' => 'v3.6.1-pre-73-ge587b2d',
-);
+  'app_version' => 'v3.6.0',
+  'build_version' => '75',
+  'hash_version' => 'ga2ffe77',
+  'full_hash' => 'v3.6.0-75-ga2ffe77',
+);
\ No newline at end of file

From 99e79a02d68f7bfa50261e403d3dd9c1c959aed8 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 1 Dec 2016 03:08:14 -0800
Subject: [PATCH 10/14] Revert "Halp! Stuck in pre-commit loop hell. :("

This reverts commit 47c77fe042a66a6986e13e3fb621a1338bd1c590.
---
 config/version.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/config/version.php b/config/version.php
index fa0209a792..80d46e0230 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,7 +1,7 @@
 <?php
 return array (
-  'app_version' => 'v3.6.0',
-  'build_version' => '75',
-  'hash_version' => 'ga2ffe77',
-  'full_hash' => 'v3.6.0-75-ga2ffe77',
-);
\ No newline at end of file
+  'app_version' => 'v3.6.1-pre',
+  'build_version' => '73',
+  'hash_version' => 'ge587b2d',
+  'full_hash' => 'v3.6.1-pre-73-ge587b2d',
+);

From 93d9a6e4bb667bf90c2e987c7d4d6bc9b3f46b03 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 1 Dec 2016 05:52:50 -0800
Subject: [PATCH 11/14] Ignore npm log

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 5a4c1d6a31..847c58e84e 100755
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,4 @@ storage/private_uploads/users/*
 tests/_data/scenarios
 tests/_output/*
 tests/_support/_generated/*
+/npm-debug.log

From 8a81b2990115a41e1dd1634f41c6bcf6cc801d83 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 1 Dec 2016 05:53:20 -0800
Subject: [PATCH 12/14] Fixed missing closing angle bracket

---
 resources/views/users/view.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php
index b7ec6697ca..3b9e379fd9 100755
--- a/resources/views/users/view.blade.php
+++ b/resources/views/users/view.blade.php
@@ -405,7 +405,7 @@
                         @if (($log->item) && ($log->itemType()=="asset"))
                             <a href="{{ route('view/hardware', $log->item_id) }}">{{ $log->item->asset_tag }} - {{ $log->item->showAssetName() }}</a>
                         @elseif ($log->item)
-                            <a href="{{ route('view/'. $log->itemType(), $log->item_id) }}">{{ $log->item->name }}</a
+                            <a href="{{ route('view/'. $log->itemType(), $log->item_id) }}">{{ $log->item->name }}</a>
                         @else
                             {{ trans('general.bad_data') }}
                         @endif

From 2ab0594530533cfb219a26f9046246d8a436259e Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 1 Dec 2016 05:54:14 -0800
Subject: [PATCH 13/14] Prevent errors if company support conflict prevents
 viewing the item

---
 resources/views/account/view-assets.blade.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/account/view-assets.blade.php b/resources/views/account/view-assets.blade.php
index b51fe62164..1885095159 100755
--- a/resources/views/account/view-assets.blade.php
+++ b/resources/views/account/view-assets.blade.php
@@ -264,14 +264,14 @@ View Assets for  {{ $user->fullName() }}
                         {{ strtolower(trans('general.'.str_replace(' ','_',$log->action_type))) }}
                     </td>
                     <td>
-                        @if ($log->itemType()=="asset")
+                        @if (($log->item) && ($log->itemType()=="asset"))
                             @if ($log->item->deleted_at=='')
                                 {{ $log->item->showAssetName() }}
                             @else
                                 <del>{{ $log->item->showAssetName() }}</del> (deleted)
                             @endif
 
-                        @elseif (!is_null($log->itemType()))
+                        @elseif ($log->item)
                              @if ($log->item->deleted_at=='')
                                 {{ $log->item->name }}
                              @else

From 659d9c10ca88c38f44124c262bbd9b9aa5f623da Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 1 Dec 2016 05:54:21 -0800
Subject: [PATCH 14/14] Bumped hash

---
 config/version.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/config/version.php b/config/version.php
index 80d46e0230..5d25e65ead 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,7 +1,7 @@
 <?php
 return array (
-  'app_version' => 'v3.6.1-pre',
-  'build_version' => '73',
-  'hash_version' => 'ge587b2d',
-  'full_hash' => 'v3.6.1-pre-73-ge587b2d',
-);
+  'app_version' => 'v3.6.1',
+  'build_version' => 'pre',
+  'hash_version' => '2',
+  'full_hash' => 'v3.6.1-pre-2-g8a81b29',
+);
\ No newline at end of file