From e126a75f7ad853ba9411d5fd2e48eeb08252b9b0 Mon Sep 17 00:00:00 2001
From: slong753 <spencer@spencerlong.com>
Date: Wed, 29 Mar 2023 21:37:26 -0500
Subject: [PATCH 1/5] pretty sure this was it

---
 app/Models/Asset.php | 21 ++++++++-------------
 app/Models/User.php  | 15 +++++----------
 2 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/app/Models/Asset.php b/app/Models/Asset.php
index e992298d8..bb9916d86 100644
--- a/app/Models/Asset.php
+++ b/app/Models/Asset.php
@@ -70,19 +70,6 @@ class Asset extends Depreciable
     */
     protected $injectUniqueIdentifier = true;
 
-    // We set these as protected dates so that they will be easily accessible via Carbon
-    protected $dates = [
-        'created_at',
-        'updated_at',
-        'deleted_at',
-        'purchase_date',
-        'last_checkout',
-        'expected_checkin',
-        'last_audit_date',
-        'next_audit_date'
-    ];
-
-
     protected $casts = [
         'purchase_date' => 'date',
         'last_checkout' => 'datetime',
@@ -96,6 +83,14 @@ class Asset extends Depreciable
         'rtd_company_id' => 'integer',
         'supplier_id'    => 'integer',
         'byod'           => 'boolean',
+        'created_at'     => 'datetime',
+        'updated_at'   => 'datetime',
+        'deleted_at'  => 'datetime',
+        'purchase_date' => 'datetime',
+        'last_checkout' => 'datetime',
+        'expected_checkin'  => 'datetime',
+        'last_audit_date'  => 'datetime',
+        'next_audit_date' => 'datetime',
     ];
 
     protected $rules = [
diff --git a/app/Models/User.php b/app/Models/User.php
index bf40982db..c716da074 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -73,18 +73,13 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
         'location_id'  => 'integer',
         'company_id'   => 'integer',
         'vip'      => 'boolean',
+        'created_at'   => 'datetime',
+        'updated_at'   => 'datetime',
+        'deleted_at'   => 'datetime',
+        'start_date'   => 'datetime:Y-m-d',
+        'end_date'     => 'datetime:Y-m-d',
     ];
 
-
-    protected $dates = [
-        'created_at',
-        'updated_at',
-        'deleted_at',
-        'start_date' => 'date_format:Y-m-d',
-        'end_date' => 'date_format:Y-m-d',
-    ];
-
-
     /**
      * Model validation rules
      *

From 8c1c0e81b61289fa942cac20bb0c6704e3c710e1 Mon Sep 17 00:00:00 2001
From: slong753 <spencer@spencerlong.com>
Date: Thu, 30 Mar 2023 13:31:58 -0500
Subject: [PATCH 2/5] rm deplicates

---
 app/Models/Asset.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/app/Models/Asset.php b/app/Models/Asset.php
index bb9916d86..a5211e800 100644
--- a/app/Models/Asset.php
+++ b/app/Models/Asset.php
@@ -86,11 +86,6 @@ class Asset extends Depreciable
         'created_at'     => 'datetime',
         'updated_at'   => 'datetime',
         'deleted_at'  => 'datetime',
-        'purchase_date' => 'datetime',
-        'last_checkout' => 'datetime',
-        'expected_checkin'  => 'datetime',
-        'last_audit_date'  => 'datetime',
-        'next_audit_date' => 'datetime',
     ];
 
     protected $rules = [

From 44e05eecbfccee9b10499eabc950c5fc1ce18c8b Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Thu, 30 Mar 2023 16:42:59 -0700
Subject: [PATCH 3/5] Publish test stubs

---
 stubs/test.stub      | 13 +++++++++++++
 stubs/test.unit.stub | 13 +++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 stubs/test.stub
 create mode 100644 stubs/test.unit.stub

diff --git a/stubs/test.stub b/stubs/test.stub
new file mode 100644
index 000000000..06b35d3e1
--- /dev/null
+++ b/stubs/test.stub
@@ -0,0 +1,13 @@
+<?php
+
+namespace {{ namespace }};
+
+use Tests\TestCase;
+
+class {{ class }} extends TestCase
+{
+    public function testExample()
+    {
+        //
+    }
+}
diff --git a/stubs/test.unit.stub b/stubs/test.unit.stub
new file mode 100644
index 000000000..06b35d3e1
--- /dev/null
+++ b/stubs/test.unit.stub
@@ -0,0 +1,13 @@
+<?php
+
+namespace {{ namespace }};
+
+use Tests\TestCase;
+
+class {{ class }} extends TestCase
+{
+    public function testExample()
+    {
+        //
+    }
+}

From 55857c910ac40d88b508303c9e082378c1f70183 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 4 Apr 2023 00:33:05 -0700
Subject: [PATCH 4/5] Color picker UI fix

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/statuslabels/edit.blade.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/resources/views/statuslabels/edit.blade.php b/resources/views/statuslabels/edit.blade.php
index 37f15a98b..31c999491 100755
--- a/resources/views/statuslabels/edit.blade.php
+++ b/resources/views/statuslabels/edit.blade.php
@@ -66,8 +66,13 @@
 @section('moar_scripts')
     <!-- bootstrap color picker -->
     <script nonce="{{ csrf_token() }}">
-        //color picker with addon
-        $(".color").colorpicker();
+        $(function() {
+            $('.color').colorpicker({
+                color: '#AA3399',
+                format: 'hex'
+            });
+        });
+
     </script>
 
 @stop

From 32351d0e480dfa6dde2068fa5851d6e0d7d78470 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Tue, 4 Apr 2023 15:35:31 -0700
Subject: [PATCH 5/5] Allow downloading nested CrowdIn translations

---
 crowdin.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/crowdin.yml b/crowdin.yml
index 4eccb2adb..7abe441e4 100644
--- a/crowdin.yml
+++ b/crowdin.yml
@@ -3,6 +3,7 @@
 "files": [
   {
     "source" : "/resources/lang/en/**/*.php",
-    "translation" : "/resources/lang/%locale%/%original_file_name%"
+    # https://developer.crowdin.com/configuration-file/#placeholders
+    "translation" : "/resources/lang/%locale%/**/%original_file_name%"
   }
 ]