Moved faker out of dev so we can use the seeders

Signed-off-by: snipe <snipe@snipe.net>
Merge pull request #16982 from grokability/fixes#16958-expiring-assets-unarchived
2025-05-23 17:17:19 +01:00 · 2025-05-23 15:51:27 +02:00 · 2025-05-23 14:48:54 +01:00 · 2025-05-23 14:30:56 +01:00 · 2025-05-23 13:12:30 +01:00 · 2025-05-23 14:05:28 +02:00
1679 changed files with 28980 additions and 7817 deletions
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -2590,10 +2590,10 @@
      ]
    },
    {
-      "login": "QveenSi",
+      "login": "qveensi",
      "name": "Yevhenii Huzii",
      "avatar_url": "https://avatars.githubusercontent.com/u/19945501?v=4",
-      "profile": "https://github.com/QveenSi",
+      "profile": "https://github.com/qveensi",
      "contributions": [
        "code"
      ]
@@ -2607,15 +2607,6 @@
        "code"
      ]
    },
-    {
-      "login": "QveenSi",
-      "name": "Yevhenii Huzii",
-      "avatar_url": "https://avatars.githubusercontent.com/u/19945501?v=4",
-      "profile": "https://github.com/QveenSi",
-      "contributions": [
-        "code"
-      ]
-    },
    {
      "login": "chrisweirich",
      "name": "Christian Weirich",
@@ -3316,6 +3307,861 @@
      "contributions": [
        "code"
      ]
+    },
+    {
+      "login": "fvollmer",
+      "name": "fvollmer",
+      "avatar_url": "https://avatars.githubusercontent.com/u/16699443?v=4",
+      "profile": "https://github.com/fvollmer",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "36864",
+      "name": "36864",
+      "avatar_url": "https://avatars.githubusercontent.com/u/109086466?v=4",
+      "profile": "https://github.com/36864",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "CloCkWeRX",
+      "name": "Daniel O'Connor",
+      "avatar_url": "https://avatars.githubusercontent.com/u/365751?v=4",
+      "profile": "http://clockwerx.blogspot.com/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "BeatSpark",
+      "name": "BeatSpark",
+      "avatar_url": "https://avatars.githubusercontent.com/u/102852568?v=4",
+      "profile": "https://github.com/BeatSpark",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "mrdahbi",
+      "name": "mrdahbi",
+      "avatar_url": "https://avatars.githubusercontent.com/u/59203607?v=4",
+      "profile": "https://github.com/mrdahbi",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "chfsx",
+      "name": "Fabian Schmid",
+      "avatar_url": "https://avatars.githubusercontent.com/u/6661332?v=4",
+      "profile": "http://sr.solutions",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "realchrisolin",
+      "name": "Chris Olin",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1288116?v=4",
+      "profile": "https://www.chrisolin.com",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "mnemonicly",
+      "name": "Dan",
+      "avatar_url": "https://avatars.githubusercontent.com/u/3803132?v=4",
+      "profile": "https://github.com/mnemonicly",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "NebelKreis",
+      "name": "Nebel",
+      "avatar_url": "https://avatars.githubusercontent.com/u/43917728?v=4",
+      "profile": "https://github.com/NebelKreis",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "test1337ahp",
+      "name": "test1337ahp",
+      "avatar_url": "https://avatars.githubusercontent.com/u/132433803?v=4",
+      "profile": "https://github.com/test1337ahp",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "JonathonReinhart",
+      "name": "Jonathon Reinhart",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1916566?v=4",
+      "profile": "https://github.com/JonathonReinhart",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "aranar-pro",
+      "name": "aranar-pro",
+      "avatar_url": "https://avatars.githubusercontent.com/u/484742?v=4",
+      "profile": "https://github.com/aranar-pro",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "phil-flip",
+      "name": "Phil",
+      "avatar_url": "https://avatars.githubusercontent.com/u/27019397?v=4",
+      "profile": "https://github.com/phil-flip",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "fe80",
+      "name": "Steffy Fort",
+      "avatar_url": "https://avatars.githubusercontent.com/u/6473460?v=4",
+      "profile": "https://fe80.fr/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "sorvani",
+      "name": "Jared Busch",
+      "avatar_url": "https://avatars.githubusercontent.com/u/3302372?v=4",
+      "profile": "https://github.com/sorvani",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "seanborg-codethink",
+      "name": "seanborg-codethink",
+      "avatar_url": "https://avatars.githubusercontent.com/u/111956991?v=4",
+      "profile": "https://github.com/seanborg-codethink",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "dkaatz",
+      "name": "dkaatz",
+      "avatar_url": "https://avatars.githubusercontent.com/u/160669961?v=4",
+      "profile": "https://github.com/dkaatz",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "DanielRuf",
+      "name": "Daniel Ruf",
+      "avatar_url": "https://avatars.githubusercontent.com/u/827205?v=4",
+      "profile": "https://threema.id/74SF7MW6?text=",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "ahpaleus",
+      "name": "ahpaleus",
+      "avatar_url": "https://avatars.githubusercontent.com/u/38883201?v=4",
+      "profile": "https://github.com/ahpaleus",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "mink-adao-duy",
+      "name": "Anh DAO-DUY",
+      "avatar_url": "https://avatars.githubusercontent.com/u/22906055?v=4",
+      "profile": "https://github.com/mink-adao-duy",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Serdnad",
+      "name": "Andres Gutierrez",
+      "avatar_url": "https://avatars.githubusercontent.com/u/4723453?v=4",
+      "profile": "https://github.com/Serdnad",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "wewhite",
+      "name": "Warren White",
+      "avatar_url": "https://avatars.githubusercontent.com/u/111083379?v=4",
+      "profile": "https://github.com/wewhite",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "robintemme",
+      "name": "Robin Temme",
+      "avatar_url": "https://avatars.githubusercontent.com/u/2809241?v=4",
+      "profile": "https://robintemme.de/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "herroworrd",
+      "name": "herroworrd",
+      "avatar_url": "https://avatars.githubusercontent.com/u/47008367?v=4",
+      "profile": "https://github.com/herroworrd",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "vicleos",
+      "name": "vicleos",
+      "avatar_url": "https://avatars.githubusercontent.com/u/28558609?v=4",
+      "profile": "https://mubiu.com/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "thinkl33t",
+      "name": "Bob Clough",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1016780?v=4",
+      "profile": "http://thinkl33t.co.uk/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "brandon-bailey",
+      "name": "Brandon Daniel Bailey",
+      "avatar_url": "https://avatars.githubusercontent.com/u/10648463?v=4",
+      "profile": "https://github.com/brandon-bailey",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "marcquark",
+      "name": "Marc Bartelt",
+      "avatar_url": "https://avatars.githubusercontent.com/u/23556080?v=4",
+      "profile": "https://github.com/marcquark",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "manu-crealytics",
+      "name": "manu-crealytics",
+      "avatar_url": "https://avatars.githubusercontent.com/u/18286893?v=4",
+      "profile": "https://github.com/manu-crealytics",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Galaxy102",
+      "name": "Konstantin Köhring",
+      "avatar_url": "https://avatars.githubusercontent.com/u/18245993?v=4",
+      "profile": "https://www.galaxy102.de/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "deloz",
+      "name": "Deloz",
+      "avatar_url": "https://avatars.githubusercontent.com/u/685167?v=4",
+      "profile": "https://deloz.net/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "mbrrg",
+      "name": "Martin Berg",
+      "avatar_url": "https://avatars.githubusercontent.com/u/2682426?v=4",
+      "profile": "https://github.com/mbrrg",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Nothing4You",
+      "name": "Richard Schwab",
+      "avatar_url": "https://avatars.githubusercontent.com/u/3694534?v=4",
+      "profile": "https://github.com/Nothing4You",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "rickheil",
+      "name": "Rick Heil",
+      "avatar_url": "https://avatars.githubusercontent.com/u/8959676?v=4",
+      "profile": "https://rickheil.com/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "rosscdh",
+      "name": "Ross Crawford-d'Heureuse",
+      "avatar_url": "https://avatars.githubusercontent.com/u/397106?v=4",
+      "profile": "https://github.com/rosscdh",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "McG800",
+      "name": "Ryan McGuire",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1621107?v=4",
+      "profile": "https://github.com/McG800",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "SBrown2021",
+      "name": "SBrown2021",
+      "avatar_url": "https://avatars.githubusercontent.com/u/77835667?v=4",
+      "profile": "https://github.com/SBrown2021",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "serkanerip",
+      "name": "Serkan",
+      "avatar_url": "https://avatars.githubusercontent.com/u/8780913?v=4",
+      "profile": "https://github.com/serkanerip",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Shankschn",
+      "name": "Shanks",
+      "avatar_url": "https://avatars.githubusercontent.com/u/63188620?v=4",
+      "profile": "https://www.yudelei.com/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "cendai-mis",
+      "name": "cendai-mis",
+      "avatar_url": "https://avatars.githubusercontent.com/u/198525698?v=4",
+      "profile": "https://github.com/cendai-mis",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "smcpeck",
+      "name": "Shaun McPeck",
+      "avatar_url": "https://avatars.githubusercontent.com/u/8724583?v=4",
+      "profile": "https://smcpeck.github.io/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "snazy2000",
+      "name": "Stephen",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1378836?v=4",
+      "profile": "https://github.com/snazy2000",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Nevets82",
+      "name": "Steven",
+      "avatar_url": "https://avatars.githubusercontent.com/u/4462739?v=4",
+      "profile": "http://nevets82.github.io/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Mateus-Romera",
+      "name": "Mateus Villar",
+      "avatar_url": "https://avatars.githubusercontent.com/u/29017267?v=4",
+      "profile": "https://mateusvillar.com/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "mzack5020",
+      "name": "Matthew Zackschewski",
+      "avatar_url": "https://avatars.githubusercontent.com/u/12749393?v=4",
+      "profile": "https://github.com/mzack5020",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "firefrei",
+      "name": "Matthias Frei",
+      "avatar_url": "https://avatars.githubusercontent.com/u/12660103?v=4",
+      "profile": "https://www.frei.media/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "nticaric",
+      "name": "Nenad Ticaric",
+      "avatar_url": "https://avatars.githubusercontent.com/u/824840?v=4",
+      "profile": "https://github.com/nticaric",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Scorcher",
+      "name": "Nikolay Didenko",
+      "avatar_url": "https://avatars.githubusercontent.com/u/706439?v=4",
+      "profile": "https://github.com/Scorcher",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "nunomaduro",
+      "name": "Nuno Maduro",
+      "avatar_url": "https://avatars.githubusercontent.com/u/5457236?v=4",
+      "profile": "https://nunomaduro.com/sponsorships",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "owalerys",
+      "name": "Oliver Walerys",
+      "avatar_url": "https://avatars.githubusercontent.com/u/8883074?v=4",
+      "profile": "https://tektikhq.com/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "rcmcdonald91",
+      "name": "R. Christian McDonald",
+      "avatar_url": "https://avatars.githubusercontent.com/u/3102039?v=4",
+      "profile": "https://keybase.io/rcmcdonald91",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "nixn",
+      "name": "nix",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1525581?v=4",
+      "profile": "https://nnix.net/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "octobunny",
+      "name": "octobunny",
+      "avatar_url": "https://avatars.githubusercontent.com/u/55462380?v=4",
+      "profile": "https://github.com/octobunny",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "sreyemnayr",
+      "name": "Ryan",
+      "avatar_url": "https://avatars.githubusercontent.com/u/8558670?v=4",
+      "profile": "https://github.com/sreyemnayr",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "p3nj",
+      "name": "p3nj",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1501022?v=4",
+      "profile": "https://benji.ltd/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "timwsuqld",
+      "name": "Tim White",
+      "avatar_url": "https://avatars.githubusercontent.com/u/6201617?v=4",
+      "profile": "https://github.com/timwsuqld",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "yannikp",
+      "name": "yannikp",
+      "avatar_url": "https://avatars.githubusercontent.com/u/22473767?v=4",
+      "profile": "https://github.com/yannikp",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "viclou",
+      "name": "victoria",
+      "avatar_url": "https://avatars.githubusercontent.com/u/20525448?v=4",
+      "profile": "https://github.com/viclou",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "valentyntu",
+      "name": "Valentyn Tulub",
+      "avatar_url": "https://avatars.githubusercontent.com/u/40685314?v=4",
+      "profile": "https://github.com/valentyntu",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Wouter0100",
+      "name": "Wouter van Os",
+      "avatar_url": "https://avatars.githubusercontent.com/u/864520?v=4",
+      "profile": "http://wouter0100.nl/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "xWyatt",
+      "name": "Wyatt Teeter",
+      "avatar_url": "https://avatars.githubusercontent.com/u/3946540?v=4",
+      "profile": "https://www.linkedin.com/in/wyatt-teeter",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "terwey",
+      "name": "Yorick Terweijden",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1596124?v=4",
+      "profile": "https://github.com/terwey",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "bmkalle",
+      "name": "bmkalle",
+      "avatar_url": "https://avatars.githubusercontent.com/u/69298836?v=4",
+      "profile": "https://github.com/bmkalle",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "bricelabelle",
+      "name": "bricelabelle",
+      "avatar_url": "https://avatars.githubusercontent.com/u/28403467?v=4",
+      "profile": "https://github.com/bricelabelle",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "corydlamb",
+      "name": "corydlamb",
+      "avatar_url": "https://avatars.githubusercontent.com/u/97770090?v=4",
+      "profile": "https://github.com/corydlamb",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "splashx",
+      "name": "Diogenes S. Jesus",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1154133?v=4",
+      "profile": "http://twitter.com/splash",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "dkmansion",
+      "name": "D M",
+      "avatar_url": "https://avatars.githubusercontent.com/u/5826629?v=4",
+      "profile": "https://github.com/dkmansion",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Jarli01",
+      "name": "Dustin B",
+      "avatar_url": "https://avatars.githubusercontent.com/u/14837699?v=4",
+      "profile": "https://github.com/Jarli01",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "fabiang",
+      "name": "Fabian Grutschus",
+      "avatar_url": "https://avatars.githubusercontent.com/u/348344?v=4",
+      "profile": "https://github.com/fabiang",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "MelonSmasher",
+      "name": "MelonSmasher",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1491053?v=4",
+      "profile": "https://github.com/MelonSmasher",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "AlexanderWPapyrus",
+      "name": "AlexanderWPapyrus",
+      "avatar_url": "https://avatars.githubusercontent.com/u/80526133?v=4",
+      "profile": "https://github.com/AlexanderWPapyrus",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "disc",
+      "name": "Alexandr Hacicheant",
+      "avatar_url": "https://avatars.githubusercontent.com/u/306231?v=4",
+      "profile": "https://github.com/disc",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "hex128",
+      "name": "Hex",
+      "avatar_url": "https://avatars.githubusercontent.com/u/3032891?v=4",
+      "profile": "https://hex128.io/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "arukompas",
+      "name": "Arunas Skirius",
+      "avatar_url": "https://avatars.githubusercontent.com/u/8697942?v=4",
+      "profile": "https://github.com/arukompas",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "benperiton",
+      "name": "Ben Periton",
+      "avatar_url": "https://avatars.githubusercontent.com/u/104396?v=4",
+      "profile": "https://github.com/benperiton",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "byronwolfman",
+      "name": "Byron Wolfman",
+      "avatar_url": "https://avatars.githubusercontent.com/u/11906832?v=4",
+      "profile": "https://wolfman.dev/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "CalvinSchwartz",
+      "name": "Calvin",
+      "avatar_url": "https://avatars.githubusercontent.com/u/56485508?v=4",
+      "profile": "https://github.com/CalvinSchwartz",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "juanfont",
+      "name": "Juan Font",
+      "avatar_url": "https://avatars.githubusercontent.com/u/181059?v=4",
+      "profile": "https://github.com/juanfont",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "juhotaipale",
+      "name": "Juho Taipale",
+      "avatar_url": "https://avatars.githubusercontent.com/u/13137708?v=4",
+      "profile": "https://github.com/juhotaipale",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "KorvinSzanto",
+      "name": "Korvin Szanto",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1007419?v=4",
+      "profile": "https://github.com/KorvinSzanto",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "sniff122",
+      "name": "Lewis Foster",
+      "avatar_url": "https://avatars.githubusercontent.com/u/8513053?v=4",
+      "profile": "https://lewisfoster.foo/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "loganswartz",
+      "name": "Logan Swartzendruber",
+      "avatar_url": "https://avatars.githubusercontent.com/u/33877541?v=4",
+      "profile": "https://github.com/loganswartz",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "lopezio",
+      "name": "Lorenzo P.",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1156208?v=4",
+      "profile": "https://github.com/lopezio",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "m4us1ne",
+      "name": "Lukas Jung",
+      "avatar_url": "https://avatars.githubusercontent.com/u/33946590?v=4",
+      "profile": "https://github.com/m4us1ne",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "LeafedFox",
+      "name": "Ellie",
+      "avatar_url": "https://avatars.githubusercontent.com/u/10965027?v=4",
+      "profile": "https://leafedfox.xyz/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "gastamper",
+      "name": "GA Stamper",
+      "avatar_url": "https://avatars.githubusercontent.com/u/20960555?v=4",
+      "profile": "https://github.com/gastamper",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "gl-pup",
+      "name": "Guillaume Lefranc",
+      "avatar_url": "https://avatars.githubusercontent.com/u/206553556?v=4",
+      "profile": "https://github.com/gl-pup",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "dasjoe",
+      "name": "Hajo Möller",
+      "avatar_url": "https://avatars.githubusercontent.com/u/733892?v=4",
+      "profile": "https://github.com/dasjoe",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "pottom",
+      "name": "Istvan Basa",
+      "avatar_url": "https://avatars.githubusercontent.com/u/3420063?v=4",
+      "profile": "https://github.com/pottom",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "jjasghar",
+      "name": "JJ Asghar",
+      "avatar_url": "https://avatars.githubusercontent.com/u/810824?v=4",
+      "profile": "https://jjasghar.github.io/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "JemCdo",
+      "name": "James E. Msenga",
+      "avatar_url": "https://avatars.githubusercontent.com/u/40404495?v=4",
+      "profile": "https://github.com/JemCdo",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "jfwiebe",
+      "name": "Jan Felix Wiebe",
+      "avatar_url": "https://avatars.githubusercontent.com/u/6865786?v=4",
+      "profile": "https://github.com/jfwiebe",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "drexljo",
+      "name": "Jo Drexl",
+      "avatar_url": "https://avatars.githubusercontent.com/u/43412008?v=4",
+      "profile": "https://www.nfon.com/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "austinsasko",
+      "name": "Austin Sasko",
+      "avatar_url": "https://avatars.githubusercontent.com/u/4807843?v=4",
+      "profile": "https://github.com/austinsasko",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "JassonCordones",
+      "name": "Jasson",
+      "avatar_url": "https://avatars.githubusercontent.com/u/4875039?v=4",
+      "profile": "http://jassoncordones.github.io",
+      "contributions": [
+        "code"
+      ]
    }
  ]
 }
--- a/.env.dev.docker
+++ b/.env.dev.docker
@@ -79,6 +79,13 @@ MAIL_BACKUP_NOTIFICATION_DRIVER=null
 MAIL_BACKUP_NOTIFICATION_ADDRESS=null
 BACKUP_ENV=true

+# --------------------------------------------
+# OPTIONAL: CHANGE PHP UPLOAD LIMITS (UNCOMMENT WHEN NEEDING TO BE CHANGED)
+# --------------------------------------------
+#PHP_UPLOAD_LIMIT=10
+#PHP_POST_MAX_SIZE=10
+#PHP_UPLOAD_MAX_FILESIZE=10
+#PHP_MEMORY_LIMIT=10

 # --------------------------------------------
 # OPTIONAL: SESSION SETTINGS
--- a/.env.docker
+++ b/.env.docker
@@ -84,6 +84,15 @@ MAIL_BACKUP_NOTIFICATION_DRIVER=null
 MAIL_BACKUP_NOTIFICATION_ADDRESS=null
 BACKUP_ENV=true

+# --------------------------------------------
+# OPTIONAL: CHANGE PHP UPLOAD LIMITS (UNCOMMENT WHEN NEEDING TO BE CHANGED)
+# --------------------------------------------
+#PHP_UPLOAD_LIMIT=10
+#PHP_POST_MAX_SIZE=10
+#PHP_UPLOAD_MAX_FILESIZE=10
+#PHP_MEMORY_LIMIT=10
+
+
 # --------------------------------------------
 # OPTIONAL: SESSION SETTINGS
 # --------------------------------------------
--- a/.env.example
+++ b/.env.example
@@ -179,6 +179,7 @@ PASSWORD_RESET_MAX_ATTEMPTS_PER_MIN=50
 # OPTIONAL: MISC
 # --------------------------------------------
 LOG_CHANNEL=single
+LOG_DEPRECATIONS=false
 LOG_MAX_DAYS=10
 APP_LOCKED=false
 APP_CIPHER=AES-256-CBC
--- a/.github/workflows/codacy-analysis.yml
+++ b/.github/workflows/codacy-analysis.yml
@@ -10,10 +10,10 @@ name: Codacy Security Scan

 on:
  push:
-    branches: [ master ]
+    branches: [ develop ]
  pull_request:
    # The branches below must be a subset of the branches above
-    branches: [ master ]
+    branches: [ develop ]
  schedule:
    - cron: '36 23 * * 3'

@@ -22,11 +22,11 @@ permissions:

 jobs:
  codacy-security-scan:
-    # Ensure schedule job never runs on forked repos. It's only executed for 'snipe/snipe-it'
+    # Ensure schedule job never runs on forked repos. It's only executed for 'grokability/snipe-it'
    permissions:
      contents: read  # for actions/checkout to fetch code
      security-events: write  # for github/codeql-action/upload-sarif to upload SARIF results
-    if: (github.repository == 'snipe/snipe-it') || ((github.repository != 'snipe/snipe-it') && (github.event_name != 'schedule'))
+    if: (github.repository == 'grokability/snipe-it') || ((github.repository != 'grokability/snipe-it') && (github.event_name != 'schedule'))
    name: Codacy Security Scan
    runs-on: ubuntu-latest
    steps:
--- a/.github/workflows/docker-alpine.yml
+++ b/.github/workflows/docker-alpine.yml
@@ -20,8 +20,8 @@ permissions:

 jobs:
  docker:
-    # Ensure this job never runs on forked repos. It's only executed for 'snipe/snipe-it'
-    if: github.repository == 'snipe/snipe-it'
+    # Ensure this job never runs on forked repos. It's only executed for 'grokability/snipe-it'
+    if: github.repository == 'grokability/snipe-it'
    runs-on: ubuntu-latest
    env:
      # Define tags to use for Docker images based on Git tags/branches (for docker/metadata-action)
@@ -32,7 +32,7 @@ jobs:
        type=raw,value=latest,enable=${{ endsWith(github.ref, github.event.repository.default_branch) }},suffix=-alpine
        type=ref,event=branch,enable=${{ !endsWith(github.ref, github.event.repository.default_branch) }},suffix=-alpine
        type=ref,event=tag,suffix=-alpine
-        type=semver,pattern=v{{major}}-latest-alpine 
+        type=semver,pattern=v{{major}}-latest-alpine
      # Define default tag "flavor" for docker/metadata-action per
      # https://github.com/docker/metadata-action#flavor-input
      # We turn off 'latest' tag by default.
--- a/.github/workflows/docker-ubuntu.yml
+++ b/.github/workflows/docker-ubuntu.yml
@@ -1,5 +1,5 @@
 # Snipe-IT Docker image build for hub.docker.com
-name: Docker images
+name: Docker images (Ubuntu)

 # Run this Build for all pushes to 'master' or develop branch, or tagged releases.
 # Also run for PRs to ensure PR doesn't break Docker build process
@@ -20,8 +20,8 @@ permissions:

 jobs:
  docker:
-    # Ensure this job never runs on forked repos. It's only executed for 'snipe/snipe-it'
-    if: github.repository == 'snipe/snipe-it'
+    # Ensure this job never runs on forked repos. It's only executed for 'grokability/snipe-it'
+    if: github.repository == 'grokability/snipe-it'
    runs-on: ubuntu-latest
    env:
      # Define tags to use for Docker images based on Git tags/branches (for docker/metadata-action)
@@ -32,7 +32,7 @@ jobs:
        type=raw,value=latest,enable=${{ endsWith(github.ref, github.event.repository.default_branch) }}
        type=ref,event=branch,enable=${{ !endsWith(github.ref, github.event.repository.default_branch) }}
        type=ref,event=tag
-        type=semver,pattern=v{{major}}-latest 
+        type=semver,pattern=v{{major}}-latest
      # Define default tag "flavor" for docker/metadata-action per
      # https://github.com/docker/metadata-action#flavor-input
      # We turn off 'latest' tag by default.
--- a/.pa11yci.json
+++ b/.pa11yci.json
@@ -0,0 +1,240 @@
+{
+    "standard": "WCAG2AA",
+    "level": "error",
+    "defaults": {
+      "useIncognitoBrowserContext": false,
+      "timeout": 500000,
+      "wait": 5000,
+      "ignore" : [
+        "WCAG2AA.Principle1.Guideline1_4.1_4_3.G145.Fail",
+        "WCAG2AA.Principle1.Guideline1_4.1_4_3.G18.Fail"
+      ],
+
+      "viewport": {
+        "width": 1280,
+        "height": 1024
+      }
+    },
+    "urls": [
+        {
+          "__NOTE"  : "this should always be FIRST (if browser context is preserved)",
+          "url": "https://snipe-it.test/login",
+          "actions": [
+            "navigate to https://snipe-it.test/login",
+            "screen capture tests/pa11y/login.png",
+             "set field input[name='username'] to admin",
+             "set field input[name='password'] to password",
+             "click element button[type=submit]",
+             "wait for url to be https://snipe-it.test/",
+             "screen capture tests/pa11y/dashboard.png"
+          ]
+        },
+        {
+          "url"     : "https://snipe-it.test/admin",
+          "actions" : [
+            "navigate to https://snipe-it.test/admin",
+            "screen capture tests/pa11y/admin-settings.png"
+          ]
+        },
+        {
+          "url"     : "https://snipe-it.test/admin/branding",
+          "actions" : [
+            "navigate to https://snipe-it.test/admin/branding",
+            "screen capture tests/pa11y/admin-branding.png"
+          ]
+        },
+        {
+          "url"     : "https://snipe-it.test/admin/general",
+          "actions" : [
+            "navigate to https://snipe-it.test/admin/general",
+            "screen capture tests/pa11y/admin-general.png"
+          ]
+        },
+        {
+          "url"     : "https://snipe-it.test/hardware/create",
+          "actions" : [
+            "navigate to https://snipe-it.test/hardware/create",
+            "screen capture tests/pa11y/asset-create.png"
+          ]
+        },
+       {
+        "url"     : "https://snipe-it.test/hardware",
+        "actions" : [
+          "navigate to https://snipe-it.test/hardware",
+          "screen capture tests/pa11y/asset-list.png"
+        ]
+      },
+      {
+        "url"     : "https://snipe-it.test/hardware/1",
+        "actions" : [
+          "navigate to https://snipe-it.test/hardware/1",
+          "screen capture tests/pa11y/asset-detail.png"
+        ]
+      },
+      {
+        "url"     : "https://snipe-it.test/account/view-assets",
+        "actions" : [
+          "navigate to https://snipe-it.test/account/view-assets",
+          "screen capture tests/pa11y/profile.png"
+        ]
+      },
+      {
+        "url"     : "https://snipe-it.test/licences",
+        "actions" : [
+          "navigate to https://snipe-it.test/licenses",
+          "screen capture tests/pa11y/license-list.png"
+        ]
+      },
+      {
+        "url"     : "https://snipe-it.test/licences/create",
+        "actions" : [
+          "navigate to https://snipe-it.test/licenses/create",
+          "screen capture tests/pa11y/license-create.png"
+        ]
+      },
+      {
+        "url"     : "https://snipe-it.test/licences/1",
+        "actions" : [
+          "navigate to https://snipe-it.test/licenses/1",
+          "screen capture tests/pa11y/license-view.png"
+        ]
+      },
+      {
+        "url"     : "https://snipe-it.test/consumables",
+        "actions" : [
+          "navigate to https://snipe-it.test/consumables",
+          "screen capture tests/pa11y/consumable-list.png"
+        ]
+      },
+      {
+        "url"     : "https://snipe-it.test/consumables/create",
+        "actions" : [
+          "navigate to https://snipe-it.test/consumables/create",
+          "screen capture tests/pa11y/consumable-create.png"
+        ]
+      },
+      {
+        "url"     : "https://snipe-it.test/consumables/1",
+        "actions" : [
+          "navigate to https://snipe-it.test/consumables/1",
+          "screen capture tests/pa11y/consumable-view.png"
+        ]
+      },
+      {
+        "url"     : "https://snipe-it.test/accessories",
+        "actions" : [
+          "navigate to https://snipe-it.test/accessories",
+          "screen capture tests/pa11y/accessory-list.png"
+        ]
+      },
+      {
+        "url"     : "https://snipe-it.test/accessories/create",
+        "actions" : [
+          "navigate to https://snipe-it.test/accessories/create",
+          "screen capture tests/pa11y/accessory-create.png"
+        ]
+      },
+      {
+        "url"     : "https://snipe-it.test/accessories/1",
+        "actions" : [
+          "navigate to https://snipe-it.test/accessories/1",
+          "screen capture tests/pa11y/accessory-view.png"
+        ]
+      },
+      {
+        "url"     : "https://snipe-it.test/locations",
+        "actions" : [
+          "navigate to https://snipe-it.test/locations",
+          "screen capture tests/pa11y/location-list.png"
+        ]
+      },
+      {
+        "url"     : "https://snipe-it.test/locations/create",
+        "actions" : [
+          "navigate to https://snipe-it.test/locations/create",
+          "screen capture tests/pa11y/location-create.png"
+        ]
+      },
+      {
+        "url"     : "https://snipe-it.test/locations/1",
+        "actions" : [
+          "navigate to https://snipe-it.test/locations/1",
+          "screen capture tests/pa11y/location-view.png"
+        ]
+      },
+
+      {
+        "url"     : "https://snipe-it.test/models",
+        "actions" : [
+          "navigate to https://snipe-it.test/models",
+          "screen capture tests/pa11y/model-list.png"
+        ]
+      },
+      {
+        "url"     : "https://snipe-it.test/models/create",
+        "actions" : [
+          "navigate to https://snipe-it.test/models/create",
+          "screen capture tests/pa11y/model-create.png"
+        ]
+      },
+      {
+        "url"     : "https://snipe-it.test/models/1",
+        "actions" : [
+          "navigate to https://snipe-it.test/models/1",
+          "screen capture tests/pa11y/model-view.png"
+        ]
+      },
+
+      {
+        "url"     : "https://snipe-it.test/companies",
+        "actions" : [
+          "navigate to https://snipe-it.test/companies",
+          "screen capture tests/pa11y/company-list.png"
+        ]
+      },
+      {
+        "url"     : "https://snipe-it.test/companies/create",
+        "actions" : [
+          "navigate to https://snipe-it.test/companies/create",
+          "screen capture tests/pa11y/company-create.png"
+        ]
+      },
+      {
+        "url"     : "https://snipe-it.test/companies/1",
+        "actions" : [
+          "navigate to https://snipe-it.test/companies/1",
+          "screen capture tests/pa11y/company-view.png"
+        ]
+      },
+
+      {
+        "url"     : "https://snipe-it.test/departments",
+        "actions" : [
+          "navigate to https://snipe-it.test/departments",
+          "screen capture tests/pa11y/department-list.png"
+        ]
+      },
+      {
+        "url"     : "https://snipe-it.test/departments/create",
+        "actions" : [
+          "navigate to https://snipe-it.test/departments/create",
+          "screen capture tests/pa11y/department-create.png"
+        ]
+      },
+      {
+        "url"     : "https://snipe-it.test/departments/1",
+        "actions" : [
+          "navigate to https://snipe-it.test/departments/1",
+          "screen capture tests/pa11y/department-view.png"
+        ]
+      },
+
+      {
+        "url"     : "https://snipe-it.test/invalid-url",
+        "actions" : [
+          "navigate to https://snipe-it.test/invalid-url",
+          "screen capture tests/pa11y/404.png"
+        ]
+      }
+    ]
+}
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -42,19 +42,32 @@ Thanks goes to all of these wonderful people ([emoji key](https://github.com/ken
 | [<img src="https://avatars.githubusercontent.com/u/1975640?v=4" width="110px;"/><br /><sub>Evan Taylor</sub>](https://github.com/Delta5)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Delta5 "Code") | [<img src="https://avatars.githubusercontent.com/u/8735148?v=4" width="110px;"/><br /><sub>Petri Asikainen</sub>](https://github.com/PetriAsi)<br />[💻](https://github.com/snipe/snipe-it/commits?author=PetriAsi "Code") | [<img src="https://avatars.githubusercontent.com/u/11424540?v=4" width="110px;"/><br /><sub>derdeagle</sub>](https://github.com/derdeagle)<br />[💻](https://github.com/snipe/snipe-it/commits?author=derdeagle "Code") | [<img src="https://avatars.githubusercontent.com/u/176950?v=4" width="110px;"/><br /><sub>Mike Frysinger</sub>](https://wh0rd.org/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=vapier "Code") | [<img src="https://avatars.githubusercontent.com/u/22044358?v=4" width="110px;"/><br /><sub>ALPHA</sub>](https://github.com/AL4AL)<br />[💻](https://github.com/snipe/snipe-it/commits?author=AL4AL "Code") | [<img src="https://avatars.githubusercontent.com/u/1042587?v=4" width="110px;"/><br /><sub>FliegenKLATSCH</sub>](https://www.ifern.de)<br />[💻](https://github.com/snipe/snipe-it/commits?author=FliegenKLATSCH "Code") | [<img src="https://avatars.githubusercontent.com/u/442138?v=4" width="110px;"/><br /><sub>Jeremy Price</sub>](https://github.com/jerm)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jerm "Code") |
 | [<img src="https://avatars.githubusercontent.com/u/84392209?v=4" width="110px;"/><br /><sub>Toreg87</sub>](https://github.com/Toreg87)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Toreg87 "Code") | [<img src="https://avatars.githubusercontent.com/u/67638596?v=4" width="110px;"/><br /><sub>Matthew Nickson</sub>](https://github.com/Computroniks)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Computroniks "Code") | [<img src="https://avatars.githubusercontent.com/u/1646397?v=4" width="110px;"/><br /><sub>Jethro Nederhof</sub>](https://jethron.id.au)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jethron "Code") | [<img src="https://avatars.githubusercontent.com/u/23289826?v=4" width="110px;"/><br /><sub>Oskar Stenberg</sub>](https://github.com/01ste02)<br />[💻](https://github.com/snipe/snipe-it/commits?author=01ste02 "Code") | [<img src="https://avatars.githubusercontent.com/u/82208283?v=4" width="110px;"/><br /><sub>Robert-Azelis</sub>](https://github.com/Robert-Azelis)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Robert-Azelis "Code") | [<img src="https://avatars.githubusercontent.com/u/60648387?v=4" width="110px;"/><br /><sub>Alexander William Smith</sub>](https://github.com/alwism)<br />[💻](https://github.com/snipe/snipe-it/commits?author=alwism "Code") | [<img src="https://avatars.githubusercontent.com/u/24418301?v=4" width="110px;"/><br /><sub>LEITWERK AG</sub>](https://www.leitwerk.de/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=leitwerk-ag "Code") |
 | [<img src="https://avatars.githubusercontent.com/u/1911435?v=4" width="110px;"/><br /><sub>Adam</sub>](http://www.aboutcher.co.uk)<br />[💻](https://github.com/snipe/snipe-it/commits?author=adamboutcher "Code") | [<img src="https://avatars.githubusercontent.com/u/16104273?v=4" width="110px;"/><br /><sub>Ian</sub>](https://snksrv.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sneak-it "Code") | [<img src="https://avatars.githubusercontent.com/u/4023909?v=4" width="110px;"/><br /><sub>Shao Yu-Lung (Allen)</sub>](http://blog.bestlong.idv.tw/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=bestlong "Code") | [<img src="https://avatars.githubusercontent.com/u/76475453?v=4" width="110px;"/><br /><sub>Haxatron</sub>](https://github.com/Haxatron)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Haxatron "Code") | [<img src="https://avatars.githubusercontent.com/u/88776392?v=4" width="110px;"/><br /><sub>PlaneNuts</sub>](https://github.com/PlaneNuts)<br />[💻](https://github.com/snipe/snipe-it/commits?author=PlaneNuts "Code") | [<img src="https://avatars.githubusercontent.com/u/3842948?v=4" width="110px;"/><br /><sub>Bradley Coudriet</sub>](http://bjcpgd.cias.rit.edu)<br />[💻](https://github.com/snipe/snipe-it/commits?author=exula "Code") | [<img src="https://avatars.githubusercontent.com/u/21966173?v=4" width="110px;"/><br /><sub>Dalton Durst</sub>](https://daltondur.st)<br />[💻](https://github.com/snipe/snipe-it/commits?author=UniversalSuperBox "Code") |
-| [<img src="https://avatars.githubusercontent.com/u/38761237?v=4" width="110px;"/><br /><sub>Alex Janes</sub>](https://adagiohealth.org)<br />[💻](https://github.com/snipe/snipe-it/commits?author=adagioajanes "Code") | [<img src="https://avatars.githubusercontent.com/u/32387849?v=4" width="110px;"/><br /><sub>Nuraeil</sub>](https://github.com/nuraeil)<br />[💻](https://github.com/snipe/snipe-it/commits?author=nuraeil "Code") | [<img src="https://avatars.githubusercontent.com/u/48162670?v=4" width="110px;"/><br /><sub>TenOfTens</sub>](https://github.com/TenOfTens)<br />[💻](https://github.com/snipe/snipe-it/commits?author=TenOfTens "Code") | [<img src="https://avatars.githubusercontent.com/u/9415391?v=4" width="110px;"/><br /><sub>waffle</sub>](https://ditisjens.be/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=insert-waffle "Code") | [<img src="https://avatars.githubusercontent.com/u/19945501?v=4" width="110px;"/><br /><sub>Yevhenii Huzii</sub>](https://github.com/QveenSi)<br />[💻](https://github.com/snipe/snipe-it/commits?author=QveenSi "Code") | [<img src="https://avatars.githubusercontent.com/u/3839381?v=4" width="110px;"/><br /><sub>Achmad Fienan Rahardianto</sub>](https://github.com/veenone)<br />[💻](https://github.com/snipe/snipe-it/commits?author=veenone "Code") | [<img src="https://avatars.githubusercontent.com/u/19945501?v=4" width="110px;"/><br /><sub>Yevhenii Huzii</sub>](https://github.com/QveenSi)<br />[💻](https://github.com/snipe/snipe-it/commits?author=QveenSi "Code") |
-| [<img src="https://avatars.githubusercontent.com/u/97299851?v=4" width="110px;"/><br /><sub>Christian Weirich</sub>](https://github.com/chrisweirich)<br />[💻](https://github.com/snipe/snipe-it/commits?author=chrisweirich "Code") | [<img src="https://avatars.githubusercontent.com/u/1294403?v=4" width="110px;"/><br /><sub>denzfarid</sub>](https://github.com/denzfarid)<br /> | [<img src="https://avatars.githubusercontent.com/u/94018771?v=4" width="110px;"/><br /><sub>ntbutler-nbcs</sub>](https://github.com/ntbutler-nbcs)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ntbutler-nbcs "Code") | [<img src="https://avatars.githubusercontent.com/u/172697?v=4" width="110px;"/><br /><sub>Naveen</sub>](https://naveensrinivasan.dev)<br />[💻](https://github.com/snipe/snipe-it/commits?author=naveensrinivasan "Code") | [<img src="https://avatars.githubusercontent.com/u/55674383?v=4" width="110px;"/><br /><sub>Mike Roquemore</sub>](https://github.com/mikeroq)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mikeroq "Code") | [<img src="https://avatars.githubusercontent.com/u/7991086?v=4" width="110px;"/><br /><sub>Daniel Reeder</sub>](https://github.com/reederda)<br />[🌍](#translation-reederda "Translation") [🌍](#translation-reederda "Translation") [💻](https://github.com/snipe/snipe-it/commits?author=reederda "Code") | [<img src="https://avatars.githubusercontent.com/u/109422491?v=4" width="110px;"/><br /><sub>vickyjaura183</sub>](https://github.com/vickyjaura183)<br />[💻](https://github.com/snipe/snipe-it/commits?author=vickyjaura183 "Code") |
-| [<img src="https://avatars.githubusercontent.com/u/32363424?v=4" width="110px;"/><br /><sub>Peace</sub>](https://github.com/julian-piehl)<br />[💻](https://github.com/snipe/snipe-it/commits?author=julian-piehl "Code") | [<img src="https://avatars.githubusercontent.com/u/231528?v=4" width="110px;"/><br /><sub>Kyle Gordon</sub>](https://github.com/kylegordon)<br />[💻](https://github.com/snipe/snipe-it/commits?author=kylegordon "Code") | [<img src="https://avatars.githubusercontent.com/u/53009155?v=4" width="110px;"/><br /><sub>Katharina Drexel</sub>](http://www.bfh.ch)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sunflowerbofh "Code") | [<img src="https://avatars.githubusercontent.com/u/1931963?v=4" width="110px;"/><br /><sub>David Sferruzza</sub>](https://david.sferruzza.fr/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=dsferruzza "Code") | [<img src="https://avatars.githubusercontent.com/u/19511639?v=4" width="110px;"/><br /><sub>Rick Nelson</sub>](https://github.com/rnelsonee)<br />[💻](https://github.com/snipe/snipe-it/commits?author=rnelsonee "Code") | [<img src="https://avatars.githubusercontent.com/u/94169344?v=4" width="110px;"/><br /><sub>BasO12</sub>](https://github.com/BasO12)<br />[💻](https://github.com/snipe/snipe-it/commits?author=BasO12 "Code") | [<img src="https://avatars.githubusercontent.com/u/111710123?v=4" width="110px;"/><br /><sub>Vautia</sub>](https://github.com/Vautia)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Vautia "Code") |
-| [<img src="https://avatars.githubusercontent.com/u/28321?v=4" width="110px;"/><br /><sub>Chris Hartjes</sub>](http://www.littlehart.net/atthekeyboard)<br />[💻](https://github.com/snipe/snipe-it/commits?author=chartjes "Code") | [<img src="https://avatars.githubusercontent.com/u/2404584?v=4" width="110px;"/><br /><sub>geo-chen</sub>](https://github.com/geo-chen)<br />[💻](https://github.com/snipe/snipe-it/commits?author=geo-chen "Code") | [<img src="https://avatars.githubusercontent.com/u/6006620?v=4" width="110px;"/><br /><sub>Phan Nguyen</sub>](https://github.com/nh314)<br />[💻](https://github.com/snipe/snipe-it/commits?author=nh314 "Code") | [<img src="https://avatars.githubusercontent.com/u/115993812?v=4" width="110px;"/><br /><sub>Iisakki Jaakkola</sub>](https://github.com/StarlessNights)<br />[💻](https://github.com/snipe/snipe-it/commits?author=StarlessNights "Code") | [<img src="https://avatars.githubusercontent.com/u/22633385?v=4" width="110px;"/><br /><sub>Ikko Ashimine</sub>](https://bandism.net/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=eltociear "Code") | [<img src="https://avatars.githubusercontent.com/u/56871540?v=4" width="110px;"/><br /><sub>Lukas Fehling</sub>](https://github.com/lukasfehling)<br />[💻](https://github.com/snipe/snipe-it/commits?author=lukasfehling "Code") | [<img src="https://avatars.githubusercontent.com/u/1975990?v=4" width="110px;"/><br /><sub>Fernando Almeida</sub>](https://github.com/fernando-almeida)<br />[💻](https://github.com/snipe/snipe-it/commits?author=fernando-almeida "Code") |
-| [<img src="https://avatars.githubusercontent.com/u/116301219?v=4" width="110px;"/><br /><sub>akemidx</sub>](https://github.com/akemidx)<br />[💻](https://github.com/snipe/snipe-it/commits?author=akemidx "Code") | [<img src="https://avatars.githubusercontent.com/u/144778?v=4" width="110px;"/><br /><sub>Oguz Bilgic</sub>](http://oguz.site)<br />[💻](https://github.com/snipe/snipe-it/commits?author=oguzbilgic "Code") | [<img src="https://avatars.githubusercontent.com/u/9262438?v=4" width="110px;"/><br /><sub>Scooter Crawford</sub>](https://github.com/scoo73r)<br />[💻](https://github.com/snipe/snipe-it/commits?author=scoo73r "Code") | [<img src="https://avatars.githubusercontent.com/u/5957345?v=4" width="110px;"/><br /><sub>subdriven</sub>](https://github.com/subdriven)<br />[💻](https://github.com/snipe/snipe-it/commits?author=subdriven "Code") | [<img src="https://avatars.githubusercontent.com/u/658865?v=4" width="110px;"/><br /><sub>Andrew Savinykh</sub>](https://github.com/AndrewSav)<br />[💻](https://github.com/snipe/snipe-it/commits?author=AndrewSav "Code") | [<img src="https://avatars.githubusercontent.com/u/1155067?v=4" width="110px;"/><br /><sub>Tadayuki Onishi</sub>](https://kenchan0130.github.io)<br />[💻](https://github.com/snipe/snipe-it/commits?author=kenchan0130 "Code") | [<img src="https://avatars.githubusercontent.com/u/112496896?v=4" width="110px;"/><br /><sub>Florian</sub>](https://github.com/floschoepfer)<br />[💻](https://github.com/snipe/snipe-it/commits?author=floschoepfer "Code") |
-| [<img src="https://avatars.githubusercontent.com/u/7305753?v=4" width="110px;"/><br /><sub>Spencer Long</sub>](http://spencerlong.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=spencerrlongg "Code") | [<img src="https://avatars.githubusercontent.com/u/1141514?v=4" width="110px;"/><br /><sub>Marcus Moore</sub>](https://github.com/marcusmoore)<br />[💻](https://github.com/snipe/snipe-it/commits?author=marcusmoore "Code") | [<img src="https://avatars.githubusercontent.com/u/570639?v=4" width="110px;"/><br /><sub>Martin Meredith</sub>](https://github.com/Mezzle)<br /> | [<img src="https://avatars.githubusercontent.com/u/5731963?v=4" width="110px;"/><br /><sub>dboth</sub>](http://dboth.de)<br />[💻](https://github.com/snipe/snipe-it/commits?author=dboth "Code") | [<img src="https://avatars.githubusercontent.com/u/87536651?v=4" width="110px;"/><br /><sub>Zachary Fleck</sub>](https://github.com/zacharyfleck)<br />[💻](https://github.com/snipe/snipe-it/commits?author=zacharyfleck "Code") | [<img src="https://avatars.githubusercontent.com/u/74609912?v=4" width="110px;"/><br /><sub>VIKAAS-A</sub>](https://github.com/vikaas-cyper)<br />[💻](https://github.com/snipe/snipe-it/commits?author=vikaas-cyper "Code") | [<img src="https://avatars.githubusercontent.com/u/88882041?v=4" width="110px;"/><br /><sub>Abdul Kareem</sub>](https://github.com/ak-piracha)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ak-piracha "Code") |
-| [<img src="https://avatars.githubusercontent.com/u/111287779?v=4" width="110px;"/><br /><sub>NojoudAlshehri</sub>](https://github.com/NojoudAlshehri)<br />[💻](https://github.com/snipe/snipe-it/commits?author=NojoudAlshehri "Code") | [<img src="https://avatars.githubusercontent.com/u/54367449?v=4" width="110px;"/><br /><sub>Stefan Stidl</sub>](https://github.com/stefanstidlffg)<br />[💻](https://github.com/snipe/snipe-it/commits?author=stefanstidlffg "Code") | [<img src="https://avatars.githubusercontent.com/u/87803479?v=4" width="110px;"/><br /><sub>Quentin Aymard</sub>](https://github.com/qay21)<br />[💻](https://github.com/snipe/snipe-it/commits?author=qay21 "Code") | [<img src="https://avatars.githubusercontent.com/u/5396871?v=4" width="110px;"/><br /><sub>Grant Le Roux</sub>](https://github.com/cram42)<br />[💻](https://github.com/snipe/snipe-it/commits?author=cram42 "Code") | [<img src="https://avatars.githubusercontent.com/u/58479551?v=4" width="110px;"/><br /><sub>Bogdan</sub>](http://@singrity)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Singrity "Code") | [<img src="https://avatars.githubusercontent.com/u/3483684?v=4" width="110px;"/><br /><sub>mmanjos</sub>](https://github.com/mmanjos)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mmanjos "Code") | [<img src="https://avatars.githubusercontent.com/u/7429229?v=4" width="110px;"/><br /><sub>Abdelaziz Faki</sub>](https://azooz2014.github.io/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Azooz2014 "Code") |
-| [<img src="https://avatars.githubusercontent.com/u/47315739?v=4" width="110px;"/><br /><sub>bilias</sub>](https://github.com/bilias)<br />[💻](https://github.com/snipe/snipe-it/commits?author=bilias "Code") | [<img src="https://avatars.githubusercontent.com/u/2565989?v=4" width="110px;"/><br /><sub>coach1988</sub>](https://github.com/coach1988)<br />[💻](https://github.com/snipe/snipe-it/commits?author=coach1988 "Code") | [<img src="https://avatars.githubusercontent.com/u/11910225?v=4" width="110px;"/><br /><sub>MrM</sub>](https://github.com/mauro-miatello)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mauro-miatello "Code") | [<img src="https://avatars.githubusercontent.com/u/60405354?v=4" width="110px;"/><br /><sub>koiakoia</sub>](https://github.com/koiakoia)<br />[💻](https://github.com/snipe/snipe-it/commits?author=koiakoia "Code") | [<img src="https://avatars.githubusercontent.com/u/5323832?v=4" width="110px;"/><br /><sub>Mustafa Online</sub>](https://github.com/mustafa-online)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mustafa-online "Code") | [<img src="https://avatars.githubusercontent.com/u/104601439?v=4" width="110px;"/><br /><sub>franceslui</sub>](https://github.com/franceslui)<br />[💻](https://github.com/snipe/snipe-it/commits?author=franceslui "Code") | [<img src="https://avatars.githubusercontent.com/u/125313163?v=4" width="110px;"/><br /><sub>Q4kK</sub>](https://github.com/Q4kK)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Q4kK "Code") |
-| [<img src="https://avatars.githubusercontent.com/u/55590532?v=4" width="110px;"/><br /><sub>squintfox</sub>](https://github.com/squintfox)<br />[💻](https://github.com/snipe/snipe-it/commits?author=squintfox "Code") | [<img src="https://avatars.githubusercontent.com/u/1380084?v=4" width="110px;"/><br /><sub>Jeff Clay</sub>](https://github.com/jeffclay)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jeffclay "Code") | [<img src="https://avatars.githubusercontent.com/u/52716446?v=4" width="110px;"/><br /><sub>Phil J R</sub>](https://github.com/PP-JN-RL)<br />[💻](https://github.com/snipe/snipe-it/commits?author=PP-JN-RL "Code") | [<img src="https://avatars.githubusercontent.com/u/1496725?v=4" width="110px;"/><br /><sub>i_virus</sub>](https://www.corelight.com/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=chandanchowdhury "Code") | [<img src="https://avatars.githubusercontent.com/u/1020541?v=4" width="110px;"/><br /><sub>Paul Grime</sub>](https://github.com/gitgrimbo)<br />[💻](https://github.com/snipe/snipe-it/commits?author=gitgrimbo "Code") | [<img src="https://avatars.githubusercontent.com/u/922815?v=4" width="110px;"/><br /><sub>Lee Porte</sub>](https://leeporte.co.uk)<br />[💻](https://github.com/snipe/snipe-it/commits?author=LeePorte "Code") | [<img src="https://avatars.githubusercontent.com/u/23613427?v=4" width="110px;"/><br /><sub>BRYAN </sub>](https://github.com/bryanlopezinc)<br />[💻](https://github.com/snipe/snipe-it/commits?author=bryanlopezinc "Code") [⚠️](https://github.com/snipe/snipe-it/commits?author=bryanlopezinc "Tests") |
-| [<img src="https://avatars.githubusercontent.com/u/64061710?v=4" width="110px;"/><br /><sub>U-H-T</sub>](https://github.com/U-H-T)<br />[💻](https://github.com/snipe/snipe-it/commits?author=U-H-T "Code") | [<img src="https://avatars.githubusercontent.com/u/5395363?v=4" width="110px;"/><br /><sub>Matt Tyree</sub>](https://github.com/Tyree)<br />[📖](https://github.com/snipe/snipe-it/commits?author=Tyree "Documentation") | [<img src="https://avatars.githubusercontent.com/u/292081?v=4" width="110px;"/><br /><sub>Florent Bervas</sub>](http://spoontux.net)<br />[💻](https://github.com/snipe/snipe-it/commits?author=FlorentDotMe "Code") | [<img src="https://avatars.githubusercontent.com/u/4498077?v=4" width="110px;"/><br /><sub>Daniel Albertsen</sub>](https://ditscheri.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=dbakan "Code") | [<img src="https://avatars.githubusercontent.com/u/100710244?v=4" width="110px;"/><br /><sub>r-xyz</sub>](https://github.com/r-xyz)<br />[💻](https://github.com/snipe/snipe-it/commits?author=r-xyz "Code") | [<img src="https://avatars.githubusercontent.com/u/47491036?v=4" width="110px;"/><br /><sub>Steven Mainor</sub>](https://github.com/DrekiDegga)<br />[💻](https://github.com/snipe/snipe-it/commits?author=DrekiDegga "Code") | [<img src="https://avatars.githubusercontent.com/u/65785975?v=4" width="110px;"/><br /><sub>arne-kroeger</sub>](https://github.com/arne-kroeger)<br />[💻](https://github.com/snipe/snipe-it/commits?author=arne-kroeger "Code") |
-| [<img src="https://avatars.githubusercontent.com/u/167117705?v=4" width="110px;"/><br /><sub>Glukose1</sub>](https://github.com/Glukose1)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Glukose1 "Code") | [<img src="https://avatars.githubusercontent.com/u/1197791?v=4" width="110px;"/><br /><sub>Scarzy</sub>](https://github.com/Scarzy)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Scarzy "Code") | [<img src="https://avatars.githubusercontent.com/u/37372069?v=4" width="110px;"/><br /><sub>setpill</sub>](https://github.com/setpill)<br />[💻](https://github.com/snipe/snipe-it/commits?author=setpill "Code") | [<img src="https://avatars.githubusercontent.com/u/3755203?v=4" width="110px;"/><br /><sub>swift2512</sub>](https://github.com/swift2512)<br />[🐛](https://github.com/snipe/snipe-it/issues?q=author%3Aswift2512 "Bug reports") | [<img src="https://avatars.githubusercontent.com/u/6136439?v=4" width="110px;"/><br /><sub>Darren Rainey</sub>](https://darrenraineys.co.uk)<br />[💻](https://github.com/snipe/snipe-it/commits?author=DarrenRainey "Code") | [<img src="https://avatars.githubusercontent.com/u/133033121?v=4" width="110px;"/><br /><sub>maciej-poleszczyk</sub>](https://github.com/maciej-poleszczyk)<br />[💻](https://github.com/snipe/snipe-it/commits?author=maciej-poleszczyk "Code") | [<img src="https://avatars.githubusercontent.com/u/143394709?v=4" width="110px;"/><br /><sub>Sebastian Groß</sub>](https://github.com/sgross-emlix)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sgross-emlix "Code") |
-| [<img src="https://avatars.githubusercontent.com/u/41107778?v=4" width="110px;"/><br /><sub>Anouar Touati</sub>](https://github.com/AnouarTouati)<br />[💻](https://github.com/snipe/snipe-it/commits?author=AnouarTouati "Code") | [<img src="https://avatars.githubusercontent.com/u/25596663?v=4" width="110px;"/><br /><sub>aHVzY2g</sub>](https://github.com/aHVzY2g)<br />[💻](https://github.com/snipe/snipe-it/commits?author=aHVzY2g "Code") | [<img src="https://avatars.githubusercontent.com/u/13408130?v=4" width="110px;"/><br /><sub>林博仁 Buo-ren Lin</sub>](https://brlin.me)<br />[💻](https://github.com/snipe/snipe-it/commits?author=brlin-tw "Code") | [<img src="https://avatars.githubusercontent.com/u/18550946?v=4" width="110px;"/><br /><sub>Adugna Gizaw</sub>](https://orbalia.pythonanywhere.com/)<br />[🌍](#translation-addex12 "Translation") | [<img src="https://avatars.githubusercontent.com/u/760989?v=4" width="110px;"/><br /><sub>Jesse Ostrander</sub>](https://github.com/jostrander)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jostrander "Code") | [<img src="https://avatars.githubusercontent.com/u/31522486?v=4" width="110px;"/><br /><sub>James M</sub>](https://github.com/azmcnutt)<br />[💻](https://github.com/snipe/snipe-it/commits?author=azmcnutt "Code") | [<img src="https://avatars.githubusercontent.com/u/5183146?v=4" width="110px;"/><br /><sub>Fiala06</sub>](https://github.com/Fiala06)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Fiala06 "Code") |
-| [<img src="https://avatars.githubusercontent.com/u/28693782?v=4" width="110px;"/><br /><sub>Nathan Taylor</sub>](https://github.com/ntaylor-86)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ntaylor-86 "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/38761237?v=4" width="110px;"/><br /><sub>Alex Janes</sub>](https://adagiohealth.org)<br />[💻](https://github.com/snipe/snipe-it/commits?author=adagioajanes "Code") | [<img src="https://avatars.githubusercontent.com/u/32387849?v=4" width="110px;"/><br /><sub>Nuraeil</sub>](https://github.com/nuraeil)<br />[💻](https://github.com/snipe/snipe-it/commits?author=nuraeil "Code") | [<img src="https://avatars.githubusercontent.com/u/48162670?v=4" width="110px;"/><br /><sub>TenOfTens</sub>](https://github.com/TenOfTens)<br />[💻](https://github.com/snipe/snipe-it/commits?author=TenOfTens "Code") | [<img src="https://avatars.githubusercontent.com/u/9415391?v=4" width="110px;"/><br /><sub>waffle</sub>](https://ditisjens.be/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=insert-waffle "Code") | [<img src="https://avatars.githubusercontent.com/u/19945501?v=4" width="110px;"/><br /><sub>Yevhenii Huzii</sub>](https://github.com/qveensi)<br />[💻](https://github.com/snipe/snipe-it/commits?author=qveensi "Code") | [<img src="https://avatars.githubusercontent.com/u/3839381?v=4" width="110px;"/><br /><sub>Achmad Fienan Rahardianto</sub>](https://github.com/veenone)<br />[💻](https://github.com/snipe/snipe-it/commits?author=veenone "Code") | [<img src="https://avatars.githubusercontent.com/u/97299851?v=4" width="110px;"/><br /><sub>Christian Weirich</sub>](https://github.com/chrisweirich)<br />[💻](https://github.com/snipe/snipe-it/commits?author=chrisweirich "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/1294403?v=4" width="110px;"/><br /><sub>denzfarid</sub>](https://github.com/denzfarid)<br /> | [<img src="https://avatars.githubusercontent.com/u/94018771?v=4" width="110px;"/><br /><sub>ntbutler-nbcs</sub>](https://github.com/ntbutler-nbcs)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ntbutler-nbcs "Code") | [<img src="https://avatars.githubusercontent.com/u/172697?v=4" width="110px;"/><br /><sub>Naveen</sub>](https://naveensrinivasan.dev)<br />[💻](https://github.com/snipe/snipe-it/commits?author=naveensrinivasan "Code") | [<img src="https://avatars.githubusercontent.com/u/55674383?v=4" width="110px;"/><br /><sub>Mike Roquemore</sub>](https://github.com/mikeroq)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mikeroq "Code") | [<img src="https://avatars.githubusercontent.com/u/7991086?v=4" width="110px;"/><br /><sub>Daniel Reeder</sub>](https://github.com/reederda)<br />[🌍](#translation-reederda "Translation") [🌍](#translation-reederda "Translation") [💻](https://github.com/snipe/snipe-it/commits?author=reederda "Code") | [<img src="https://avatars.githubusercontent.com/u/109422491?v=4" width="110px;"/><br /><sub>vickyjaura183</sub>](https://github.com/vickyjaura183)<br />[💻](https://github.com/snipe/snipe-it/commits?author=vickyjaura183 "Code") | [<img src="https://avatars.githubusercontent.com/u/32363424?v=4" width="110px;"/><br /><sub>Peace</sub>](https://github.com/julian-piehl)<br />[💻](https://github.com/snipe/snipe-it/commits?author=julian-piehl "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/231528?v=4" width="110px;"/><br /><sub>Kyle Gordon</sub>](https://github.com/kylegordon)<br />[💻](https://github.com/snipe/snipe-it/commits?author=kylegordon "Code") | [<img src="https://avatars.githubusercontent.com/u/53009155?v=4" width="110px;"/><br /><sub>Katharina Drexel</sub>](http://www.bfh.ch)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sunflowerbofh "Code") | [<img src="https://avatars.githubusercontent.com/u/1931963?v=4" width="110px;"/><br /><sub>David Sferruzza</sub>](https://david.sferruzza.fr/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=dsferruzza "Code") | [<img src="https://avatars.githubusercontent.com/u/19511639?v=4" width="110px;"/><br /><sub>Rick Nelson</sub>](https://github.com/rnelsonee)<br />[💻](https://github.com/snipe/snipe-it/commits?author=rnelsonee "Code") | [<img src="https://avatars.githubusercontent.com/u/94169344?v=4" width="110px;"/><br /><sub>BasO12</sub>](https://github.com/BasO12)<br />[💻](https://github.com/snipe/snipe-it/commits?author=BasO12 "Code") | [<img src="https://avatars.githubusercontent.com/u/111710123?v=4" width="110px;"/><br /><sub>Vautia</sub>](https://github.com/Vautia)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Vautia "Code") | [<img src="https://avatars.githubusercontent.com/u/28321?v=4" width="110px;"/><br /><sub>Chris Hartjes</sub>](http://www.littlehart.net/atthekeyboard)<br />[💻](https://github.com/snipe/snipe-it/commits?author=chartjes "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/2404584?v=4" width="110px;"/><br /><sub>geo-chen</sub>](https://github.com/geo-chen)<br />[💻](https://github.com/snipe/snipe-it/commits?author=geo-chen "Code") | [<img src="https://avatars.githubusercontent.com/u/6006620?v=4" width="110px;"/><br /><sub>Phan Nguyen</sub>](https://github.com/nh314)<br />[💻](https://github.com/snipe/snipe-it/commits?author=nh314 "Code") | [<img src="https://avatars.githubusercontent.com/u/115993812?v=4" width="110px;"/><br /><sub>Iisakki Jaakkola</sub>](https://github.com/StarlessNights)<br />[💻](https://github.com/snipe/snipe-it/commits?author=StarlessNights "Code") | [<img src="https://avatars.githubusercontent.com/u/22633385?v=4" width="110px;"/><br /><sub>Ikko Ashimine</sub>](https://bandism.net/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=eltociear "Code") | [<img src="https://avatars.githubusercontent.com/u/56871540?v=4" width="110px;"/><br /><sub>Lukas Fehling</sub>](https://github.com/lukasfehling)<br />[💻](https://github.com/snipe/snipe-it/commits?author=lukasfehling "Code") | [<img src="https://avatars.githubusercontent.com/u/1975990?v=4" width="110px;"/><br /><sub>Fernando Almeida</sub>](https://github.com/fernando-almeida)<br />[💻](https://github.com/snipe/snipe-it/commits?author=fernando-almeida "Code") | [<img src="https://avatars.githubusercontent.com/u/116301219?v=4" width="110px;"/><br /><sub>akemidx</sub>](https://github.com/akemidx)<br />[💻](https://github.com/snipe/snipe-it/commits?author=akemidx "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/144778?v=4" width="110px;"/><br /><sub>Oguz Bilgic</sub>](http://oguz.site)<br />[💻](https://github.com/snipe/snipe-it/commits?author=oguzbilgic "Code") | [<img src="https://avatars.githubusercontent.com/u/9262438?v=4" width="110px;"/><br /><sub>Scooter Crawford</sub>](https://github.com/scoo73r)<br />[💻](https://github.com/snipe/snipe-it/commits?author=scoo73r "Code") | [<img src="https://avatars.githubusercontent.com/u/5957345?v=4" width="110px;"/><br /><sub>subdriven</sub>](https://github.com/subdriven)<br />[💻](https://github.com/snipe/snipe-it/commits?author=subdriven "Code") | [<img src="https://avatars.githubusercontent.com/u/658865?v=4" width="110px;"/><br /><sub>Andrew Savinykh</sub>](https://github.com/AndrewSav)<br />[💻](https://github.com/snipe/snipe-it/commits?author=AndrewSav "Code") | [<img src="https://avatars.githubusercontent.com/u/1155067?v=4" width="110px;"/><br /><sub>Tadayuki Onishi</sub>](https://kenchan0130.github.io)<br />[💻](https://github.com/snipe/snipe-it/commits?author=kenchan0130 "Code") | [<img src="https://avatars.githubusercontent.com/u/112496896?v=4" width="110px;"/><br /><sub>Florian</sub>](https://github.com/floschoepfer)<br />[💻](https://github.com/snipe/snipe-it/commits?author=floschoepfer "Code") | [<img src="https://avatars.githubusercontent.com/u/7305753?v=4" width="110px;"/><br /><sub>Spencer Long</sub>](http://spencerlong.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=spencerrlongg "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/1141514?v=4" width="110px;"/><br /><sub>Marcus Moore</sub>](https://github.com/marcusmoore)<br />[💻](https://github.com/snipe/snipe-it/commits?author=marcusmoore "Code") | [<img src="https://avatars.githubusercontent.com/u/570639?v=4" width="110px;"/><br /><sub>Martin Meredith</sub>](https://github.com/Mezzle)<br /> | [<img src="https://avatars.githubusercontent.com/u/5731963?v=4" width="110px;"/><br /><sub>dboth</sub>](http://dboth.de)<br />[💻](https://github.com/snipe/snipe-it/commits?author=dboth "Code") | [<img src="https://avatars.githubusercontent.com/u/87536651?v=4" width="110px;"/><br /><sub>Zachary Fleck</sub>](https://github.com/zacharyfleck)<br />[💻](https://github.com/snipe/snipe-it/commits?author=zacharyfleck "Code") | [<img src="https://avatars.githubusercontent.com/u/74609912?v=4" width="110px;"/><br /><sub>VIKAAS-A</sub>](https://github.com/vikaas-cyper)<br />[💻](https://github.com/snipe/snipe-it/commits?author=vikaas-cyper "Code") | [<img src="https://avatars.githubusercontent.com/u/88882041?v=4" width="110px;"/><br /><sub>Abdul Kareem</sub>](https://github.com/ak-piracha)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ak-piracha "Code") | [<img src="https://avatars.githubusercontent.com/u/111287779?v=4" width="110px;"/><br /><sub>NojoudAlshehri</sub>](https://github.com/NojoudAlshehri)<br />[💻](https://github.com/snipe/snipe-it/commits?author=NojoudAlshehri "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/54367449?v=4" width="110px;"/><br /><sub>Stefan Stidl</sub>](https://github.com/stefanstidlffg)<br />[💻](https://github.com/snipe/snipe-it/commits?author=stefanstidlffg "Code") | [<img src="https://avatars.githubusercontent.com/u/87803479?v=4" width="110px;"/><br /><sub>Quentin Aymard</sub>](https://github.com/qay21)<br />[💻](https://github.com/snipe/snipe-it/commits?author=qay21 "Code") | [<img src="https://avatars.githubusercontent.com/u/5396871?v=4" width="110px;"/><br /><sub>Grant Le Roux</sub>](https://github.com/cram42)<br />[💻](https://github.com/snipe/snipe-it/commits?author=cram42 "Code") | [<img src="https://avatars.githubusercontent.com/u/58479551?v=4" width="110px;"/><br /><sub>Bogdan</sub>](http://@singrity)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Singrity "Code") | [<img src="https://avatars.githubusercontent.com/u/3483684?v=4" width="110px;"/><br /><sub>mmanjos</sub>](https://github.com/mmanjos)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mmanjos "Code") | [<img src="https://avatars.githubusercontent.com/u/7429229?v=4" width="110px;"/><br /><sub>Abdelaziz Faki</sub>](https://azooz2014.github.io/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Azooz2014 "Code") | [<img src="https://avatars.githubusercontent.com/u/47315739?v=4" width="110px;"/><br /><sub>bilias</sub>](https://github.com/bilias)<br />[💻](https://github.com/snipe/snipe-it/commits?author=bilias "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/2565989?v=4" width="110px;"/><br /><sub>coach1988</sub>](https://github.com/coach1988)<br />[💻](https://github.com/snipe/snipe-it/commits?author=coach1988 "Code") | [<img src="https://avatars.githubusercontent.com/u/11910225?v=4" width="110px;"/><br /><sub>MrM</sub>](https://github.com/mauro-miatello)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mauro-miatello "Code") | [<img src="https://avatars.githubusercontent.com/u/60405354?v=4" width="110px;"/><br /><sub>koiakoia</sub>](https://github.com/koiakoia)<br />[💻](https://github.com/snipe/snipe-it/commits?author=koiakoia "Code") | [<img src="https://avatars.githubusercontent.com/u/5323832?v=4" width="110px;"/><br /><sub>Mustafa Online</sub>](https://github.com/mustafa-online)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mustafa-online "Code") | [<img src="https://avatars.githubusercontent.com/u/104601439?v=4" width="110px;"/><br /><sub>franceslui</sub>](https://github.com/franceslui)<br />[💻](https://github.com/snipe/snipe-it/commits?author=franceslui "Code") | [<img src="https://avatars.githubusercontent.com/u/125313163?v=4" width="110px;"/><br /><sub>Q4kK</sub>](https://github.com/Q4kK)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Q4kK "Code") | [<img src="https://avatars.githubusercontent.com/u/55590532?v=4" width="110px;"/><br /><sub>squintfox</sub>](https://github.com/squintfox)<br />[💻](https://github.com/snipe/snipe-it/commits?author=squintfox "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/1380084?v=4" width="110px;"/><br /><sub>Jeff Clay</sub>](https://github.com/jeffclay)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jeffclay "Code") | [<img src="https://avatars.githubusercontent.com/u/52716446?v=4" width="110px;"/><br /><sub>Phil J R</sub>](https://github.com/PP-JN-RL)<br />[💻](https://github.com/snipe/snipe-it/commits?author=PP-JN-RL "Code") | [<img src="https://avatars.githubusercontent.com/u/1496725?v=4" width="110px;"/><br /><sub>i_virus</sub>](https://www.corelight.com/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=chandanchowdhury "Code") | [<img src="https://avatars.githubusercontent.com/u/1020541?v=4" width="110px;"/><br /><sub>Paul Grime</sub>](https://github.com/gitgrimbo)<br />[💻](https://github.com/snipe/snipe-it/commits?author=gitgrimbo "Code") | [<img src="https://avatars.githubusercontent.com/u/922815?v=4" width="110px;"/><br /><sub>Lee Porte</sub>](https://leeporte.co.uk)<br />[💻](https://github.com/snipe/snipe-it/commits?author=LeePorte "Code") | [<img src="https://avatars.githubusercontent.com/u/23613427?v=4" width="110px;"/><br /><sub>BRYAN </sub>](https://github.com/bryanlopezinc)<br />[💻](https://github.com/snipe/snipe-it/commits?author=bryanlopezinc "Code") [⚠️](https://github.com/snipe/snipe-it/commits?author=bryanlopezinc "Tests") | [<img src="https://avatars.githubusercontent.com/u/64061710?v=4" width="110px;"/><br /><sub>U-H-T</sub>](https://github.com/U-H-T)<br />[💻](https://github.com/snipe/snipe-it/commits?author=U-H-T "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/5395363?v=4" width="110px;"/><br /><sub>Matt Tyree</sub>](https://github.com/Tyree)<br />[📖](https://github.com/snipe/snipe-it/commits?author=Tyree "Documentation") | [<img src="https://avatars.githubusercontent.com/u/292081?v=4" width="110px;"/><br /><sub>Florent Bervas</sub>](http://spoontux.net)<br />[💻](https://github.com/snipe/snipe-it/commits?author=FlorentDotMe "Code") | [<img src="https://avatars.githubusercontent.com/u/4498077?v=4" width="110px;"/><br /><sub>Daniel Albertsen</sub>](https://ditscheri.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=dbakan "Code") | [<img src="https://avatars.githubusercontent.com/u/100710244?v=4" width="110px;"/><br /><sub>r-xyz</sub>](https://github.com/r-xyz)<br />[💻](https://github.com/snipe/snipe-it/commits?author=r-xyz "Code") | [<img src="https://avatars.githubusercontent.com/u/47491036?v=4" width="110px;"/><br /><sub>Steven Mainor</sub>](https://github.com/DrekiDegga)<br />[💻](https://github.com/snipe/snipe-it/commits?author=DrekiDegga "Code") | [<img src="https://avatars.githubusercontent.com/u/65785975?v=4" width="110px;"/><br /><sub>arne-kroeger</sub>](https://github.com/arne-kroeger)<br />[💻](https://github.com/snipe/snipe-it/commits?author=arne-kroeger "Code") | [<img src="https://avatars.githubusercontent.com/u/167117705?v=4" width="110px;"/><br /><sub>Glukose1</sub>](https://github.com/Glukose1)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Glukose1 "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/1197791?v=4" width="110px;"/><br /><sub>Scarzy</sub>](https://github.com/Scarzy)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Scarzy "Code") | [<img src="https://avatars.githubusercontent.com/u/37372069?v=4" width="110px;"/><br /><sub>setpill</sub>](https://github.com/setpill)<br />[💻](https://github.com/snipe/snipe-it/commits?author=setpill "Code") | [<img src="https://avatars.githubusercontent.com/u/3755203?v=4" width="110px;"/><br /><sub>swift2512</sub>](https://github.com/swift2512)<br />[🐛](https://github.com/snipe/snipe-it/issues?q=author%3Aswift2512 "Bug reports") | [<img src="https://avatars.githubusercontent.com/u/6136439?v=4" width="110px;"/><br /><sub>Darren Rainey</sub>](https://darrenraineys.co.uk)<br />[💻](https://github.com/snipe/snipe-it/commits?author=DarrenRainey "Code") | [<img src="https://avatars.githubusercontent.com/u/133033121?v=4" width="110px;"/><br /><sub>maciej-poleszczyk</sub>](https://github.com/maciej-poleszczyk)<br />[💻](https://github.com/snipe/snipe-it/commits?author=maciej-poleszczyk "Code") | [<img src="https://avatars.githubusercontent.com/u/143394709?v=4" width="110px;"/><br /><sub>Sebastian Groß</sub>](https://github.com/sgross-emlix)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sgross-emlix "Code") | [<img src="https://avatars.githubusercontent.com/u/41107778?v=4" width="110px;"/><br /><sub>Anouar Touati</sub>](https://github.com/AnouarTouati)<br />[💻](https://github.com/snipe/snipe-it/commits?author=AnouarTouati "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/25596663?v=4" width="110px;"/><br /><sub>aHVzY2g</sub>](https://github.com/aHVzY2g)<br />[💻](https://github.com/snipe/snipe-it/commits?author=aHVzY2g "Code") | [<img src="https://avatars.githubusercontent.com/u/13408130?v=4" width="110px;"/><br /><sub>林博仁 Buo-ren Lin</sub>](https://brlin.me)<br />[💻](https://github.com/snipe/snipe-it/commits?author=brlin-tw "Code") | [<img src="https://avatars.githubusercontent.com/u/18550946?v=4" width="110px;"/><br /><sub>Adugna Gizaw</sub>](https://orbalia.pythonanywhere.com/)<br />[🌍](#translation-addex12 "Translation") | [<img src="https://avatars.githubusercontent.com/u/760989?v=4" width="110px;"/><br /><sub>Jesse Ostrander</sub>](https://github.com/jostrander)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jostrander "Code") | [<img src="https://avatars.githubusercontent.com/u/31522486?v=4" width="110px;"/><br /><sub>James M</sub>](https://github.com/azmcnutt)<br />[💻](https://github.com/snipe/snipe-it/commits?author=azmcnutt "Code") | [<img src="https://avatars.githubusercontent.com/u/5183146?v=4" width="110px;"/><br /><sub>Fiala06</sub>](https://github.com/Fiala06)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Fiala06 "Code") | [<img src="https://avatars.githubusercontent.com/u/28693782?v=4" width="110px;"/><br /><sub>Nathan Taylor</sub>](https://github.com/ntaylor-86)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ntaylor-86 "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/16699443?v=4" width="110px;"/><br /><sub>fvollmer</sub>](https://github.com/fvollmer)<br />[💻](https://github.com/snipe/snipe-it/commits?author=fvollmer "Code") | [<img src="https://avatars.githubusercontent.com/u/109086466?v=4" width="110px;"/><br /><sub>36864</sub>](https://github.com/36864)<br />[💻](https://github.com/snipe/snipe-it/commits?author=36864 "Code") | [<img src="https://avatars.githubusercontent.com/u/365751?v=4" width="110px;"/><br /><sub>Daniel O'Connor</sub>](http://clockwerx.blogspot.com/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=CloCkWeRX "Code") | [<img src="https://avatars.githubusercontent.com/u/102852568?v=4" width="110px;"/><br /><sub>BeatSpark</sub>](https://github.com/BeatSpark)<br />[💻](https://github.com/snipe/snipe-it/commits?author=BeatSpark "Code") | [<img src="https://avatars.githubusercontent.com/u/59203607?v=4" width="110px;"/><br /><sub>mrdahbi</sub>](https://github.com/mrdahbi)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mrdahbi "Code") | [<img src="https://avatars.githubusercontent.com/u/6661332?v=4" width="110px;"/><br /><sub>Fabian Schmid</sub>](http://sr.solutions)<br />[💻](https://github.com/snipe/snipe-it/commits?author=chfsx "Code") | [<img src="https://avatars.githubusercontent.com/u/1288116?v=4" width="110px;"/><br /><sub>Chris Olin</sub>](https://www.chrisolin.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=realchrisolin "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/3803132?v=4" width="110px;"/><br /><sub>Dan</sub>](https://github.com/mnemonicly)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mnemonicly "Code") | [<img src="https://avatars.githubusercontent.com/u/43917728?v=4" width="110px;"/><br /><sub>Nebel</sub>](https://github.com/NebelKreis)<br />[💻](https://github.com/snipe/snipe-it/commits?author=NebelKreis "Code") | [<img src="https://avatars.githubusercontent.com/u/132433803?v=4" width="110px;"/><br /><sub>test1337ahp</sub>](https://github.com/test1337ahp)<br />[💻](https://github.com/snipe/snipe-it/commits?author=test1337ahp "Code") | [<img src="https://avatars.githubusercontent.com/u/1916566?v=4" width="110px;"/><br /><sub>Jonathon Reinhart</sub>](https://github.com/JonathonReinhart)<br />[💻](https://github.com/snipe/snipe-it/commits?author=JonathonReinhart "Code") | [<img src="https://avatars.githubusercontent.com/u/484742?v=4" width="110px;"/><br /><sub>aranar-pro</sub>](https://github.com/aranar-pro)<br />[💻](https://github.com/snipe/snipe-it/commits?author=aranar-pro "Code") | [<img src="https://avatars.githubusercontent.com/u/27019397?v=4" width="110px;"/><br /><sub>Phil</sub>](https://github.com/phil-flip)<br />[💻](https://github.com/snipe/snipe-it/commits?author=phil-flip "Code") | [<img src="https://avatars.githubusercontent.com/u/6473460?v=4" width="110px;"/><br /><sub>Steffy Fort</sub>](https://fe80.fr/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=fe80 "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/3302372?v=4" width="110px;"/><br /><sub>Jared Busch</sub>](https://github.com/sorvani)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sorvani "Code") | [<img src="https://avatars.githubusercontent.com/u/111956991?v=4" width="110px;"/><br /><sub>seanborg-codethink</sub>](https://github.com/seanborg-codethink)<br />[💻](https://github.com/snipe/snipe-it/commits?author=seanborg-codethink "Code") | [<img src="https://avatars.githubusercontent.com/u/160669961?v=4" width="110px;"/><br /><sub>dkaatz</sub>](https://github.com/dkaatz)<br />[💻](https://github.com/snipe/snipe-it/commits?author=dkaatz "Code") | [<img src="https://avatars.githubusercontent.com/u/827205?v=4" width="110px;"/><br /><sub>Daniel Ruf</sub>](https://threema.id/74SF7MW6?text=)<br />[💻](https://github.com/snipe/snipe-it/commits?author=DanielRuf "Code") | [<img src="https://avatars.githubusercontent.com/u/38883201?v=4" width="110px;"/><br /><sub>ahpaleus</sub>](https://github.com/ahpaleus)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ahpaleus "Code") | [<img src="https://avatars.githubusercontent.com/u/22906055?v=4" width="110px;"/><br /><sub>Anh DAO-DUY</sub>](https://github.com/mink-adao-duy)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mink-adao-duy "Code") | [<img src="https://avatars.githubusercontent.com/u/4723453?v=4" width="110px;"/><br /><sub>Andres Gutierrez</sub>](https://github.com/Serdnad)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Serdnad "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/111083379?v=4" width="110px;"/><br /><sub>Warren White</sub>](https://github.com/wewhite)<br />[💻](https://github.com/snipe/snipe-it/commits?author=wewhite "Code") | [<img src="https://avatars.githubusercontent.com/u/2809241?v=4" width="110px;"/><br /><sub>Robin Temme</sub>](https://robintemme.de/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=robintemme "Code") | [<img src="https://avatars.githubusercontent.com/u/47008367?v=4" width="110px;"/><br /><sub>herroworrd</sub>](https://github.com/herroworrd)<br />[💻](https://github.com/snipe/snipe-it/commits?author=herroworrd "Code") | [<img src="https://avatars.githubusercontent.com/u/28558609?v=4" width="110px;"/><br /><sub>vicleos</sub>](https://mubiu.com/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=vicleos "Code") | [<img src="https://avatars.githubusercontent.com/u/1016780?v=4" width="110px;"/><br /><sub>Bob Clough</sub>](http://thinkl33t.co.uk/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=thinkl33t "Code") | [<img src="https://avatars.githubusercontent.com/u/10648463?v=4" width="110px;"/><br /><sub>Brandon Daniel Bailey</sub>](https://github.com/brandon-bailey)<br />[💻](https://github.com/snipe/snipe-it/commits?author=brandon-bailey "Code") | [<img src="https://avatars.githubusercontent.com/u/23556080?v=4" width="110px;"/><br /><sub>Marc Bartelt</sub>](https://github.com/marcquark)<br />[💻](https://github.com/snipe/snipe-it/commits?author=marcquark "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/18286893?v=4" width="110px;"/><br /><sub>manu-crealytics</sub>](https://github.com/manu-crealytics)<br />[💻](https://github.com/snipe/snipe-it/commits?author=manu-crealytics "Code") | [<img src="https://avatars.githubusercontent.com/u/18245993?v=4" width="110px;"/><br /><sub>Konstantin Köhring</sub>](https://www.galaxy102.de/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Galaxy102 "Code") | [<img src="https://avatars.githubusercontent.com/u/685167?v=4" width="110px;"/><br /><sub>Deloz</sub>](https://deloz.net/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=deloz "Code") | [<img src="https://avatars.githubusercontent.com/u/2682426?v=4" width="110px;"/><br /><sub>Martin Berg</sub>](https://github.com/mbrrg)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mbrrg "Code") | [<img src="https://avatars.githubusercontent.com/u/3694534?v=4" width="110px;"/><br /><sub>Richard Schwab</sub>](https://github.com/Nothing4You)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Nothing4You "Code") | [<img src="https://avatars.githubusercontent.com/u/8959676?v=4" width="110px;"/><br /><sub>Rick Heil</sub>](https://rickheil.com/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=rickheil "Code") | [<img src="https://avatars.githubusercontent.com/u/397106?v=4" width="110px;"/><br /><sub>Ross Crawford-d'Heureuse</sub>](https://github.com/rosscdh)<br />[💻](https://github.com/snipe/snipe-it/commits?author=rosscdh "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/1621107?v=4" width="110px;"/><br /><sub>Ryan McGuire</sub>](https://github.com/McG800)<br />[💻](https://github.com/snipe/snipe-it/commits?author=McG800 "Code") | [<img src="https://avatars.githubusercontent.com/u/77835667?v=4" width="110px;"/><br /><sub>SBrown2021</sub>](https://github.com/SBrown2021)<br />[💻](https://github.com/snipe/snipe-it/commits?author=SBrown2021 "Code") | [<img src="https://avatars.githubusercontent.com/u/8780913?v=4" width="110px;"/><br /><sub>Serkan</sub>](https://github.com/serkanerip)<br />[💻](https://github.com/snipe/snipe-it/commits?author=serkanerip "Code") | [<img src="https://avatars.githubusercontent.com/u/63188620?v=4" width="110px;"/><br /><sub>Shanks</sub>](https://www.yudelei.com/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Shankschn "Code") | [<img src="https://avatars.githubusercontent.com/u/198525698?v=4" width="110px;"/><br /><sub>cendai-mis</sub>](https://github.com/cendai-mis)<br />[💻](https://github.com/snipe/snipe-it/commits?author=cendai-mis "Code") | [<img src="https://avatars.githubusercontent.com/u/8724583?v=4" width="110px;"/><br /><sub>Shaun McPeck</sub>](https://smcpeck.github.io/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=smcpeck "Code") | [<img src="https://avatars.githubusercontent.com/u/1378836?v=4" width="110px;"/><br /><sub>Stephen</sub>](https://github.com/snazy2000)<br />[💻](https://github.com/snipe/snipe-it/commits?author=snazy2000 "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/4462739?v=4" width="110px;"/><br /><sub>Steven</sub>](http://nevets82.github.io/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Nevets82 "Code") | [<img src="https://avatars.githubusercontent.com/u/29017267?v=4" width="110px;"/><br /><sub>Mateus Villar</sub>](https://mateusvillar.com/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Mateus-Romera "Code") | [<img src="https://avatars.githubusercontent.com/u/12749393?v=4" width="110px;"/><br /><sub>Matthew Zackschewski</sub>](https://github.com/mzack5020)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mzack5020 "Code") | [<img src="https://avatars.githubusercontent.com/u/12660103?v=4" width="110px;"/><br /><sub>Matthias Frei</sub>](https://www.frei.media/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=firefrei "Code") | [<img src="https://avatars.githubusercontent.com/u/824840?v=4" width="110px;"/><br /><sub>Nenad Ticaric</sub>](https://github.com/nticaric)<br />[💻](https://github.com/snipe/snipe-it/commits?author=nticaric "Code") | [<img src="https://avatars.githubusercontent.com/u/706439?v=4" width="110px;"/><br /><sub>Nikolay Didenko</sub>](https://github.com/Scorcher)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Scorcher "Code") | [<img src="https://avatars.githubusercontent.com/u/5457236?v=4" width="110px;"/><br /><sub>Nuno Maduro</sub>](https://nunomaduro.com/sponsorships)<br />[💻](https://github.com/snipe/snipe-it/commits?author=nunomaduro "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/8883074?v=4" width="110px;"/><br /><sub>Oliver Walerys</sub>](https://tektikhq.com/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=owalerys "Code") | [<img src="https://avatars.githubusercontent.com/u/3102039?v=4" width="110px;"/><br /><sub>R. Christian McDonald</sub>](https://keybase.io/rcmcdonald91)<br />[💻](https://github.com/snipe/snipe-it/commits?author=rcmcdonald91 "Code") | [<img src="https://avatars.githubusercontent.com/u/1525581?v=4" width="110px;"/><br /><sub>nix</sub>](https://nnix.net/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=nixn "Code") | [<img src="https://avatars.githubusercontent.com/u/55462380?v=4" width="110px;"/><br /><sub>octobunny</sub>](https://github.com/octobunny)<br />[💻](https://github.com/snipe/snipe-it/commits?author=octobunny "Code") | [<img src="https://avatars.githubusercontent.com/u/8558670?v=4" width="110px;"/><br /><sub>Ryan</sub>](https://github.com/sreyemnayr)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sreyemnayr "Code") | [<img src="https://avatars.githubusercontent.com/u/1501022?v=4" width="110px;"/><br /><sub>p3nj</sub>](https://benji.ltd/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=p3nj "Code") | [<img src="https://avatars.githubusercontent.com/u/6201617?v=4" width="110px;"/><br /><sub>Tim White</sub>](https://github.com/timwsuqld)<br />[💻](https://github.com/snipe/snipe-it/commits?author=timwsuqld "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/22473767?v=4" width="110px;"/><br /><sub>yannikp</sub>](https://github.com/yannikp)<br />[💻](https://github.com/snipe/snipe-it/commits?author=yannikp "Code") | [<img src="https://avatars.githubusercontent.com/u/20525448?v=4" width="110px;"/><br /><sub>victoria</sub>](https://github.com/viclou)<br />[💻](https://github.com/snipe/snipe-it/commits?author=viclou "Code") | [<img src="https://avatars.githubusercontent.com/u/40685314?v=4" width="110px;"/><br /><sub>Valentyn Tulub</sub>](https://github.com/valentyntu)<br />[💻](https://github.com/snipe/snipe-it/commits?author=valentyntu "Code") | [<img src="https://avatars.githubusercontent.com/u/864520?v=4" width="110px;"/><br /><sub>Wouter van Os</sub>](http://wouter0100.nl/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Wouter0100 "Code") | [<img src="https://avatars.githubusercontent.com/u/3946540?v=4" width="110px;"/><br /><sub>Wyatt Teeter</sub>](https://www.linkedin.com/in/wyatt-teeter)<br />[💻](https://github.com/snipe/snipe-it/commits?author=xWyatt "Code") | [<img src="https://avatars.githubusercontent.com/u/1596124?v=4" width="110px;"/><br /><sub>Yorick Terweijden</sub>](https://github.com/terwey)<br />[💻](https://github.com/snipe/snipe-it/commits?author=terwey "Code") | [<img src="https://avatars.githubusercontent.com/u/69298836?v=4" width="110px;"/><br /><sub>bmkalle</sub>](https://github.com/bmkalle)<br />[💻](https://github.com/snipe/snipe-it/commits?author=bmkalle "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/28403467?v=4" width="110px;"/><br /><sub>bricelabelle</sub>](https://github.com/bricelabelle)<br />[💻](https://github.com/snipe/snipe-it/commits?author=bricelabelle "Code") | [<img src="https://avatars.githubusercontent.com/u/97770090?v=4" width="110px;"/><br /><sub>corydlamb</sub>](https://github.com/corydlamb)<br />[💻](https://github.com/snipe/snipe-it/commits?author=corydlamb "Code") | [<img src="https://avatars.githubusercontent.com/u/1154133?v=4" width="110px;"/><br /><sub>Diogenes S. Jesus</sub>](http://twitter.com/splash)<br />[💻](https://github.com/snipe/snipe-it/commits?author=splashx "Code") | [<img src="https://avatars.githubusercontent.com/u/5826629?v=4" width="110px;"/><br /><sub>D M</sub>](https://github.com/dkmansion)<br />[💻](https://github.com/snipe/snipe-it/commits?author=dkmansion "Code") | [<img src="https://avatars.githubusercontent.com/u/14837699?v=4" width="110px;"/><br /><sub>Dustin B</sub>](https://github.com/Jarli01)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Jarli01 "Code") | [<img src="https://avatars.githubusercontent.com/u/348344?v=4" width="110px;"/><br /><sub>Fabian Grutschus</sub>](https://github.com/fabiang)<br />[💻](https://github.com/snipe/snipe-it/commits?author=fabiang "Code") | [<img src="https://avatars.githubusercontent.com/u/1491053?v=4" width="110px;"/><br /><sub>MelonSmasher</sub>](https://github.com/MelonSmasher)<br />[💻](https://github.com/snipe/snipe-it/commits?author=MelonSmasher "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/80526133?v=4" width="110px;"/><br /><sub>AlexanderWPapyrus</sub>](https://github.com/AlexanderWPapyrus)<br />[💻](https://github.com/snipe/snipe-it/commits?author=AlexanderWPapyrus "Code") | [<img src="https://avatars.githubusercontent.com/u/306231?v=4" width="110px;"/><br /><sub>Alexandr Hacicheant</sub>](https://github.com/disc)<br />[💻](https://github.com/snipe/snipe-it/commits?author=disc "Code") | [<img src="https://avatars.githubusercontent.com/u/3032891?v=4" width="110px;"/><br /><sub>Hex</sub>](https://hex128.io/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=hex128 "Code") | [<img src="https://avatars.githubusercontent.com/u/8697942?v=4" width="110px;"/><br /><sub>Arunas Skirius</sub>](https://github.com/arukompas)<br />[💻](https://github.com/snipe/snipe-it/commits?author=arukompas "Code") | [<img src="https://avatars.githubusercontent.com/u/104396?v=4" width="110px;"/><br /><sub>Ben Periton</sub>](https://github.com/benperiton)<br />[💻](https://github.com/snipe/snipe-it/commits?author=benperiton "Code") | [<img src="https://avatars.githubusercontent.com/u/11906832?v=4" width="110px;"/><br /><sub>Byron Wolfman</sub>](https://wolfman.dev/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=byronwolfman "Code") | [<img src="https://avatars.githubusercontent.com/u/56485508?v=4" width="110px;"/><br /><sub>Calvin</sub>](https://github.com/CalvinSchwartz)<br />[💻](https://github.com/snipe/snipe-it/commits?author=CalvinSchwartz "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/181059?v=4" width="110px;"/><br /><sub>Juan Font</sub>](https://github.com/juanfont)<br />[💻](https://github.com/snipe/snipe-it/commits?author=juanfont "Code") | [<img src="https://avatars.githubusercontent.com/u/13137708?v=4" width="110px;"/><br /><sub>Juho Taipale</sub>](https://github.com/juhotaipale)<br />[💻](https://github.com/snipe/snipe-it/commits?author=juhotaipale "Code") | [<img src="https://avatars.githubusercontent.com/u/1007419?v=4" width="110px;"/><br /><sub>Korvin Szanto</sub>](https://github.com/KorvinSzanto)<br />[💻](https://github.com/snipe/snipe-it/commits?author=KorvinSzanto "Code") | [<img src="https://avatars.githubusercontent.com/u/8513053?v=4" width="110px;"/><br /><sub>Lewis Foster</sub>](https://lewisfoster.foo/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sniff122 "Code") | [<img src="https://avatars.githubusercontent.com/u/33877541?v=4" width="110px;"/><br /><sub>Logan Swartzendruber</sub>](https://github.com/loganswartz)<br />[💻](https://github.com/snipe/snipe-it/commits?author=loganswartz "Code") | [<img src="https://avatars.githubusercontent.com/u/1156208?v=4" width="110px;"/><br /><sub>Lorenzo P.</sub>](https://github.com/lopezio)<br />[💻](https://github.com/snipe/snipe-it/commits?author=lopezio "Code") | [<img src="https://avatars.githubusercontent.com/u/33946590?v=4" width="110px;"/><br /><sub>Lukas Jung</sub>](https://github.com/m4us1ne)<br />[💻](https://github.com/snipe/snipe-it/commits?author=m4us1ne "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/10965027?v=4" width="110px;"/><br /><sub>Ellie</sub>](https://leafedfox.xyz/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=LeafedFox "Code") | [<img src="https://avatars.githubusercontent.com/u/20960555?v=4" width="110px;"/><br /><sub>GA Stamper</sub>](https://github.com/gastamper)<br />[💻](https://github.com/snipe/snipe-it/commits?author=gastamper "Code") | [<img src="https://avatars.githubusercontent.com/u/206553556?v=4" width="110px;"/><br /><sub>Guillaume Lefranc</sub>](https://github.com/gl-pup)<br />[💻](https://github.com/snipe/snipe-it/commits?author=gl-pup "Code") | [<img src="https://avatars.githubusercontent.com/u/733892?v=4" width="110px;"/><br /><sub>Hajo Möller</sub>](https://github.com/dasjoe)<br />[💻](https://github.com/snipe/snipe-it/commits?author=dasjoe "Code") | [<img src="https://avatars.githubusercontent.com/u/3420063?v=4" width="110px;"/><br /><sub>Istvan Basa</sub>](https://github.com/pottom)<br />[💻](https://github.com/snipe/snipe-it/commits?author=pottom "Code") | [<img src="https://avatars.githubusercontent.com/u/810824?v=4" width="110px;"/><br /><sub>JJ Asghar</sub>](https://jjasghar.github.io/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jjasghar "Code") | [<img src="https://avatars.githubusercontent.com/u/40404495?v=4" width="110px;"/><br /><sub>James E. Msenga</sub>](https://github.com/JemCdo)<br />[💻](https://github.com/snipe/snipe-it/commits?author=JemCdo "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/6865786?v=4" width="110px;"/><br /><sub>Jan Felix Wiebe</sub>](https://github.com/jfwiebe)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jfwiebe "Code") | [<img src="https://avatars.githubusercontent.com/u/43412008?v=4" width="110px;"/><br /><sub>Jo Drexl</sub>](https://www.nfon.com/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=drexljo "Code") | [<img src="https://avatars.githubusercontent.com/u/4807843?v=4" width="110px;"/><br /><sub>Austin Sasko</sub>](https://github.com/austinsasko)<br />[💻](https://github.com/snipe/snipe-it/commits?author=austinsasko "Code") | [<img src="https://avatars.githubusercontent.com/u/4875039?v=4" width="110px;"/><br /><sub>Jasson</sub>](http://jassoncordones.github.io)<br />[💻](https://github.com/snipe/snipe-it/commits?author=JassonCordones "Code") |
 <!-- ALL-CONTRIBUTORS-LIST:END -->

 This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome!
--- a/4
+++ b/4
@@ -2,7 +2,7 @@ FROM ubuntu:24.04
 LABEL maintainer="Brady Wetherington <bwetherington@grokability.com>"

 # No need to add `apt-get clean` here, reference:
-# - https://github.com/snipe/snipe-it/pull/9201
+# - https://github.com/grokability/snipe-it/pull/9201
 # - https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#apt-get

 RUN export DEBIAN_FRONTEND=noninteractive; \
@@ -110,7 +110,7 @@ COPY --from=composer:latest /usr/bin/composer /usr/bin/composer

 # Get dependencies
 USER docker
-RUN composer install --no-dev --working-dir=/var/www/html
+RUN COMPOSER_CACHE_DIR=/dev/null composer install --no-dev --working-dir=/var/www/html && rm -rf /var/www/html/vendor/*/*/.git
 USER root

 ############### APPLICATION INSTALL/INIT #################
--- a/Dockerfile.fpm-alpine
+++ b/Dockerfile.fpm-alpine
@@ -70,7 +70,7 @@ COPY --from=composer /usr/bin/composer /usr/local/bin
 ARG COMPOSER_ALLOW_SUPERUSER=1
 RUN set -eux; \
 # Download and extract snipeit tarball
-	curl -o snipeit.tar.gz -fL "https://github.com/snipe/snipe-it/archive/v$SNIPEIT_RELEASE.tar.gz"; \
+	curl -o snipeit.tar.gz -fL "https://github.com/grokability/snipe-it/archive/v$SNIPEIT_RELEASE.tar.gz"; \
 	tar -xzf snipeit.tar.gz --strip-components=1 -C /var/www/html/; \
 	rm snipeit.tar.gz; \
 # Install composer php dependencies
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-![snipe-it-by-grok](https://github.com/snipe/snipe-it/assets/197404/b515673b-c7c8-4d9a-80f5-9fa58829a602)
+![snipe-it-by-grok](https://github.com/grokability/snipe-it/assets/197404/b515673b-c7c8-4d9a-80f5-9fa58829a602)

-[![Crowdin](https://d322cqt584bo4o.cloudfront.net/snipe-it/localized.svg)](https://crowdin.com/project/snipe-it) [![Docker Pulls](https://img.shields.io/docker/pulls/snipe/snipe-it.svg)](https://hub.docker.com/r/snipe/snipe-it/) [![Codacy Badge](https://app.codacy.com/project/badge/Grade/553ce52037fc43ea99149785afcfe641)](https://app.codacy.com/gh/snipe/snipe-it/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade) [![Tests](https://github.com/snipe/snipe-it/actions/workflows/tests.yml/badge.svg)](https://github.com/snipe/snipe-it/actions/workflows/tests.yml)
+[![Crowdin](https://d322cqt584bo4o.cloudfront.net/snipe-it/localized.svg)](https://crowdin.com/project/snipe-it) [![Docker Pulls](https://img.shields.io/docker/pulls/snipe/snipe-it.svg)](https://hub.docker.com/r/snipe/snipe-it/) [![Codacy Badge](https://app.codacy.com/project/badge/Grade/804dd1beb14a41f38810ab77d64fc4fc)](https://app.codacy.com/gh/grokability/snipe-it/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade) [![Tests](https://github.com/grokability/snipe-it/actions/workflows/tests.yml/badge.svg)](https://github.com/grokability/snipe-it/actions/workflows/tests.yml)
 [![All Contributors](https://img.shields.io/badge/all_contributors-331-orange.svg?style=flat-square)](#contributing) [![Discord](https://badgen.net/badge/icon/discord?icon=discord&label)](https://discord.gg/yZFtShAcKk)

 ## Snipe-IT - Open Source Asset Management System
@@ -9,7 +9,7 @@ This is a FOSS project for asset management in IT Operations. Knowing who has wh

 It is built on [Laravel 11](http://laravel.com).

-Snipe-IT is actively developed and we [release quite frequently](https://github.com/snipe/snipe-it/releases). ([Check out the live demo here](https://snipeitapp.com/demo/).)
+Snipe-IT is actively developed and we [release quite frequently](https://github.com/grokability/snipe-it/releases). ([Check out the live demo here](https://snipeitapp.com/demo/).)

 > [!TIP]
 > __This is web-based software__. This means there is no executable file (aka no .exe files), and it must be run on a web server and accessed through a web browser. It runs on any Mac OSX, any flavor of Linux, as well as Windows, and we have a [Docker image](https://snipe-it.readme.io/docs/docker) available if that's what you're into.
@@ -44,7 +44,7 @@ For help using Snipe-IT, check out the [user's manual](https://snipe-it.readme.i
 -----
 ### Bug Reports & Feature Requests

-Feel free to check out the [GitHub Issues for this project](https://github.com/snipe/snipe-it/issues) to open a bug report or see what open issues you can help with. Please search through existing issues (open *and* closed) to see if your question has already been answered before opening a new issue.
+Feel free to check out the [GitHub Issues for this project](https://github.com/grokability/snipe-it/issues) to open a bug report or see what open issues you can help with. Please search through existing issues (open *and* closed) to see if your question has already been answered before opening a new issue.

 > [!IMPORTANT]  
 > **PLEASE see the [Getting Help Guidelines](https://snipe-it.readme.io/docs/getting-help) and [Common Issues](https://snipe-it.readme.io/docs/common-issues) before opening a ticket, and be sure to complete all of the questions in the Github Issue template to help us to help you as quickly as possible.**
@@ -133,9 +133,15 @@ The ERD is available [online here](https://drawsql.app/templates/snipe-it).

 Be sure to check out all of the [amazing people](CONTRIBUTORS.md) that have contributed to Snipe-IT over the years!

+-----
+
+### Star History
+
+[![Star History Chart](https://api.star-history.com/svg?repos=grokability/snipe-it&type=Date)](https://www.star-history.com/#grokability/snipe-it&Date)
+
 ------
 ### Announcement List

-To be notified of important news (such as new releases, security advisories, etc), [sign up for our list](http://eepurl.com/XyZKz). We'll never sell or give away your info, and we'll only email you when it's important.
-
+To be notified of important news (such as new releases, security advisories, etc), [sign up for our list](http://eepurl.com/XyZKz). We'll never sell or give away your info, and we'll only email you when it's important. 

+We also usually make smaller announcements on our social accounts, our Discord, and our blog, so be sure to subscribe to those if you're looking for more granular announcements.
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -11,6 +11,7 @@ make it impossible to backport security fixes on older versions.

 | Version | Supported          |
 |---------| ------------------ |
+| 8.x     | :white_check_mark: |
 | 7.x     | :white_check_mark: |
 | 6.x     | :x:                |
 | 5.1.x   | :x:                |
--- a/2
+++ b/2
@@ -1,7 +1,7 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :

-SNIPEIT_SH_URL= "https://raw.githubusercontent.com/snipe/snipe-it/master/snipeit.sh"
+SNIPEIT_SH_URL= "https://raw.githubusercontent.com/grokability/snipe-it/master/snipeit.sh"
 NETWORK_BRIDGE= "en0: Wi-Fi (AirPort)"

 Vagrant.configure("2") do |config|
--- a/app.json
+++ b/app.json
@@ -6,7 +6,7 @@
      "it asset"
    ],
    "website": "https://snipeitapp.com/",
-    "repository": "https://github.com/snipe/snipe-it",
+    "repository": "https://github.com/grokability/snipe-it",
    "logo": "https://pbs.twimg.com/profile_images/976748875733020672/K-HnZCCK_400x400.jpg",
    "success_url": "/setup",
    "env": {
--- a/app/Console/Commands/DisableSAML.php
+++ b/app/Console/Commands/DisableSAML.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\Setting;
+use Illuminate\Console\Command;
+
+class DisableSAML extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'snipeit:saml-disable';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'This is a rescue command that can be used to turn off SAML settings in the event that you managed to lock yourself out using bad SAML settings.';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        if ($this->confirm("\n****************************************************\nThis will disable SAML support. You will not be able \nto login with an account that does not exist \nlocally in the Snipe-IT local database. \n****************************************************\n\nDo you wish to continue? [y|N]")) {
+            $setting = Setting::getSettings();
+            $setting->saml_enabled = 0;
+            if ($setting->save()) {
+                $this->info('SAML has been set to disabled.');
+            } else {
+                $this->info('Unable to disable SAML.');
+            }
+        } else {
+            $this->info('Canceled. No actions taken.');
+        }
+    }
+}
--- a/app/Console/Commands/GeneratePersonalAccessToken.php
+++ b/app/Console/Commands/GeneratePersonalAccessToken.php
@@ -2,11 +2,9 @@

 namespace App\Console\Commands;

-use App\Helpers\Helper;
 use Illuminate\Console\Command;
 use App\Models\User;
 use Laravel\Passport\TokenRepository;
-use Illuminate\Contracts\Validation\Factory as ValidationFactory;
 use Illuminate\Support\Facades\DB;

 class GeneratePersonalAccessToken extends Command
@@ -43,9 +41,8 @@ class GeneratePersonalAccessToken extends Command
     *
     * @return void
     */
-    public function __construct(TokenRepository $tokenRepository, ValidationFactory $validation)
+    public function __construct(TokenRepository $tokenRepository)
    {
-        $this->validation = $validation;
        $this->tokenRepository = $tokenRepository;
        parent::__construct();
    }
@@ -76,7 +73,7 @@ class GeneratePersonalAccessToken extends Command

            } else {

-                $this->warn('Your API Token has been created. Be sure to copy this token now, as it will not be accessible again.');
+                $this->warn('Your API Token has been created. Be sure to copy this token now, as it WILL NOT be accessible again.');

                if ($token = DB::table('oauth_access_tokens')->where('user_id', '=', $user->id)->where('name','=',$accessTokenName)->orderBy('created_at', 'desc')->first()) {
                    $this->info('API Token ID: '.$token->id);
--- a/app/Console/Commands/RestoreFromBackup.php
+++ b/app/Console/Commands/RestoreFromBackup.php
@@ -249,6 +249,7 @@ class RestoreFromBackup extends Command
            'storage/private_uploads/consumables',
            'storage/private_uploads/eula-pdfs',
            'storage/private_uploads/imports',
+            'storage/private_uploads/locations',
            'storage/private_uploads/licenses',
            'storage/private_uploads/signatures',
            'storage/private_uploads/users',
@@ -289,6 +290,7 @@ class RestoreFromBackup extends Command

        $interesting_files = [];
        $boring_files = [];
+        $unsafe_files = [];

        for ($i = 0; $i < $za->numFiles; $i++) {
            $stat_results = $za->statIndex($i);
@@ -328,7 +330,8 @@ class RestoreFromBackup extends Command
                }
            }
            $good_extensions = ['png', 'gif', 'jpg', 'svg', 'jpeg', 'doc', 'docx', 'pdf', 'txt',
-                'zip', 'rar', 'xls', 'xlsx', 'lic', 'xml', 'rtf', 'webp', 'key', 'ico',];
+                                'zip', 'rar', 'xls', 'xlsx', 'lic', 'xml', 'rtf', 'webp', 'key', 'ico', 'avif'
+            ];
            foreach (array_merge($private_files, $public_files) as $file) {
                $has_wildcard = (strpos($file, '*') !== false);
                if ($has_wildcard) {
@@ -338,7 +341,9 @@ class RestoreFromBackup extends Command
                if ($last_pos !== false) {
                    $extension = strtolower(pathinfo($raw_path, PATHINFO_EXTENSION));
                    if (!in_array($extension, $good_extensions)) {
-                        $this->warn('Potentially unsafe file ' . $raw_path . ' is being skipped');
+                        // gathering potentially unsafe files here to return at exit
+                        $unsafe_files[] = $raw_path;
+                        Log::debug('Potentially unsafe file '.$raw_path.' is being skipped');
                        $boring_files[] = $raw_path;
                        continue 2;
                    }
@@ -372,6 +377,7 @@ class RestoreFromBackup extends Command
        if ($this->option('sanitize-guess-prefix')) {
            $prefix = SQLStreamer::guess_prefix($sql_contents);
            $this->line($prefix);
+
            return $this->info("Re-run this command with '--sanitize-with-prefix=".$prefix."' to see an attempt to sanitize your SQL.");
        }

@@ -505,6 +511,11 @@ class RestoreFromBackup extends Command
        } else {
            $this->info(count($interesting_files).' files were succesfully transferred');
        }
+        if (count($unsafe_files) > 0) {
+            foreach ($unsafe_files as $unsafe_file) {
+                $this->warn('Potentially unsafe file '.$unsafe_file.' was skipped');
+            }
+        }
        foreach ($boring_files as $boring_file) {
            $this->warn($boring_file.' was skipped.');
        }
--- a/app/Console/Commands/TestLocationsFMCS.php
+++ b/app/Console/Commands/TestLocationsFMCS.php
@@ -27,7 +27,7 @@ class TestLocationsFMCS extends Command
    public function handle()
    {
        $this->info('This script checks for company ID inconsistencies if Full Multiple Company Support with scoped locations will be used.');
-        $this->info('This could take few moments if have a very large dataset.');
+        $this->info('This could take a few moments if have a very large dataset.');
        $this->newLine();

        // if parameter location_id is set, only test this location
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -19,7 +19,7 @@ class Kernel extends ConsoleKernel
     */
    protected function schedule(Schedule $schedule)
    {
-        if(Setting::getSettings()->alerts_enabled === 1) {
+        if(Setting::getSettings()?->alerts_enabled === 1) {
            $schedule->command('snipeit:inventory-alerts')->daily();
            $schedule->command('snipeit:expiring-alerts')->daily();
            $schedule->command('snipeit:expected-checkin')->daily();
--- a/app/Helpers/Helper.php
+++ b/app/Helpers/Helper.php
@@ -722,8 +722,8 @@ class Helper
        // The check and message that the user is still using the deprecated version
        $deprecations = [
            'ms_teams_deprecated' => array(
-            'check' => !Str::contains(Setting::getSettings()->webhook_endpoint, 'workflows'),
-            'message' => 'The Microsoft Teams webhook URL being used will be deprecated Jan 31st, 2025. <a class="btn btn-primary" href="' . route('settings.slack.index') . '">Change webhook endpoint</a>'),
+            'check' => !Str::contains(Setting::getSettings()->webhook_endpoint, 'workflows') && (Setting::getSettings()->webhook_selected === 'microsoft'),
+            'message' => 'The Microsoft Teams webhook URL being used will be deprecated Dec 31st, 2025. <a class="btn btn-primary" href="' . route('settings.slack.index') . '">Change webhook endpoint</a>'),
        ];

        // if item of concern is being used and its being used with the deprecated values return the notification array.
@@ -896,6 +896,12 @@ class Helper
    public static function selectedPermissionsArray($permissions, $selected_arr = [])
    {
        $permissions_arr = [];
+        if (is_array($permissions)) {
+            $permissions = json_encode($permissions);
+        }
+
+        // Set default to empty JSON if the value is null
+        $permissions = json_decode($permissions ?? '{}', JSON_OBJECT_AS_ARRAY);

        foreach ($permissions as $permission) {
            for ($x = 0; $x < count($permission); $x++) {
@@ -906,13 +912,13 @@ class Helper
                    if (is_array($selected_arr)) {

                        if (array_key_exists($permission_name, $selected_arr)) {
-                            $permissions_arr[$permission_name] = $selected_arr[$permission_name];
+                            $permissions_arr[$permission_name] = (int) $selected_arr[$permission_name];
                        } else {
-                            $permissions_arr[$permission_name] = '0';
+                            $permissions_arr[$permission_name] = 0;
                        }

                    } else {
-                        $permissions_arr[$permission_name] = '0';
+                        $permissions_arr[$permission_name] = 0;
                    }
                }
            }
@@ -1480,6 +1486,8 @@ class Helper

        $redirect_option = Session::get('redirect_option');
        $checkout_to_type = Session::get('checkout_to_type');
+        $checkedInFrom = Session::get('checkedInFrom');
+        $other_redirect = Session::get('other_redirect');

        // return to index
        if ($redirect_option == 'index') {
@@ -1521,13 +1529,23 @@ class Helper
        if ($redirect_option == 'target') {
            switch ($checkout_to_type) {
                case 'user':
-                    return route('users.show', $request->assigned_user);
+                    return route('users.show', $request->assigned_user ?? $checkedInFrom);
                case 'location':
-                    return route('locations.show', $request->assigned_location);
+                    return route('locations.show', $request->assigned_location ?? $checkedInFrom);
                case 'asset':
-                    return route('hardware.show', $request->assigned_asset);
+                    return route('hardware.show', $request->assigned_asset ?? $checkedInFrom);
            }
        }
+
+        // return to somewhere else
+        if ($redirect_option == 'other_redirect') {
+            switch ($other_redirect) {
+                case 'audit':
+                    return route('assets.audit.due');
+            }
+
+        }
+
        return redirect()->back()->with('error', trans('admin/hardware/message.checkout.error'));
    }

@@ -1555,6 +1573,11 @@ class Helper
            $locations = Location::all();
        }

+        // Bail out early if there are no locations
+        if ($locations->count() == 0) {
+            return [];
+        }
+
        foreach($locations as $location) {
            // in case of an update of a single location, use the newly requested company_id
            if ($new_company_id) {
@@ -1593,14 +1616,17 @@ class Helper
                        $items = collect([])->push($location->$keyword);
                    }

+                    $count = 0;
                    foreach ($items as $item) {

+
                        if ($item && $item->company_id != $location_company) {
+
                            $mismatched[] = [
                                    class_basename(get_class($item)),
                                    $item->id,
                                    $item->name ?? $item->asset_tag ?? $item->serial ?? $item->username,
-                                    str_replace('App\\Models\\', '', $item->assigned_type) ?? null,
+                                    $item->assigned_type ? str_replace('App\\Models\\', '', $item->assigned_type) : null,
                                    $item->company_id ?? null,
                                    $item->company->name ?? null,
 //                                    $item->defaultLoc->id ?? null,
@@ -1612,6 +1638,15 @@ class Helper
                                    $location_company ?? null,
                                ];

+                            $count++;
+
+                            // Bail early if this is not being run via artisan
+                            if ((!$artisan) && ($count > 0)) {
+                                return $mismatched;
+                            }
+
+
+
                        }
                    }
                }
--- a/app/Http/Controllers/Accessories/AccessoriesController.php
+++ b/app/Http/Controllers/Accessories/AccessoriesController.php
@@ -184,15 +184,15 @@ class AccessoriesController extends Controller
     */
    public function destroy($accessoryId) : RedirectResponse
    {
-        if (is_null($accessory = Accessory::find($accessoryId))) {
+        if (is_null($accessory = Accessory::withCount('checkouts as checkouts_count')->find($accessoryId))) {
            return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.not_found'));
        }

        $this->authorize($accessory);


-        if ($accessory->hasUsers() > 0) {
-            return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.assoc_users', ['count'=> $accessory->hasUsers()]));
+        if ($accessory->checkouts_count > 0) {
+            return redirect()->route('accessories.index')->with('error', trans('admin/accessories/general.delete_disabled'));
        }

        if ($accessory->image) {
@@ -220,7 +220,10 @@ class AccessoriesController extends Controller
     */
    public function show(Accessory $accessory) : View | RedirectResponse
    {
-        $accessory = Accessory::withCount('checkouts as checkouts_count')->find($accessory->id);
+        $accessory->loadCount('checkouts as checkouts_count');
+
+        $accessory->load(['adminuser' => fn($query) => $query->withTrashed()]);
+
        $this->authorize('view', $accessory);
        return view('accessories.view', compact('accessory'));
    }
--- a/app/Http/Controllers/Accessories/AccessoryCheckinController.php
+++ b/app/Http/Controllers/Accessories/AccessoryCheckinController.php
@@ -7,7 +7,6 @@ use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
 use App\Models\Accessory;
 use App\Models\AccessoryCheckout;
-use App\Models\User;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 use \Illuminate\Contracts\View\View;
@@ -30,9 +29,17 @@ class AccessoryCheckinController extends Controller
        }

        $accessory = Accessory::find($accessory_user->accessory_id);
+
+        //based on what the accessory is checked out to the target redirect option will be displayed accordingly.
+        $target_option = match ($accessory_user->assigned_type) {
+            'App\Models\Asset' => trans('admin/hardware/form.redirect_to_type', ['type' => trans('general.asset')]),
+            'App\Models\Location' => trans('admin/hardware/form.redirect_to_type', ['type' => trans('general.location')]),
+            default => trans('admin/hardware/form.redirect_to_type', ['type' => trans('general.user')]),
+        };
        $this->authorize('checkin', $accessory);

-        return view('accessories/checkin', compact('accessory'))->with('backto', $backto);
+        return view('accessories/checkin', compact('accessory', 'target_option'))->with('backto', $backto);
+
    }

    /**
@@ -51,8 +58,14 @@ class AccessoryCheckinController extends Controller

        $accessory = Accessory::find($accessory_checkout->accessory_id);

-        $this->authorize('checkin', $accessory);
+        session()->put('checkedInFrom', $accessory_checkout->assigned_to);
+        session()->put('checkout_to_type', match ($accessory_checkout->assigned_type) {
+            'App\Models\User' => 'user',
+            'App\Models\Location' => 'location',
+            'App\Models\Asset' => 'asset',
+        });

+        $this->authorize('checkin', $accessory);
        $checkin_hours = date('H:i:s');
        $checkin_at = date('Y-m-d H:i:s');
        if ($request->filled('checkin_at')) {
--- a/app/Http/Controllers/Api/AccessoriesController.php
+++ b/app/Http/Controllers/Api/AccessoriesController.php
@@ -66,7 +66,7 @@ class AccessoriesController extends Controller
        }

        if ($request->filled('company_id')) {
-            $accessories->where('company_id', '=', $request->input('company_id'));
+            $accessories->where('accessories.company_id', '=', $request->input('company_id'));
        }

        if ($request->filled('category_id')) {
@@ -249,11 +249,11 @@ class AccessoriesController extends Controller
    public function destroy($id)
    {
        $this->authorize('delete', Accessory::class);
-        $accessory = Accessory::findOrFail($id);
+        $accessory = Accessory::withCount('checkouts as checkouts_count')->findOrFail($id);
        $this->authorize($accessory);

-        if ($accessory->hasUsers() > 0) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/accessories/message.assoc_users', ['count'=> $accessory->hasUsers()])));
+        if ($accessory->checkouts_count > 0) {
+            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/accessories/general.delete_disabled')));
        }

        $accessory->delete();
--- a/app/Http/Controllers/Api/AssetFilesController.php
+++ b/app/Http/Controllers/Api/AssetFilesController.php
@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Api;

 use App\Helpers\StorageHelper;
+use App\Http\Transformers\UploadedFilesTransformer;
 use Illuminate\Support\Facades\Storage;
 use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
@@ -13,6 +14,7 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Facades\Log;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 use Symfony\Component\HttpFoundation\BinaryFileResponse;
+use Illuminate\Http\Request;


 /**
@@ -72,33 +74,37 @@ class AssetFilesController extends Controller
     * @since [v6.0]
     * @author [T. Scarsbrook] [<snipe@scarzybrook.co.uk>]
     */
-    public function list($assetId = null) : JsonResponse
+    public function list(Asset $asset, Request $request) : JsonResponse | array
    {
-        // Start by checking if the asset being acted upon exists
-        if (! $asset = Asset::find($assetId)) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/hardware/message.does_not_exist')), 404);
-        }
-	
-	// the asset is valid
-        if (isset($asset->id)) {
-            $this->authorize('view', $asset);

-            // Check that there are some uploads on this asset that can be listed
-            if ($asset->uploads->count() > 0) {
-                $files = array();
-                foreach ($asset->uploads as $upload) {
-                    array_push($files, $upload);
-		}
-                // Give the list of files back to the user
-                return response()->json(Helper::formatStandardApiResponse('success', $files, trans('admin/hardware/message.upload.success')));
-            }
+        $this->authorize('view', $asset);

-	    // There are no files.
-            return response()->json(Helper::formatStandardApiResponse('success', array(), trans('admin/hardware/message.upload.success')));
+        $allowed_columns =
+            [
+                'id',
+                'filename',
+                'eol',
+                'notes',
+                'created_at',
+                'updated_at',
+            ];
+
+        $files = Actionlog::select('action_logs.*')->where('action_type', '=', 'uploaded')->where('item_type', '=', Asset::class)->where('item_id', '=', $asset->id);
+
+        if ($request->filled('search')) {
+            $files = $files->TextSearch($request->input('search'));
        }

-        // Send back an error message
-        return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/hardware/message.download.error')), 500);
+        // Make sure the offset and limit are actually integers and do not exceed system limits
+        $offset = ($request->input('offset') > $files->count()) ? $files->count() : abs($request->input('offset'));
+        $limit = app('api_limit_value');
+        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
+        $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at';
+        $files = $files->orderBy($sort, $order);
+
+        $files = $files->skip($offset)->take($limit)->get();
+        return (new UploadedFilesTransformer())->transformFiles($files, $files->count());
+
    }

    /**
@@ -111,12 +117,8 @@ class AssetFilesController extends Controller
     * @since [v6.0]
     * @author [T. Scarsbrook] [<snipe@scarzybrook.co.uk>]
     */
-    public function show($assetId = null, $fileId = null) : JsonResponse | StreamedResponse | Storage | StorageHelper | BinaryFileResponse
+    public function show(Asset $asset, $fileId = null) : JsonResponse | StreamedResponse | Storage | StorageHelper | BinaryFileResponse
    {
-        // Start by checking if the asset being acted upon exists
-        if (! $asset = Asset::find($assetId)) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/hardware/message.does_not_exist')), 404);
-        }

        // the asset is valid
        if (isset($asset->id)) {
@@ -164,12 +166,8 @@ class AssetFilesController extends Controller
     * @since [v6.0]
     * @author [T. Scarsbrook] [<snipe@scarzybrook.co.uk>]
     */
-    public function destroy($assetId = null, $fileId = null) : JsonResponse
+    public function destroy(Asset $asset, $fileId = null) : JsonResponse
    {
-        // Start by checking if the asset being acted upon exists
-        if (! $asset = Asset::find($assetId)) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/hardware/message.does_not_exist')), 404);
-        }

        $rel_path = 'private_uploads/assets';

@@ -179,12 +177,14 @@ class AssetFilesController extends Controller

            // Check for the file
            $log = Actionlog::find($fileId);
-	    if ($log) {
-                // Check the file actually exists, and delete it
-                if (Storage::exists($rel_path.'/'.$log->filename)) {
-                    Storage::delete($rel_path.'/'.$log->filename);
-		}
-		// Delete the record of the file
+
+                if ($log) {
+                        // Check the file actually exists, and delete it
+                        if (Storage::exists($rel_path.'/'.$log->filename)) {
+                            Storage::delete($rel_path.'/'.$log->filename);
+                }
+
+		        // Delete the record of the file
                $log->delete();

                // All deleting done - notify the user of success
--- a/app/Http/Controllers/Api/AssetModelFilesController.php
+++ b/app/Http/Controllers/Api/AssetModelFilesController.php
@@ -75,6 +75,11 @@ class AssetModelFilesController extends Controller
     */
    public function list($assetmodel_id) : JsonResponse | array
    {
+        // Start by checking if the asset being acted upon exists
+        if (! $assetModel = AssetModel::find($assetmodel_id)) {
+            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/models/message.does_not_exist')), 404);
+        }
+
            $assetmodel = AssetModel::with('uploads')->find($assetmodel_id);
            $this->authorize('view', $assetmodel);
            return (new AssetModelsTransformer)->transformAssetModelFiles($assetmodel, $assetmodel->uploads()->count());
--- a/app/Http/Controllers/Api/AssetsController.php
+++ b/app/Http/Controllers/Api/AssetsController.php
@@ -298,9 +298,15 @@ class AssetsController extends Controller
        if ($request->input('requestable') == 'true') {
            $assets->where('assets.requestable', '=', '1');
        }
-
+        
        if ($request->filled('model_id')) {
-            $assets->InModelList([$request->input('model_id')]);
+            // If model_id is already an array, just use it as-is
+            if (is_array($request->input('model_id'))) {
+                $assets->InModelList($request->input('model_id'));
+            } else {
+                // Otherwise, turn it into an array
+                $assets->InModelList([$request->input('model_id')]);
+            }
        }

        if ($request->filled('category_id')) {
@@ -436,12 +442,6 @@ class AssetsController extends Controller
            }]);
        }

-
-
-        /**
-         * Here we're just determining which Transformer (via $transformer) to use based on the 
-         * variables we set earlier on in this method - we default to AssetsTransformer.
-         */
        return (new $transformer)->transformAssets($assets, $total, $request);
    }

@@ -574,7 +574,12 @@ class AssetsController extends Controller
            'assets.assigned_to',
            'assets.assigned_type',
            'assets.status_id',
-        ])->with('model', 'assetstatus', 'assignedTo')->NotArchived();
+        ])->with('model', 'assetstatus', 'assignedTo')
+            ->NotArchived();
+
+        if ((Setting::getSettings()->full_multiple_companies_support=='1') &&  ($request->filled('companyId'))) {
+            $assets->where('assets.company_id', $request->input('companyId'));
+        }

        if ($request->filled('assetStatusType') && $request->input('assetStatusType') === 'RTD') {
            $assets = $assets->RTD();
@@ -584,7 +589,6 @@ class AssetsController extends Controller
            $assets = $assets->AssignedSearch($request->input('search'));
        }

-
        $assets = $assets->paginate(50);

        // Loop through and set some custom properties for the transformer to use.
@@ -697,7 +701,9 @@ class AssetsController extends Controller

            return response()->json(Helper::formatStandardApiResponse('success', $asset, trans('admin/hardware/message.create.success')));

-            return response()->json(Helper::formatStandardApiResponse('success', (new AssetsTransformer)->transformAsset($asset), trans('admin/hardware/message.create.success')));
+            // below is what we want the _eventual_ return to look like - in a more standardized format.
+            // return response()->json(Helper::formatStandardApiResponse('success', (new AssetsTransformer)->transformAsset($asset), trans('admin/hardware/message.create.success')));
+
        }

        return response()->json(Helper::formatStandardApiResponse('error', null, $asset->getErrors()), 200);
@@ -1135,8 +1141,8 @@ class AssetsController extends Controller
                }
            }

-            // Validate custom fields
-            Validator::make($asset->toArray(), $asset->customFieldValidationRules())->validate();
+            // Invoke the validation to see if the audit will complete successfully
+            $asset->setRules($asset->getRules() + $asset->customFieldValidationRules());

            // Validate the rest of the data before we turn off the event dispatcher
            if ($asset->isInvalid()) {
--- a/app/Http/Controllers/Api/CategoriesController.php
+++ b/app/Http/Controllers/Api/CategoriesController.php
@@ -56,7 +56,7 @@ class CategoriesController extends Controller
            'notes',
            ])
            ->with('adminuser')
-            ->withCount('accessories as accessories_count', 'consumables as consumables_count', 'components as components_count', 'licenses as licenses_count');
+            ->withCount('accessories as accessories_count', 'consumables as consumables_count', 'components as components_count', 'licenses as licenses_count', 'models as models_count');


        /*
@@ -212,7 +212,7 @@ class CategoriesController extends Controller
    public function destroy($id) : JsonResponse
    {
        $this->authorize('delete', Category::class);
-        $category = Category::withCount('assets as assets_count', 'accessories as accessories_count', 'consumables as consumables_count', 'components as components_count', 'licenses as licenses_count')->findOrFail($id);
+        $category = Category::withCount('assets as assets_count', 'accessories as accessories_count', 'consumables as consumables_count', 'components as components_count', 'licenses as licenses_count', 'models as models_count')->findOrFail($id);

        if (! $category->isDeletable()) {
            return response()->json(
--- a/app/Http/Controllers/Api/ComponentsController.php
+++ b/app/Http/Controllers/Api/ComponentsController.php
@@ -60,7 +60,7 @@ class ComponentsController extends Controller
        }

        if ($request->filled('company_id')) {
-            $components->where('company_id', '=', $request->input('company_id'));
+            $components->where('components.company_id', '=', $request->input('company_id'));
        }

        if ($request->filled('category_id')) {
--- a/app/Http/Controllers/Api/ConsumablesController.php
+++ b/app/Http/Controllers/Api/ConsumablesController.php
@@ -40,7 +40,7 @@ class ConsumablesController extends Controller
        }

        if ($request->filled('company_id')) {
-            $consumables->where('company_id', '=', $request->input('company_id'));
+            $consumables->where('consumables.company_id', '=', $request->input('company_id'));
        }

        if ($request->filled('category_id')) {
--- a/app/Http/Controllers/Api/GroupsController.php
+++ b/app/Http/Controllers/Api/GroupsController.php
@@ -76,7 +76,7 @@ class GroupsController extends Controller
        $this->authorize('superadmin');
        $group = new Group;
        // Get all the available permissions
-        $permissions = config('permissions');
+        $permissions = json_encode(config('permissions'));
        $groupPermissions = Helper::selectedPermissionsArray($permissions, $permissions);

        $group->name = $request->input('name');
--- a/app/Http/Controllers/Api/LicenseSeatsController.php
+++ b/app/Http/Controllers/Api/LicenseSeatsController.php
@@ -34,7 +34,7 @@ class LicenseSeatsController extends Controller
            if ($request->input('sort') == 'department') {
                $seats->OrderDepartments($order);
            } else {
-                $seats->orderBy('id', $order);
+                $seats->orderBy('updated_at', $order);
            }

            $total = $seats->count();
--- a/app/Http/Controllers/Api/ReportsController.php
+++ b/app/Http/Controllers/Api/ReportsController.php
@@ -5,6 +5,8 @@ namespace App\Http\Controllers\Api;
 use App\Http\Controllers\Controller;
 use App\Http\Transformers\ActionlogsTransformer;
 use App\Models\Actionlog;
+use App\Models\Company;
+use App\Models\Setting;
 use Illuminate\Http\Request;
 use Illuminate\Http\JsonResponse;

@@ -18,10 +20,11 @@ class ReportsController extends Controller
     */
    public function index(Request $request) : JsonResponse | array
    {
-        $this->authorize('reports.view');
+        $this->authorize('activity.view');

        $actionlogs = Actionlog::with('item', 'user', 'adminuser', 'target', 'location');

+
        if ($request->filled('search')) {
            $actionlogs = $actionlogs->TextSearch(e($request->input('search')));
        }
--- a/app/Http/Controllers/Api/UsersController.php
+++ b/app/Http/Controllers/Api/UsersController.php
@@ -339,6 +339,7 @@ class UsersController extends Controller
            $users = $users->where(function ($query) use ($request) {
                $query->SimpleNameSearch($request->get('search'))
                    ->orWhere('username', 'LIKE', '%'.$request->get('search').'%')
+                    ->orWhere('email', 'LIKE', '%'.$request->get('search').'%')
                    ->orWhere('employee_num', 'LIKE', '%'.$request->get('search').'%');
            });
        }
--- a/app/Http/Controllers/Assets/AssetCheckinController.php
+++ b/app/Http/Controllers/Assets/AssetCheckinController.php
@@ -14,6 +14,7 @@ use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Facades\Log;
 use \Illuminate\Contracts\View\View;
 use \Illuminate\Http\RedirectResponse;
+use Illuminate\Support\Facades\Validator;

 class AssetCheckinController extends Controller
 {
@@ -41,7 +42,19 @@ class AssetCheckinController extends Controller
            return redirect()->route('hardware.show', $asset->id)->with('error', trans('admin/hardware/general.model_invalid_fix'));
        }

-        return view('hardware/checkin', compact('asset'))
+        // Invoke the validation to see if the audit will complete successfully
+        $asset->setRules($asset->getRules() + $asset->customFieldValidationRules());
+
+        if ($asset->isInvalid()) {
+            return redirect()->route('hardware.edit', $asset)->withErrors($asset->getErrors());
+        }
+
+        $target_option = match ($asset->assigned_type) {
+            'App\Models\Asset' => trans('admin/hardware/form.redirect_to_type', ['type' => trans('general.asset_previous')]),
+            'App\Models\Location' => trans('admin/hardware/form.redirect_to_type', ['type' => trans('general.location')]),
+            default => trans('admin/hardware/form.redirect_to_type', ['type' => trans('general.user')]),
+        };
+        return view('hardware/checkin', compact('asset', 'target_option'))
            ->with('item', $asset)
            ->with('statusLabel_list', Helper::statusLabelList())
            ->with('backto', $backto)
@@ -75,9 +88,12 @@ class AssetCheckinController extends Controller

        $this->authorize('checkin', $asset);

-        if ($asset->assignedType() == Asset::USER) {
-            $user = $asset->assignedTo;
-        }
+        session()->put('checkedInFrom', $asset->assignedTo->id);
+        session()->put('checkout_to_type', match ($asset->assigned_type) {
+            'App\Models\User' => 'user',
+            'App\Models\Location' => 'location',
+            'App\Models\Asset' => 'asset',
+        });

        $asset->expected_checkin = null;
        $asset->last_checkin = now();
--- a/app/Http/Controllers/Assets/AssetCheckoutController.php
+++ b/app/Http/Controllers/Assets/AssetCheckoutController.php
@@ -12,6 +12,7 @@ use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Support\Facades\Session;
 use \Illuminate\Contracts\View\View;
 use \Illuminate\Http\RedirectResponse;
+use Illuminate\Support\Facades\Validator;

 class AssetCheckoutController extends Controller
 {
@@ -36,6 +37,14 @@ class AssetCheckoutController extends Controller
                ->with('error', trans('admin/hardware/general.model_invalid_fix'));
        }

+        // Invoke the validation to see if the audit will complete successfully
+        $asset->setRules($asset->getRules() + $asset->customFieldValidationRules());
+
+        if ($asset->isInvalid()) {
+            return redirect()->route('hardware.edit', $asset)->withErrors($asset->getErrors());
+        }
+
+        
        if ($asset->availableForCheckout()) {
            return view('hardware/checkout', compact('asset'))
                ->with('statusLabel_list', Helper::deployableStatusLabelList())
--- a/app/Http/Controllers/Assets/AssetsController.php
+++ b/app/Http/Controllers/Assets/AssetsController.php
@@ -351,11 +351,6 @@ class AssetsController extends Controller
            event(new CheckoutableCheckedIn($asset, $target, auth()->user(), 'Checkin on asset update with '.$status->getStatuslabelType().' status', date('Y-m-d H:i:s'), $originalValues));
        }

-        if ($asset->assigned_to == '') {
-            $asset->location_id = $request->input('rtd_location_id', null);
-        }
-
-
        if ($request->filled('image_delete')) {
            try {
                unlink(public_path().'/uploads/assets/'.$asset->image);
@@ -524,7 +519,7 @@ class AssetsController extends Controller
    {
        $settings = Setting::getSettings();

-        if (($settings->qr_code == '1') && ($settings->label2_2d_type !== 'none')) {
+        if ($settings->label2_2d_type !== 'none') {

            if ($asset) {
                $size = Helper::barcodeDimensions($settings->label2_2d_type);
@@ -882,10 +877,19 @@ class AssetsController extends Controller
    }


-    public function audit(Asset $asset)
+    public function audit(Asset $asset): View | RedirectResponse
    {
-        $settings = Setting::getSettings();
        $this->authorize('audit', Asset::class);
+        $settings = Setting::getSettings();
+
+
+        // Invoke the validation to see if the audit will complete successfully
+        $asset->setRules($asset->getRules() + $asset->customFieldValidationRules());
+
+        if ($asset->isInvalid()) {
+            return redirect()->route('hardware.edit', $asset)->withErrors($asset->getErrors());
+        }
+
        $dt = Carbon::now()->addMonths($settings->audit_interval)->toDateString();
        return view('hardware/audit')->with('asset', $asset)->with('item', $asset)->with('next_audit_date', $dt)->with('locations_list');
    }
@@ -895,6 +899,10 @@ class AssetsController extends Controller

        $this->authorize('audit', Asset::class);

+        session()->put('redirect_option', $request->get('redirect_option'));
+        session()->put('other_redirect', 'audit');
+
+
        $originalValues = $asset->getRawOriginal();

        $asset->next_audit_date = $request->input('next_audit_date');
@@ -929,8 +937,8 @@ class AssetsController extends Controller
            }
        }

-        // Validate custom fields
-        Validator::make($asset->toArray(), $asset->customFieldValidationRules())->validate();
+        // Invoke the validation to see if the audit will complete successfully
+        $asset->setRules($asset->getRules() + $asset->customFieldValidationRules());

        // Validate the rest of the data before we turn off the event dispatcher
        if ($asset->isInvalid()) {
@@ -970,7 +978,7 @@ class AssetsController extends Controller
            }

            $asset->logAudit($request->input('note'), $request->input('location_id'), $file_name, $originalValues);
-            return redirect()->route('assets.audit.due')->with('success', trans('admin/hardware/message.audit.success'));
+            return redirect()->to(Helper::getRedirectOption($request, $asset->id, 'Assets'))->with('success', trans('admin/hardware/message.audit.success'));
        }

        return redirect()->back()->withInput()->withErrors($asset->getErrors());
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -227,7 +227,7 @@ class LoginController extends Controller

            $strip_prefixes = [
                // IIS/AD
-                // https://github.com/snipe/snipe-it/pull/5862
+                // https://github.com/grokability/snipe-it/pull/5862
                '\\',

                // Google Cloud IAP
@@ -484,6 +484,7 @@ class LoginController extends Controller
        }

        $request->session()->regenerate(true);
+        $request->session()->forget('2fa_authed');

        if ($request->session()->has('password_hash_'.Auth::getDefaultDriver())){
            $request->session()->remove('password_hash_'.Auth::getDefaultDriver());
--- a/app/Http/Controllers/CategoriesController.php
+++ b/app/Http/Controllers/CategoriesController.php
@@ -145,7 +145,7 @@ class CategoriesController extends Controller
    {
        $this->authorize('delete', Category::class);
        // Check if the category exists
-        if (is_null($category = Category::findOrFail($categoryId))) {
+        if (is_null($category = Category::withCount('assets as assets_count', 'accessories as accessories_count', 'consumables as consumables_count', 'components as components_count', 'licenses as licenses_count', 'models as models_count')->findOrFail($categoryId))) {
            return redirect()->route('categories.index')->with('error', trans('admin/categories/message.not_found'));
        }

@@ -155,7 +155,6 @@ class CategoriesController extends Controller

        Storage::disk('public')->delete('categories'.'/'.$category->image);
        $category->delete();
-        // Redirect to the locations management page
        return redirect()->route('categories.index')->with('success', trans('admin/categories/message.delete.success'));
    }

--- a/app/Http/Controllers/CustomFieldsController.php
+++ b/app/Http/Controllers/CustomFieldsController.php
@@ -83,30 +83,30 @@ class CustomFieldsController extends Controller
    {
        $this->authorize('create', CustomField::class);

-        $show_in_email = $request->get("show_in_email", 0);
-        $display_in_user_view = $request->get("display_in_user_view", 0);
+        $show_in_email = $request->input("show_in_email", 0);
+        $display_in_user_view = $request->input("display_in_user_view", 0);

        // Override the display settings if the field is encrypted
-        if ($request->get("field_encrypted") == '1') {
+        if ($request->input("field_encrypted") == '1') {
            $show_in_email = '0';
            $display_in_user_view = '0';
        }
-
+        
        $field = new CustomField([
-            "name" => trim($request->get("name")),
-            "element" => $request->get("element"),
-            "help_text" => $request->get("help_text"),
-            "field_values" => $request->get("field_values"),
-            "field_encrypted" => $request->get("field_encrypted", 0),
+            "name" => trim($request->input("name")),
+            "element" => $request->input("element"),
+            "help_text" => $request->input("help_text"),
+            "field_values" => $request->input("field_values"),
+            "field_encrypted" => $request->input("field_encrypted", 0),
            "show_in_email" => $show_in_email,
-            "is_unique" => $request->get("is_unique", 0),
+            "is_unique" => $request->input("is_unique", 0),
            "display_in_user_view" => $display_in_user_view,
-            "auto_add_to_fieldsets" => $request->get("auto_add_to_fieldsets", 0),
-            "show_in_listview" => $request->get("show_in_listview", 0),
-            "show_in_requestable_list" => $request->get("show_in_requestable_list", 0),
-            "display_checkin" => $request->get("display_checkin", 0),
-            "display_checkout" => $request->get("display_checkout", 0),
-            "display_audit" => $request->get("display_audit", 0),
+            "auto_add_to_fieldsets" => $request->input("auto_add_to_fieldsets", 0),
+            "show_in_listview" => $request->input("show_in_listview", 0),
+            "show_in_requestable_list" => $request->input("show_in_requestable_list", 0),
+            "display_checkin" => $request->input("display_checkin", 0),
+            "display_checkout" => $request->input("display_checkout", 0),
+            "display_audit" => $request->input("display_audit", 0),
            "created_by" => auth()->id()
        ]);

@@ -238,8 +238,8 @@ class CustomFieldsController extends Controller
            $display_in_user_view = '0';
        }
        
-        $field->name          = trim(e($request->get("name")));
-        $field->element       = e($request->get("element"));
+        $field->name          = trim($request->get("name"));
+        $field->element       = $request->get("element");
        $field->field_values  = $request->get("field_values");
        $field->created_by       = auth()->id();
        $field->help_text     = $request->get("help_text");
@@ -254,9 +254,9 @@ class CustomFieldsController extends Controller
        $field->display_audit = $request->get("display_audit", 0);

        if ($request->get('format') == 'CUSTOM REGEX') {
-            $field->format = e($request->get('custom_format'));
+            $field->format = $request->get('custom_format');
        } else {
-            $field->format = e($request->get('format'));
+            $field->format = $request->get('format');
        }

        if ($field->element == 'checkbox' || $field->element == 'radio'){
--- a/app/Http/Controllers/Licenses/LicenseCheckinController.php
+++ b/app/Http/Controllers/Licenses/LicenseCheckinController.php
@@ -87,6 +87,7 @@ class LicenseCheckinController extends Controller

        if($licenseSeat->assigned_to != null){
            $return_to = User::find($licenseSeat->assigned_to);
+            session()->put('checkedInFrom', $return_to->id);
        } else {
            $return_to = Asset::find($licenseSeat->asset_id);
        }
--- a/app/Http/Controllers/LocationsController.php
+++ b/app/Http/Controllers/LocationsController.php
@@ -66,6 +66,7 @@ class LocationsController extends Controller
    public function store(ImageUploadRequest $request) : RedirectResponse
    {
        $this->authorize('create', Location::class);
+        
        $location = new Location();
        $location->name = $request->input('name');
        $location->parent_id = $request->input('parent_id', null);
@@ -150,7 +151,7 @@ class LocationsController extends Controller
        if (Setting::getSettings()->scope_locations_fmcs) {
            $location->company_id = Company::getIdForCurrentUser($request->input('company_id'));
            // check if there are related objects with different company
-            if (Helper::test_locations_fmcs(false, $locationId, $location->company_id)) {
+            if (Helper::test_locations_fmcs(false, $location->id, $location->company_id)) {
                return redirect()->back()->withInput()->withInput()->with('error', 'error scoped locations');
            }            
        } else {
@@ -176,6 +177,7 @@ class LocationsController extends Controller
    public function destroy($locationId) : RedirectResponse
    {
        $this->authorize('delete', Location::class);
+
        if (is_null($location = Location::find($locationId))) {
            return redirect()->to(route('locations.index'))->with('error', trans('admin/locations/message.does_not_exist'));
        }
@@ -212,6 +214,8 @@ class LocationsController extends Controller
     */
    public function show(Location $location) : View | RedirectResponse
    {
+        $this->authorize('view', Location::class);
+
        $location = Location::withCount('assignedAssets as assigned_assets_count')
            ->withCount('assets as assets_count')
            ->withCount('rtd_assets as rtd_assets_count')
@@ -229,6 +233,8 @@ class LocationsController extends Controller

    public function print_assigned($id) : View | RedirectResponse
    {
+        $this->authorize('view', Location::class);
+
        if ($location = Location::where('id', $id)->first()) {
            $parent = Location::where('id', $location->parent_id)->first();
            $manager = User::where('id', $location->manager_id)->first();
@@ -313,6 +319,7 @@ class LocationsController extends Controller
    }
    public function print_all_assigned($id) : View | RedirectResponse
    {
+        $this->authorize('view', Location::class);
        if ($location = Location::where('id', $id)->first()) {
            $parent = Location::where('id', $location->parent_id)->first();
            $manager = User::where('id', $location->manager_id)->first();
@@ -339,6 +346,8 @@ class LocationsController extends Controller
     */
    public function postBulkDelete(Request $request) : View | RedirectResponse
    {
+        $this->authorize('update', Location::class);
+
        $locations_raw_array = $request->input('ids');

        // Make sure some IDs have been selected
@@ -372,6 +381,8 @@ class LocationsController extends Controller
     */
    public function postBulkDeleteStore(Request $request) : RedirectResponse
    {
+        $this->authorize('delete', Location::class);
+
        $locations_raw_array = $request->input('ids');

        if ((is_array($locations_raw_array)) && (count($locations_raw_array) > 0)) {
--- a/app/Http/Controllers/LocationsFilesController.php
+++ b/app/Http/Controllers/LocationsFilesController.php
@@ -0,0 +1,111 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Helpers\StorageHelper;
+use App\Http\Requests\UploadFileRequest;
+use App\Models\Actionlog;
+use App\Models\Location;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Response;
+use Illuminate\Support\Facades\Storage;
+use \Symfony\Component\HttpFoundation\StreamedResponse;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
+
+class LocationsFilesController extends Controller
+{
+    /**
+     * Upload a file to the server.
+     *
+     * @param UploadFileRequest $request
+     * @param int $modelId
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
+     *@since [v1.0]
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     */
+    public function store(UploadFileRequest $request, Location $location) : RedirectResponse
+    {
+        $this->authorize('update', $location);
+
+        if ($request->hasFile('file')) {
+
+            if (! Storage::exists('private_uploads/locations')) {
+                Storage::makeDirectory('private_uploads/locations', 775);
+            }
+
+            foreach ($request->file('file') as $file) {
+                $file_name = $request->handleFile('private_uploads/locations/','location-'.$location->id, $file);
+                $location->logUpload($file_name, $request->get('notes'));
+            }
+
+            return redirect()->back()->withFragment('files')->with('success', trans('general.file_upload_success'));
+        }
+
+        return redirect()->back()->withFragment('files')->with('error', trans('admin/hardware/message.upload.nofiles'));
+    }
+
+    /**
+     * Check for permissions and display the file.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @param  int $modelId
+     * @param  int $fileId
+     * @since [v1.0]
+     */
+    public function show(Location $location, $fileId = null) : StreamedResponse | Response | RedirectResponse | BinaryFileResponse
+    {
+
+        $this->authorize('view', $location);
+
+        if (! $log = Actionlog::find($fileId)) {
+            return redirect()->back()->withFragment('files')->with('error', 'No matching file record');
+        }
+
+        $file = 'private_uploads/locations/'.$log->filename;
+
+        if (! Storage::exists($file)) {
+            return redirect()->back()->withFragment('files')->with('error', 'No matching file on server');
+        }
+
+        if (request('inline') == 'true') {
+
+            $headers = [
+                'Content-Disposition' => 'inline',
+            ];
+
+            return Storage::download($file, $log->filename, $headers);
+        }
+
+        return StorageHelper::downloader($file);
+    }
+
+    /**
+     * Delete the associated file
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @param  int $modelId
+     * @param  int $fileId
+     * @since [v1.0]
+     */
+    public function destroy(Location $location, $fileId = null) : RedirectResponse
+    {
+        $rel_path = 'private_uploads/locations';
+        $this->authorize('update', $location);
+        $log = Actionlog::find($fileId);
+
+        if ($log) {
+
+            // This should be moved to purge
+//            if (Storage::exists($rel_path.'/'.$log->filename)) {
+//                Storage::delete($rel_path.'/'.$log->filename);
+//            }
+            $log->delete();
+
+            return redirect()->back()->withFragment('files')->with('success', trans('admin/hardware/message.deletefile.success'));
+        }
+
+        return redirect()->back()->withFragment('files')->with('success', trans('admin/hardware/message.deletefile.success'));
+
+    }
+}
--- a/app/Http/Controllers/ManufacturersController.php
+++ b/app/Http/Controllers/ManufacturersController.php
@@ -6,6 +6,7 @@ use App\Http\Requests\ImageUploadRequest;
 use App\Models\Actionlog;
 use App\Models\Manufacturer;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\Log;
@@ -31,7 +32,30 @@ class ManufacturersController extends Controller
    public function index() : View
    {
        $this->authorize('index', Manufacturer::class);
-        return view('manufacturers/index');
+        $manufacturer_count = Manufacturer::withTrashed()->count();
+        return view('manufacturers/index')->with('manufacturer_count', $manufacturer_count);
+    }
+
+    /**
+     * Returns a view that invokes the ajax tables which actually contains
+     * the content for the manufacturers listing, which is generated in getDatatable.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @see Api\ManufacturersController::index() method that generates the JSON response
+     * @since [v1.0]
+     */
+    public function seed() : RedirectResponse
+    {
+        $this->authorize('index', Manufacturer::class);
+
+        $manufacturers_count = Manufacturer::withTrashed()->count();
+
+        if ($manufacturers_count == 0) {
+            Artisan::call('db:seed', ['--class' => 'ManufacturerSeeder']);
+            return redirect()->route('manufacturers.index')->with('success', trans('general.seeding.manufacturers.success'));
+        }
+
+        return redirect()->route('manufacturers.index')->with('error', trans_choice('general.seeding.manufacturers.error', ['count' => $manufacturers_count]));
    }

    /**
--- a/app/Http/Controllers/ProfileController.php
+++ b/app/Http/Controllers/ProfileController.php
@@ -53,7 +53,7 @@ class ProfileController extends Controller
        $user->enable_confetti = $request->input('enable_confetti', false);

        if (! config('app.lock_passwords')) {
-            $user->locale = $request->input('locale', 'en-US');
+            $user->locale = $request->input('locale');
        }

        if ((Gate::allows('self.two_factor')) && ((Setting::getSettings()->two_factor_enabled == '1') && (! config('app.lock_passwords')))) {
@@ -136,7 +136,7 @@ class ProfileController extends Controller
            }

            // This checks to make sure that the user's password isn't the same as their username,
-            // email address, first name or last name (see https://github.com/snipe/snipe-it/issues/8661)
+            // email address, first name or last name (see https://github.com/grokability/snipe-it/issues/8661)
            // While this is handled via SaveUserRequest form request in other places, we have to do this manually
            // here because we don't have the username, etc form fields available in the profile password change
            // form.
--- a/app/Http/Controllers/ReportsController.php
+++ b/app/Http/Controllers/ReportsController.php
@@ -485,7 +485,7 @@ class ReportsController extends Controller
                $header[] = trans('admin/hardware/table.purchase_date');
            }

-            if (($request->filled('purchase_cost')) || ($request->filled('depreciation'))) {
+            if ($request->filled('purchase_cost')) {
                $header[] = trans('admin/hardware/table.purchase_cost');
            }

@@ -737,6 +737,11 @@ class ReportsController extends Controller
            if (($request->filled('next_audit_start')) && ($request->filled('next_audit_end'))) {
                $assets->whereBetween('assets.next_audit_date', [$request->input('next_audit_start'), $request->input('next_audit_end')]);
            }
+
+            if (($request->filled('last_updated_start')) && ($request->filled('last_updated_end'))) {
+                $assets->whereBetween('assets.updated_at', [$request->input('last_updated_start'), $request->input('last_updated_end')]);
+            }
+
            if ($request->filled('exclude_archived')) {
                $assets->notArchived();
            }
--- a/app/Http/Controllers/SettingsController.php
+++ b/app/Http/Controllers/SettingsController.php
@@ -14,6 +14,7 @@ use App\Http\Requests\StoreLabelSettings;
 use App\Http\Requests\StoreSecuritySettings;
 use App\Models\CustomField;
 use App\Models\Group;
+use App\Models\Labels\Label as LabelModel;
 use App\Models\Setting;
 use App\Models\Asset;
 use App\Models\User;
@@ -290,7 +291,6 @@ class SettingsController extends Controller
    public function getSettings() : View
    {
        $setting = Setting::getSettings();
-
        return view('settings/general', compact('setting'));
    }

@@ -772,6 +772,7 @@ class SettingsController extends Controller
        $setting->label2_2d_type = $request->input('label2_2d_type');
        $setting->label2_2d_target = $request->input('label2_2d_target');
        $setting->label2_fields = $request->input('label2_fields');
+        $setting->label2_empty_row_count = $request->input('label2_empty_row_count');
        $setting->labels_per_page = $request->input('labels_per_page');
        $setting->labels_width = $request->input('labels_width');
        $setting->labels_height = $request->input('labels_height');
--- a/app/Http/Controllers/Users/BulkUsersController.php
+++ b/app/Http/Controllers/Users/BulkUsersController.php
@@ -298,7 +298,6 @@ class BulkUsersController extends Controller
        $this->logItemCheckinAndDelete($assets, Asset::class);
        $this->logAccessoriesCheckin($accessoryUserRows);
        $this->logItemCheckinAndDelete($licenses, License::class);
-        $this->logConsumablesCheckin($consumableUserRows);

        Asset::whereIn('id', $assets->pluck('id'))->update([
            'status_id'     => e(request('status_id')),
@@ -366,20 +365,6 @@ class BulkUsersController extends Controller
        }
    }

-    private function logConsumablesCheckin(Collection $consumableUserRows): void
-    {
-        foreach ($consumableUserRows as $consumableUserRow) {
-            $logAction = new Actionlog();
-            $logAction->item_id = $consumableUserRow->consumable_id;
-            $logAction->item_type = Consumable::class;
-            $logAction->target_id = $consumableUserRow->assigned_to;
-            $logAction->target_type = User::class;
-            $logAction->created_by = auth()->id();
-            $logAction->note = 'Bulk checkin items';
-            $logAction->logaction('checkin from');
-        }
-    }
-
    /**
     * Save bulk-edited users
     *
--- a/app/Http/Controllers/Users/UsersController.php
+++ b/app/Http/Controllers/Users/UsersController.php
@@ -178,7 +178,7 @@ class UsersController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v1.0]
     * @param $permissions
-     * @return \Illuminate\Contracts\View\View
+     * @return \Illuminate\Contracts\View\View|\Illuminate\Http\RedirectResponse
     * @internal param int $id
     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
@@ -190,6 +190,10 @@ class UsersController extends Controller

        if ($user) {

+            if ($user->trashed()) {
+                return redirect()->route('users.show', $user->id);
+            }
+
            $permissions = config('permissions');
            $groups = Group::pluck('name', 'id');

@@ -594,18 +598,18 @@ class UsersController extends Controller

        $user = User::where('id', $id)
            ->with([
-                'assets.assetlog',
-                'assets.assignedAssets.assetlog',
+                'assets.log' => fn($query) => $query->withTrashed()->where('target_type', User::class)->where('target_id', $id)->where('action_type', 'accepted'),
+                'assets.assignedAssets.log' => fn($query) => $query->withTrashed()->where('target_type', User::class)->where('target_id', $id)->where('action_type', 'accepted'),
                'assets.assignedAssets.defaultLoc',
                'assets.assignedAssets.location',
                'assets.assignedAssets.model.category',
                'assets.defaultLoc',
                'assets.location',
                'assets.model.category',
-                'accessories.assetlog',
+                'accessories.log' => fn($query) => $query->withTrashed()->where('target_type', User::class)->where('target_id', $id)->where('action_type', 'accepted'),
                'accessories.category',
                'accessories.manufacturer',
-                'consumables.assetlog',
+                'consumables.log' => fn($query) => $query->withTrashed()->where('target_type', User::class)->where('target_id', $id)->where('action_type', 'accepted'),
                'consumables.category',
                'consumables.manufacturer',
                'licenses.category',
--- a/app/Http/Requests/StoreAssetModelRequest.php
+++ b/app/Http/Requests/StoreAssetModelRequest.php
@@ -19,6 +19,7 @@ class StoreAssetModelRequest extends ImageUploadRequest

    public function prepareForValidation(): void
    {
+        parent::prepareForValidation();

        if ($this->category_id) {
            if ($category = Category::find($this->category_id)) {
--- a/app/Http/Requests/StoreAssetRequest.php
+++ b/app/Http/Requests/StoreAssetRequest.php
@@ -39,7 +39,6 @@ class StoreAssetRequest extends ImageUploadRequest
        $this->merge([
            'asset_tag' => $this->asset_tag ?? Asset::autoincrement_asset(),
            'company_id' => $idForCurrentUser,
-            'assigned_to' => $assigned_to ?? null,
        ]);
    }

--- a/app/Http/Requests/StoreLdapSettings.php
+++ b/app/Http/Requests/StoreLdapSettings.php
@@ -27,8 +27,6 @@ class StoreLdapSettings extends FormRequest
            'ldap_auth_filter_query' => 'not_in:uid=samaccountname|required_if:ldap_enabled,1',
            'ldap_filter' => 'nullable|regex:"^[^(]"|required_if:ldap_enabled,1',
            'ldap_server' => 'nullable|required_if:ldap_enabled,1|starts_with:ldap://,ldaps://',
-            'ldap_uname' => 'nullable|required_if:ldap_enabled,1',
-            'ldap_pword' => 'nullable|required_if:ldap_enabled,1',
            'ldap_basedn' => 'nullable|required_if:ldap_enabled,1',
            'ldap_fname_field' => 'nullable|required_if:ldap_enabled,1',
            'custom_forgot_pass_url' => 'nullable|url',
--- a/app/Http/Transformers/AccessoriesTransformer.php
+++ b/app/Http/Transformers/AccessoriesTransformer.php
@@ -55,7 +55,7 @@ class AccessoriesTransformer
            'checkout' => Gate::allows('checkout', Accessory::class),
            'checkin' =>  false,
            'update' => Gate::allows('update', Accessory::class),
-            'delete' => Gate::allows('delete', Accessory::class),
+            'delete' => $accessory->checkouts_count === 0 && Gate::allows('delete', Accessory::class),
            'clone' => Gate::allows('create', Accessory::class),
            
        ];
@@ -94,6 +94,10 @@ class AccessoriesTransformer

    public function transformAssignedTo($accessoryCheckout)
    {
+        if (is_null($accessoryCheckout->assigned)) {
+            return null;
+        }
+
        if ($accessoryCheckout->checkedOutToUser()) {
            return (new UsersTransformer)->transformUserCompact($accessoryCheckout->assigned);
        } elseif ($accessoryCheckout->checkedOutToLocation()) {
--- a/app/Http/Transformers/AssetModelsTransformer.php
+++ b/app/Http/Transformers/AssetModelsTransformer.php
@@ -105,6 +105,7 @@ class AssetModelsTransformer
        $array = [
            'id' => (int) $file->id,
            'filename' => e($file->filename),
+            'note' => $file->note,
            'url' => route('show/modelfile', [$assetmodel->id, $file->id]),
            'created_by' => ($file->adminuser) ? [
                'id' => (int) $file->adminuser->id,
--- a/app/Http/Transformers/AssetsTransformer.php
+++ b/app/Http/Transformers/AssetsTransformer.php
@@ -155,6 +155,7 @@ class AssetsTransformer
            'clone'         => Gate::allows('create', Asset::class) ? true : false,
            'restore'       => ($asset->deleted_at!='' && Gate::allows('create', Asset::class)) ? true : false,
            'update'        => ($asset->deleted_at=='' && Gate::allows('update', Asset::class)) ? true : false,
+            'audit'        => Gate::allows('audit', Asset::class) ? true : false,
            'delete'        => ($asset->deleted_at=='' && $asset->assigned_to =='' && Gate::allows('delete', Asset::class) && ($asset->deleted_at == '')) ? true : false,
        ];      

@@ -302,30 +303,32 @@ class AssetsTransformer

    public function transformCheckedoutAccessory(AccessoryCheckout $accessory_checkout)
    {
+        if ($accessory_checkout->accessory) {
+            $array = [
+                'id' => $accessory_checkout->id,
+                'accessory' => [
+                    'id' => $accessory_checkout->accessory->id,
+                    'name' => $accessory_checkout->accessory->name,
+                ],
+                'assigned_to' => $accessory_checkout->assigned_to,
+                'image' => ($accessory_checkout->accessory->image) ? Storage::disk('public')->url('accessories/' . e($accessory_checkout->accessory->image)) : null,
+                'note' => $accessory_checkout->note ? e($accessory_checkout->note) : null,
+                'created_by' => $accessory_checkout->adminuser ? [
+                    'id' => (int)$accessory_checkout->adminuser->id,
+                    'name' => e($accessory_checkout->adminuser->present()->fullName),
+                ] : null,
+                'created_at' => Helper::getFormattedDateObject($accessory_checkout->created_at, 'datetime'),
+                'deleted_at' => Helper::getFormattedDateObject($accessory_checkout->deleted_at, 'datetime'),
+            ];

-        $array = [
-            'id' => $accessory_checkout->id,
-            'accessory' => [
-                'id' => $accessory_checkout->accessory->id,
-                'name' => $accessory_checkout->accessory->name,
-            ],
-            'assigned_to' => $accessory_checkout->assigned_to,
-            'image' => ($accessory_checkout->accessory->image) ? Storage::disk('public')->url('accessories/'.e($accessory_checkout->accessory->image)) : null,
-            'note' => $accessory_checkout->note ? e($accessory_checkout->note) : null,
-            'created_by' => $accessory_checkout->adminuser ? [
-                'id' => (int) $accessory_checkout->adminuser->id,
-                'name'=> e($accessory_checkout->adminuser->present()->fullName),
-            ]: null,
-            'created_at' => Helper::getFormattedDateObject($accessory_checkout->created_at, 'datetime'),
-        ];
+            $permissions_array['available_actions'] = [
+                'checkout' => false,
+                'checkin' => Gate::allows('checkin', Accessory::class),
+            ];

-        $permissions_array['available_actions'] = [
-            'checkout' => false,
-            'checkin' => Gate::allows('checkin', Accessory::class),
-        ];
-
-        $array += $permissions_array;
-        return $array;
+            $array += $permissions_array;
+            return $array;
+        }
    }

 }
--- a/app/Http/Transformers/GroupsTransformer.php
+++ b/app/Http/Transformers/GroupsTransformer.php
@@ -24,7 +24,7 @@ class GroupsTransformer
        $array = [
            'id' => (int) $group->id,
            'name' => e($group->name),
-            'permissions' => json_decode($group->permissions),
+            'permissions' => $group->decodePermissions(),
            'users_count' => (int) $group->users_count,
            'notes' => Helper::parseEscapedMarkedownInline($group->notes),
            'created_by' => ($group->adminuser) ? [
--- a/app/Http/Transformers/LicenseSeatsTransformer.php
+++ b/app/Http/Transformers/LicenseSeatsTransformer.php
@@ -2,6 +2,7 @@

 namespace App\Http\Transformers;

+use App\Helpers\Helper;
 use App\Models\License;
 use App\Models\LicenseSeat;
 use Illuminate\Support\Facades\Gate;
@@ -12,20 +13,20 @@ class LicenseSeatsTransformer
    public function transformLicenseSeats(Collection $seats, $total)
    {
        $array = [];
-        $seat_count = 0;
+
        foreach ($seats as $seat) {
-            $seat_count++;
-            $array[] = self::transformLicenseSeat($seat, $seat_count);
+            $array[] = self::transformLicenseSeat($seat);
        }

        return (new DatatablesTransformer)->transformDatatables($array, $total);
    }

-    public function transformLicenseSeat(LicenseSeat $seat, $seat_count = 0)
+    public function transformLicenseSeat(LicenseSeat $seat)
    {
        $array = [
            'id' => (int) $seat->id,
            'license_id' => (int) $seat->license->id,
+            'updated_at' => Helper::getFormattedDateObject($seat->updated_at, 'datetime'), // we use updated_at here because the record gets updated when it's checked in or out
            'assigned_user' => ($seat->user) ? [
                'id' => (int) $seat->user->id,
                'name'=> e($seat->user->present()->fullName),
@@ -36,24 +37,23 @@ class LicenseSeatsTransformer
                            'name' => e($seat->user->department->name),

                        ] : null,
+                'created_at' => Helper::getFormattedDateObject($seat->created_at, 'datetime'),
            ] : null,
            'assigned_asset' => ($seat->asset) ? [
                'id' => (int) $seat->asset->id,
                'name'=> e($seat->asset->present()->fullName),
+                'created_at' => Helper::getFormattedDateObject($seat->created_at, 'datetime'),
            ] : null,
            'location' => ($seat->location()) ? [
                'id' => (int) $seat->location()->id,
                'name'=> e($seat->location()->name),
+                'created_at' => Helper::getFormattedDateObject($seat->created_at, 'datetime'),
            ] : null,
            'reassignable' => (bool) $seat->license->reassignable,
            'notes' => e($seat->notes),
            'user_can_checkout' => (($seat->assigned_to == '') && ($seat->asset_id == '')),
        ];

-        if ($seat_count != 0) {
-            $array['name'] = trans('admin/licenses/general.seat_count', ['count' => $seat_count]);
-        }
-
        $permissions_array['available_actions'] = [
            'checkout' => Gate::allows('checkout', License::class),
            'checkin' => Gate::allows('checkin', License::class),
--- a/app/Http/Transformers/UploadedFilesTransformer.php
+++ b/app/Http/Transformers/UploadedFilesTransformer.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace App\Http\Transformers;
+
+use App\Helpers\Helper;
+use App\Models\Actionlog;
+use App\Models\Asset;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Support\Facades\Storage;
+
+class UploadedFilesTransformer
+{
+    public function transformFiles(Collection $files, $total)
+    {
+        $array = [];
+        foreach ($files as $file) {
+            $array[] = self::transformFile($file);
+        }
+
+        return (new DatatablesTransformer)->transformDatatables($array, $total);
+    }
+
+
+    public function transformFile(Actionlog $file)
+    {
+        $snipeModel = $file->item_type;
+
+
+        // This will be used later as we extend out this transformer to handle more types of uploads
+        if ($file->item_type == Asset::class) {
+            $file_url = route('show/assetfile', [$file->item_id, $file->id]);
+        }
+
+        $array = [
+            'id' => (int) $file->id,
+            'filename' => e($file->filename),
+            'url' => $file_url,
+            'created_by' => ($file->adminuser) ? [
+                'id' => (int) $file->adminuser->id,
+                'name'=> e($file->adminuser->present()->fullName),
+            ] : null,
+            'created_at' => Helper::getFormattedDateObject($file->created_at, 'datetime'),
+            'updated_at' => Helper::getFormattedDateObject($file->updated_at, 'datetime'),
+            'deleted_at' => Helper::getFormattedDateObject($file->deleted_at, 'datetime'),
+        ];
+
+        $permissions_array['available_actions'] = [
+            'delete' => (Gate::allows('update', $snipeModel) && ($file->deleted_at == '')),
+        ];
+
+        $array += $permissions_array;
+        return $array;
+    }
+
+}
--- a/app/Importer/AssetImporter.php
+++ b/app/Importer/AssetImporter.php
@@ -16,10 +16,22 @@ class AssetImporter extends ItemImporter
    {
        parent::__construct($filename);

-        $this->defaultStatusLabelId = Statuslabel::first()->id;
-        
+        $this->defaultStatusLabelId = Statuslabel::first()?->id;
+
        if (!is_null(Statuslabel::deployable()->first())) {
-            $this->defaultStatusLabelId = Statuslabel::deployable()->first()->id;
+            $this->defaultStatusLabelId = Statuslabel::deployable()->first()?->id;
+        }
+
+        if (is_null($this->defaultStatusLabelId)) {
+            $defaultLabel = Statuslabel::create([
+                'name' => 'Default Status',
+                'deployable' => 0,
+                'pending' => 1,
+                'archived' => 0,
+                'notes' => 'Default status label created by AssetImporter',
+            ]);
+
+            $this->defaultStatusLabelId = $defaultLabel->id;
        }
    }

--- a/app/Importer/ItemImporter.php
+++ b/app/Importer/ItemImporter.php
@@ -85,7 +85,7 @@ class ItemImporter extends Importer
        $this->item['requestable'] = $this->findCsvMatch($row, 'requestable');
        $this->item['created_by'] = auth()->id();
        $this->item['serial'] = $this->findCsvMatch($row, 'serial');
-        $this->item['item_no'] = trim($this->findCsvMatch($row, 'item_number'));
+        $this->item['item_no'] = trim($this->findCsvMatch($row, 'item_no'));


        $this->item['purchase_date'] = null;
--- a/app/Importer/LicenseImporter.php
+++ b/app/Importer/LicenseImporter.php
@@ -68,6 +68,7 @@ class LicenseImporter extends ItemImporter
        $this->item['order_number'] = trim($this->findCsvMatch($row, 'order_number'));
        $this->item['reassignable'] = trim($this->findCsvMatch($row, 'reassignable'));
        $this->item['manufacturer'] = $this->createOrFetchManufacturer(trim($this->findCsvMatch($row, 'manufacturer')));
+        $this->item['min_amt'] = trim($this->findCsvMatch($row, 'min_amt'));

        if($this->item['reassignable'] == "")
        {
--- a/app/Listeners/CheckoutableListener.php
+++ b/app/Listeners/CheckoutableListener.php
@@ -27,6 +27,7 @@ use App\Notifications\CheckoutAssetNotification;
 use App\Notifications\CheckoutConsumableNotification;
 use App\Notifications\CheckoutLicenseSeatNotification;
 use GuzzleHttp\Exception\ClientException;
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\Notification;
 use Exception;
@@ -40,6 +41,24 @@ class CheckoutableListener
        Component::class,
    ];

+    /**
+     * Register the listeners for the subscriber.
+     *
+     * @param  Illuminate\Events\Dispatcher  $events
+     */
+    public function subscribe($events)
+    {
+        $events->listen(
+            \App\Events\CheckoutableCheckedIn::class,
+            'App\Listeners\CheckoutableListener@onCheckedIn'
+        );
+
+        $events->listen(
+            \App\Events\CheckoutableCheckedOut::class,
+            'App\Listeners\CheckoutableListener@onCheckedOut'
+        );
+    }
+
    /**
     * Notify the user and post to webhook about the checked out checkoutable
     * and add a record to the checkout_requests table.
@@ -50,86 +69,70 @@ class CheckoutableListener
            return;
        }

-        /**
-         * Make a checkout acceptance and attach it in the notification
-         */
-        $settings = Setting::getSettings();
+        $shouldSendEmailToUser = $this->shouldSendCheckoutEmailToUser($event->checkoutable);
+        $shouldSendEmailToAlertAddress = $this->shouldSendEmailToAlertAddress();
+        $shouldSendWebhookNotification = $this->shouldSendWebhookNotification();
+
+        if (!$shouldSendEmailToUser && !$shouldSendEmailToAlertAddress && !$shouldSendWebhookNotification) {
+            return;
+        }
+
        $acceptance = $this->getCheckoutAcceptance($event);
-        $adminCcEmailsArray = [];

-        if ($settings->admin_cc_email !== '') {
-            $adminCcEmail = $settings->admin_cc_email;
-            $adminCcEmailsArray = array_map('trim', explode(',', $adminCcEmail));
-        }
-        $ccEmails = array_filter($adminCcEmailsArray);
-        $mailable = $this->getCheckoutMailType($event, $acceptance);
-        $notifiable = $this->getNotifiables($event);
+        if ($shouldSendEmailToUser || $shouldSendEmailToAlertAddress) {
+            $mailable = $this->getCheckoutMailType($event, $acceptance);
+            $notifiable = $this->getNotifiableUser($event);

-        if ($event->checkedOutTo->locale) {
-            $mailable->locale($event->checkedOutTo->locale);
-        }
-        // Send email notifications
-        try {
-            /**
-             * Send an email if any of the following conditions are met:
-             * 1. The asset requires acceptance
-             * 2. The item has a EULA
-             * 3. The item should send an email at check-in/check-out
-             */
+            $notifiableHasEmail = $notifiable instanceof User && $notifiable->email;

-            if ($event->checkoutable->requireAcceptance() || $event->checkoutable->getEula() ||
-                $this->checkoutableShouldSendEmail($event)) {
-                Log::info('Sending checkout email, Locale: ' . ($event->checkedOutTo->locale ?? 'default'));
-                if (!empty($notifiable)) {
-                    Mail::to($notifiable)->cc($ccEmails)->send($mailable);
-                } elseif (!empty($ccEmails)) {
-                    Mail::cc($ccEmails)->send($mailable);
+            $shouldSendEmailToUser = $shouldSendEmailToUser && $notifiableHasEmail;
+
+            [$to, $cc] = $this->generateEmailRecipients($shouldSendEmailToUser, $shouldSendEmailToAlertAddress, $notifiable);
+
+            if (!empty($to)) {
+                try {
+                    Mail::to(array_flatten($to))->cc(array_flatten($cc))->send($mailable);
+                    Log::info('Checkout Mail sent to checkout target');
+                } catch (ClientException $e) {
+                    Log::debug("Exception caught during checkout email: " . $e->getMessage());
+                } catch (Exception $e) {
+                    Log::debug("Exception caught during checkout email: " . $e->getMessage());
                }
-                Log::info('Checkout Mail sent.');
            }
-        } catch (ClientException $e) {
-            Log::debug("Exception caught during checkout email: " . $e->getMessage());
-        } catch (Exception $e) {
-            Log::debug("Exception caught during checkout email: " . $e->getMessage());
        }
-//                 Send Webhook notification
-        try {
-            if ($this->shouldSendWebhookNotification()) {
+
+        if ($shouldSendWebhookNotification) {
+            try {
                if ($this->newMicrosoftTeamsWebhookEnabled()) {
                    $message = $this->getCheckoutNotification($event)->toMicrosoftTeams();
                    $notification = new TeamsNotification(Setting::getSettings()->webhook_endpoint);
                    $notification->success()->sendMessage($message[0], $message[1]);  // Send the message to Microsoft Teams
                } else {
-
                    Notification::route($this->webhookSelected(), Setting::getSettings()->webhook_endpoint)
                        ->notify($this->getCheckoutNotification($event, $acceptance));
                }
+            } catch (ClientException $e) {
+                if (strpos($e->getMessage(), 'channel_not_found') !== false) {
+                    Log::warning(Setting::getSettings()->webhook_selected . " notification failed: " . $e->getMessage());
+                    return redirect()->back()->with('warning', ucfirst(Setting::getSettings()->webhook_selected) . trans('admin/settings/message.webhook.webhook_channel_not_found'));
+                } else {
+                    Log::error("ClientException caught during checkin notification: " . $e->getMessage());
+                }
+                return redirect()->back()->with('warning', ucfirst(Setting::getSettings()->webhook_selected) . trans('admin/settings/message.webhook.webhook_fail'));
+            } catch (Exception $e) {
+                Log::warning(ucfirst(Setting::getSettings()->webhook_selected) . ' webhook notification failed:', [
+                    'error' => $e->getMessage(),
+                    'webhook_endpoint' => Setting::getSettings()->webhook_endpoint,
+                    'event' => $event,
+                ]);
+                return redirect()->back()->with('warning', ucfirst(Setting::getSettings()->webhook_selected) . trans('admin/settings/message.webhook.webhook_fail'));
            }
-        } catch (ClientException $e) {
-            if (strpos($e->getMessage(), 'channel_not_found') !== false) {
-                Log::warning(Setting::getSettings()->webhook_selected." notification failed: " . $e->getMessage());
-                return redirect()->back()->with('warning', ucfirst(Setting::getSettings()->webhook_selected) .trans('admin/settings/message.webhook.webhook_channel_not_found') );
-            }
-            else {
-                Log::error("ClientException caught during checkin notification: " . $e->getMessage());
-            }
-            return redirect()->back()->with('warning', ucfirst(Setting::getSettings()->webhook_selected) .trans('admin/settings/message.webhook.webhook_fail') );
-        } catch (Exception $e) {
-            Log::warning(ucfirst(Setting::getSettings()->webhook_selected) . ' webhook notification failed:', [
-                'error' => $e->getMessage(),
-                'webhook_endpoint' => Setting::getSettings()->webhook_endpoint,
-                'event' => $event,
-            ]);
-            return redirect()->back()->with('warning', ucfirst(Setting::getSettings()->webhook_selected) . trans('admin/settings/message.webhook.webhook_fail'));
        }
    }

-
-
-
    /**
     * Notify the user and post to webhook about the checked in checkoutable
-     */    
+     */
    public function onCheckedIn($event)
    {
        Log::debug('onCheckedIn in the Checkoutable listener fired');
@@ -138,60 +141,54 @@ class CheckoutableListener
            return;
        }

-        /**
-         * Send the appropriate notification
-         */
-        if ($event->checkedOutTo && $event->checkoutable){
-            $acceptances = CheckoutAcceptance::where('checkoutable_id', $event->checkoutable->id)
-                                            ->where('assigned_to_id', $event->checkedOutTo->id)
-                                            ->get();
+        $shouldSendEmailToUser = $this->checkoutableCategoryShouldSendEmail($event->checkoutable);
+        $shouldSendEmailToAlertAddress = $this->shouldSendEmailToAlertAddress();
+        $shouldSendWebhookNotification = $this->shouldSendWebhookNotification();

-            foreach($acceptances as $acceptance){
-                if($acceptance->isPending()){
-                    $acceptance->delete();
+        if (!$shouldSendEmailToUser && !$shouldSendEmailToAlertAddress && !$shouldSendWebhookNotification) {
+            return;
+        }
+
+        if ($shouldSendEmailToUser || $shouldSendEmailToAlertAddress) {
+            /**
+             * Send the appropriate notification
+             */
+            if ($event->checkedOutTo && $event->checkoutable) {
+                $acceptances = CheckoutAcceptance::where('checkoutable_id', $event->checkoutable->id)
+                    ->where('assigned_to_id', $event->checkedOutTo->id)
+                    ->get();
+
+                foreach ($acceptances as $acceptance) {
+                    if ($acceptance->isPending()) {
+                        $acceptance->delete();
+                    }
                }
            }
-        }
-        $settings = Setting::getSettings();
-        $adminCcEmailsArray = [];

-        if($settings->admin_cc_email !== '') {
-            $adminCcEmail = $settings->admin_cc_email;
-            $adminCcEmailsArray = array_map('trim', explode(',', $adminCcEmail));
-        }
-        $ccEmails = array_filter($adminCcEmailsArray);
-        $mailable =  $this->getCheckinMailType($event);
-        $notifiable = $this->getNotifiables($event);
-        if ($event->checkedOutTo?->locale) {
-            $mailable->locale($event->checkedOutTo->locale);
-        }
-        // Send email notifications
-        try {
-            /**
-             * Send an email if any of the following conditions are met:
-             * 1. The asset requires acceptance
-             * 2. The item has a EULA
-             * 3. The item should send an email at check-in/check-out
-             */
-                if ($event->checkoutable->requireAcceptance() || $event->checkoutable->getEula() ||
-                    $this->checkoutableShouldSendEmail($event)) {
-                    Log::info('Sending checkin email, Locale: ' . ($event->checkedOutTo->locale ?? 'default'));
-                    if (!empty($notifiable)) {
-                        Mail::to($notifiable)->cc($ccEmails)->send($mailable);
-                    } elseif (!empty($ccEmails)){
-                        Mail::cc($ccEmails)->send($mailable);
-                    }
-                    Log::info('Checkin Mail sent.');
+            $mailable = $this->getCheckinMailType($event);
+            $notifiable = $this->getNotifiableUser($event);
+
+            $notifiableHasEmail = $notifiable instanceof User && $notifiable->email;
+
+            $shouldSendEmailToUser = $shouldSendEmailToUser && $notifiableHasEmail;
+
+            [$to, $cc] = $this->generateEmailRecipients($shouldSendEmailToUser, $shouldSendEmailToAlertAddress, $notifiable);
+
+            try {
+                if (!empty($to)) {
+                    Mail::to(array_flatten($to))->cc(array_flatten($cc))->send($mailable);
+                    Log::info('Checkin Mail sent to CC addresses');
                }
-        } catch (ClientException $e) {
-            Log::debug("Exception caught during checkin email: " . $e->getMessage());
-        } catch (Exception $e) {
-            Log::debug("Exception caught during checkin email: " . $e->getMessage());
+            } catch (ClientException $e) {
+                Log::debug("Exception caught during checkin email: " . $e->getMessage());
+            } catch (Exception $e) {
+                Log::debug("Exception caught during checkin email: " . $e->getMessage());
+            }
        }

-        // Send Webhook notification
-        try {
-            if ($this->shouldSendWebhookNotification()) {
+        if ($shouldSendWebhookNotification) {
+            // Send Webhook notification
+            try {
                if ($this->newMicrosoftTeamsWebhookEnabled()) {
                    $message = $this->getCheckinNotification($event)->toMicrosoftTeams();
                    $notification = new TeamsNotification(Setting::getSettings()->webhook_endpoint);
@@ -200,25 +197,24 @@ class CheckoutableListener
                    Notification::route($this->webhookSelected(), Setting::getSettings()->webhook_endpoint)
                        ->notify($this->getCheckinNotification($event));
                }
-            }
-        } catch (ClientException $e) {
-            if (strpos($e->getMessage(), 'channel_not_found') !== false) {
-                Log::warning(Setting::getSettings()->webhook_selected." notification failed: " . $e->getMessage());
-                return redirect()->back()->with('warning', ucfirst(Setting::getSettings()->webhook_selected) .trans('admin/settings/message.webhook.webhook_channel_not_found') );
-            }
-            else {
-                Log::error("ClientException caught during checkin notification: " . $e->getMessage());
+            } catch (ClientException $e) {
+                if (strpos($e->getMessage(), 'channel_not_found') !== false) {
+                    Log::warning(Setting::getSettings()->webhook_selected . " notification failed: " . $e->getMessage());
+                    return redirect()->back()->with('warning', ucfirst(Setting::getSettings()->webhook_selected) . trans('admin/settings/message.webhook.webhook_channel_not_found'));
+                } else {
+                    Log::error("ClientException caught during checkin notification: " . $e->getMessage());
+                    return redirect()->back()->with('warning', ucfirst(Setting::getSettings()->webhook_selected) . trans('admin/settings/message.webhook.webhook_fail'));
+                }
+            } catch (Exception $e) {
+                Log::warning(ucfirst(Setting::getSettings()->webhook_selected) . ' webhook notification failed:', [
+                    'error' => $e->getMessage(),
+                    'webhook_endpoint' => Setting::getSettings()->webhook_endpoint,
+                    'event' => $event,
+                ]);
                return redirect()->back()->with('warning', ucfirst(Setting::getSettings()->webhook_selected) . trans('admin/settings/message.webhook.webhook_fail'));
            }
-        } catch (Exception $e) {
-            Log::warning(ucfirst(Setting::getSettings()->webhook_selected) . ' webhook notification failed:', [
-                'error' => $e->getMessage(),
-                'webhook_endpoint' => Setting::getSettings()->webhook_endpoint,
-                'event' => $event,
-            ]);
-            return redirect()->back()->with('warning', ucfirst(Setting::getSettings()->webhook_selected) .trans('admin/settings/message.webhook.webhook_fail'));
        }
-    }      
+    }

    /**
     * Generates a checkout acceptance
@@ -240,13 +236,13 @@ class CheckoutableListener
        $acceptance->assignedTo()->associate($event->checkedOutTo);
        $acceptance->save();

-        return $acceptance;      
+        return $acceptance;
    }

    /**
     * Get the appropriate notification for the event
-     * 
-     * @param  CheckoutableCheckedIn $event 
+     *
+     * @param  CheckoutableCheckedIn  $event
     * @return Notification
     */
    private function getCheckinNotification($event)
@@ -260,7 +256,7 @@ class CheckoutableListener
                break;
            case Asset::class:
                $notificationClass = CheckinAssetNotification::class;
-                break;    
+                break;
            case LicenseSeat::class:
                $notificationClass = CheckinLicenseSeatNotification::class;
                break;
@@ -268,9 +264,8 @@ class CheckoutableListener

        Log::debug('Notification class: '.$notificationClass);

-        return new $notificationClass($event->checkoutable, $event->checkedOutTo, $event->checkedInBy, $event->note);  
+        return new $notificationClass($event->checkoutable, $event->checkedOutTo, $event->checkedInBy, $event->note);
    }
-
    /**
     * Get the appropriate notification for the event
     * 
@@ -312,6 +307,7 @@ class CheckoutableListener
        return new $mailable($event->checkoutable, $event->checkedOutTo, $event->checkedOutBy, $acceptance, $event->note);

    }
+
    private function getCheckinMailType($event){
        $lookup = [
            Accessory::class => CheckinAccessoryMail::class,
@@ -324,19 +320,33 @@ class CheckoutableListener
        return new $mailable($event->checkoutable, $event->checkedOutTo, $event->checkedInBy, $event->note);

    }
-    private function getNotifiables($event){

-        if($event->checkedOutTo instanceof Asset){
+    /**
+     * This gets the recipient objects based on the type of checkoutable.
+     * The 'name' property for users is set in the boot method in the User model.
+     *
+     * @see \App\Models\User::boot()
+     * @param $event
+     * @return mixed
+     */
+    private function getNotifiableUser($event)
+    {
+
+        // If it's assigned to an asset, get that asset's assignedTo object
+        if ($event->checkedOutTo instanceof Asset){
            $event->checkedOutTo->load('assignedTo');
-            return $event->checkedOutTo->assignedto?->email ?? '';
-        }
-        else if($event->checkedOutTo instanceof Location) {
-            return $event->checkedOutTo->manager?->email ?? '';
-        }
-        else{
-            return $event->checkedOutTo?->email ?? '';
+            return $event->checkedOutTo->assignedto;
+
+        // If it's assigned to a location, get that location's manager object
+        } elseif ($event->checkedOutTo instanceof Location) {
+            return $event->checkedOutTo->manager;
+
+        // Otherwise just return the assigned to object
+        } else {
+            return $event->checkedOutTo;
        }
    }
+
    private function webhookSelected(){
        if(Setting::getSettings()->webhook_selected === 'slack' || Setting::getSettings()->webhook_selected === 'general'){
            return 'slack';
@@ -345,44 +355,110 @@ class CheckoutableListener
        return Setting::getSettings()->webhook_selected;
    }

-    /**
-     * Register the listeners for the subscriber.
-     *
-     * @param  Illuminate\Events\Dispatcher  $events
-     */
-    public function subscribe($events)
-    {
-        $events->listen(
-            \App\Events\CheckoutableCheckedIn::class,
-            'App\Listeners\CheckoutableListener@onCheckedIn'
-        ); 
-
-        $events->listen(
-            \App\Events\CheckoutableCheckedOut::class,
-            'App\Listeners\CheckoutableListener@onCheckedOut'
-        ); 
-    }
-
    private function shouldNotSendAnyNotifications($checkoutable): bool
    {
        return in_array(get_class($checkoutable), $this->skipNotificationsFor);
    }

+    private function shouldSendEmailNotifications(Model $checkoutable): bool
+    {
+        //runs a check if the category wants to send checkin/checkout emails to users
+        $category = match (true) {
+            $checkoutable instanceof Asset => $checkoutable->model->category,
+            $checkoutable instanceof Accessory,
+            $checkoutable instanceof Consumable => $checkoutable->category,
+            $checkoutable instanceof LicenseSeat => $checkoutable->license->category,
+            default => null,
+        };
+
+        if (!$category?->checkin_email) {
+            return false;
+        }
+        return true;
+    }
+
    private function shouldSendWebhookNotification(): bool
    {
        return Setting::getSettings() && Setting::getSettings()->webhook_endpoint;
    }

-    private function checkoutableShouldSendEmail($event): bool
+    private function checkoutableCategoryShouldSendEmail(Model $checkoutable): bool
    {
-        if($event->checkoutable instanceof LicenseSeat){
-            return $event->checkoutable->license->checkin_email();
+        if ($checkoutable instanceof LicenseSeat) {
+            return $checkoutable->license->checkin_email();
        }
-        return (method_exists($event->checkoutable, 'checkin_email') && $event->checkoutable->checkin_email());
+        return (method_exists($checkoutable, 'checkin_email') && $checkoutable->checkin_email());
    }

    private function newMicrosoftTeamsWebhookEnabled(): bool
    {
        return Setting::getSettings()->webhook_selected === 'microsoft' && Str::contains(Setting::getSettings()->webhook_endpoint, 'workflows');
    }
+
+    private function shouldSendCheckoutEmailToUser(Model $checkoutable): bool
+    {
+        /**
+         * Send an email if any of the following conditions are met:
+         * 1. The asset requires acceptance
+         * 2. The item has a EULA
+         * 3. The item should send an email at check-in/check-out
+         */
+
+        if ($checkoutable->requireAcceptance()) {
+            return true;
+        }
+
+        if ($checkoutable->getEula()) {
+            return true;
+        }
+
+        if ($this->checkoutableCategoryShouldSendEmail($checkoutable)) {
+            return true;
+        }
+
+        return false;
+    }
+
+    private function shouldSendEmailToAlertAddress(): bool
+    {
+        return Setting::getSettings() && Setting::getSettings()->admin_cc_email;
+    }
+
+    private function getFormattedAlertAddresses(): array
+    {
+        $alertAddresses = Setting::getSettings()->admin_cc_email;
+
+        if ($alertAddresses !== '') {
+            return array_filter(array_map('trim', explode(',', $alertAddresses)));
+        }
+
+        return [];
+    }
+
+    private function generateEmailRecipients(
+        bool $shouldSendEmailToUser,
+        bool $shouldSendEmailToAlertAddress,
+        mixed $notifiable
+    ): array {
+        $to = [];
+        $cc = [];
+
+        // if user && cc: to user, cc admin
+        if ($shouldSendEmailToUser && $shouldSendEmailToAlertAddress) {
+            $to[] = $notifiable;
+            $cc[] = $this->getFormattedAlertAddresses();
+        }
+
+        // if user && no cc: to user
+        if ($shouldSendEmailToUser && !$shouldSendEmailToAlertAddress) {
+            $to[] = $notifiable;
+        }
+
+        // if no user && cc: to admin
+        if (!$shouldSendEmailToUser && $shouldSendEmailToAlertAddress) {
+            $to[] = $this->getFormattedAlertAddresses();
+        }
+
+        return array($to, $cc);
+    }
 }
--- a/app/Listeners/LogListener.php
+++ b/app/Listeners/LogListener.php
@@ -65,6 +65,7 @@ class LogListener
        $logaction->filename = $event->acceptance->stored_eula_file;
        $logaction->note = $event->acceptance->note;
        $logaction->action_type = 'accepted';
+        $logaction->action_date = $event->acceptance->accepted_at;

        // TODO: log the actual license seat that was checked out
        if ($event->acceptance->checkoutable instanceof LicenseSeat) {
@@ -82,6 +83,7 @@ class LogListener
        $logaction->accept_signature = $event->acceptance->signature_filename;
        $logaction->note = $event->acceptance->note;
        $logaction->action_type = 'declined';
+        $logaction->action_date = $event->acceptance->declined_at;

        // TODO: log the actual license seat that was checked out
        if ($event->acceptance->checkoutable instanceof LicenseSeat) {
--- a/app/Livewire/Importer.php
+++ b/app/Livewire/Importer.php
@@ -177,43 +177,43 @@ class Importer extends Component
         * These are the item-type specific columns
         */
        $this->accessories_fields = [
+            'category' => trans('general.category'),
            'company' => trans('general.company'),
-            'location' => trans('general.location'),
-            'quantity' => trans('general.qty'),
            'item_name' => trans('general.item_name_var', ['item' => trans('general.accessory')]),
+            'location' => trans('general.location'),
+            'manufacturer' => trans('general.manufacturer'),
+            'min_amt' => trans('mail.min_QTY'),
            'model_number' => trans('general.model_no'),
            'notes' => trans('general.notes'),
-            'category' => trans('general.category'),
-            'supplier' => trans('general.supplier'),
-            'min_amt' => trans('mail.min_QTY'),
+            'order_number' => trans('general.order_number'),
            'purchase_cost' => trans('general.purchase_cost'),
            'purchase_date' => trans('general.purchase_date'),
-            'manufacturer' => trans('general.manufacturer'),
-            'order_number' => trans('general.order_number'),
+            'quantity' => trans('general.qty'),
+            'supplier' => trans('general.supplier'),
        ];

        $this->assets_fields = [
-            'company' => trans('general.company'),
-            'location' => trans('general.location'),
-            'item_name' => trans('general.item_name_var', ['item' => trans('general.asset')]),
-            'asset_tag' => trans('general.asset_tag'),
+            'asset_eol_date' => trans('admin/hardware/form.eol_date'),
            'asset_model' => trans('general.model_name'),
+            'asset_notes' => trans('general.item_notes', ['item' => trans('admin/hardware/general.asset')]),
+            'asset_tag' => trans('general.asset_tag'),
            'byod' => trans('general.byod'),
-            'model_number' => trans('general.model_no'),
-            'status' => trans('general.status'),
-            'warranty_months' => trans('admin/hardware/form.warranty'),
            'category' => trans('general.category'),
-            'requestable' => trans('admin/hardware/general.requestable'),
-            'serial' => trans('general.serial_number'),
-            'supplier' => trans('general.supplier'),
+            'company' => trans('general.company'),
+            'image' => trans('general.importer.image_filename'),
+            'item_name' => trans('general.item_name_var', ['item' => trans('general.asset')]),
+            'location' => trans('general.location'),
+            'manufacturer' => trans('general.manufacturer'),
+            'model_notes' => trans('general.item_notes', ['item' => trans('admin/hardware/form.model')]),
+            'model_number' => trans('general.model_no'),
+            'order_number' => trans('general.order_number'),
            'purchase_cost' => trans('general.purchase_cost'),
            'purchase_date' => trans('general.purchase_date'),
-            'asset_notes' => trans('general.item_notes', ['item' => trans('admin/hardware/general.asset')]),
-            'model_notes' => trans('general.item_notes', ['item' => trans('admin/hardware/form.model')]),
-            'manufacturer' => trans('general.manufacturer'),
-            'order_number' => trans('general.order_number'),
-            'image' => trans('general.importer.image_filename'),
-            'asset_eol_date' => trans('admin/hardware/form.eol_date'),
+            'requestable' => trans('admin/hardware/general.requestable'),
+            'serial' => trans('general.serial_number'),
+            'status' => trans('general.status'),
+            'supplier' => trans('general.supplier'),
+            'warranty_months' => trans('admin/hardware/form.warranty'),
            /**
             * Checkout fields:
             * Assets can be checked out to other assets, people, or locations, but we currently
@@ -238,122 +238,124 @@ class Importer extends Component
        ];

        $this->consumables_fields = [
+            'category' => trans('general.category'),
+            'checkout_class' => trans('general.importer.checkout_type'),
            'company' => trans('general.company'),
-            'location' => trans('general.location'),
-            'quantity' => trans('general.qty'),
            'item_name' => trans('general.item_name_var', ['item' => trans('general.consumable')]),
+            'item_no' => trans('admin/consumables/general.item_no'),
+            'location' => trans('general.location'),
+            'manufacturer' => trans('general.manufacturer'),
+            'min_amt' => trans('general.min_amt'),
            'model_number' => trans('general.model_no'),
            'notes' => trans('general.notes'),
-            'min_amt' => trans('mail.min_QTY'),
-            'category' => trans('general.category'),
+            'order_number' => trans('general.order_number'),
            'purchase_cost' => trans('general.purchase_cost'),
            'purchase_date' => trans('general.purchase_date'),
-            'checkout_class' => trans('general.importer.checkout_type'),
+            'quantity' => trans('general.qty'),
            'supplier' => trans('general.supplier'),
-            'manufacturer' => trans('general.manufacturer'),
-            'order_number' => trans('general.order_number'),
-            'item_no' => trans('admin/consumables/general.item_no'),
        ];

        $this->components_fields = [
+            'category' => trans('general.category'),
            'company' => trans('general.company'),
-            'location' => trans('general.location'),
-            'quantity' => trans('general.qty'),
            'item_name' => trans('general.item_name_var', ['item' => trans('general.component')]),
+            'location' => trans('general.location'),
+            'manufacturer' => trans('general.manufacturer'),
+            'min_amt' => trans('mail.min_QTY'),
            'model_number' => trans('general.model_no'),
            'notes' => trans('general.notes'),
-            'category' => trans('general.category'),
-            'supplier' => trans('general.supplier'),
-            'min_amt' => trans('mail.min_QTY'),
+            'order_number' => trans('general.order_number'),
            'purchase_cost' => trans('general.purchase_cost'),
            'purchase_date' => trans('general.purchase_date'),
-            'manufacturer' => trans('general.manufacturer'),
-            'order_number' => trans('general.order_number'),
+            'quantity' => trans('general.qty'),
            'serial' => trans('general.serial_number'),
+            'supplier' => trans('general.supplier'),
        ];

        $this->licenses_fields = [
-            'company' => trans('general.company'),
-            'location' => trans('general.location'),
-            'item_name' => trans('general.item_name_var', ['item' => trans('general.license')]),
            'asset_tag' => trans('general.importer.checked_out_to_tag'),
+            'category' => trans('general.category'),
+            'checkout_class' => trans('general.importer.checkout_type'),
+            'company' => trans('general.company'),
+            'email' => trans('general.importer.checked_out_to_email'),
            'expiration_date' => trans('admin/licenses/form.expiration'),
            'full_name' => trans('general.importer.checked_out_to_fullname'),
+            'item_name' => trans('general.item_name_var', ['item' => trans('general.license')]),
            'license_email' => trans('admin/licenses/form.to_email'),
            'license_name' => trans('admin/licenses/form.to_name'),
-            'purchase_order' => trans('admin/licenses/form.purchase_order'),
-            'order_number' => trans('general.order_number'),
-            'reassignable' => trans('admin/licenses/form.reassignable'),
-            'seats' => trans('admin/licenses/form.seats'),
+            'location' => trans('general.location'),
+            'maintained' => trans('admin/licenses/form.maintained'),
+            'manufacturer' => trans('general.manufacturer'),
+            'min_amt' => trans('general.min_amt'),
            'notes' => trans('general.notes'),
-            'category' => trans('general.category'),
-            'supplier' => trans('general.supplier'),
+            'order_number' => trans('general.order_number'),
            'purchase_cost' => trans('general.purchase_cost'),
            'purchase_date' => trans('general.purchase_date'),
-            'maintained' => trans('admin/licenses/form.maintained'),
-            'checkout_class' => trans('general.importer.checkout_type'),
+            'purchase_order' => trans('admin/licenses/form.purchase_order'),
+            'reassignable' => trans('admin/licenses/form.reassignable'),
+            'seats' => trans('admin/licenses/form.seats'),
            'serial' => trans('general.license_serial'),
-            'email' => trans('general.importer.checked_out_to_email'),
+            'supplier' => trans('general.supplier'),
+            'termination_date' => trans('admin/licenses/form.termination_date'),
            'username' => trans('general.importer.checked_out_to_username'),
-            'manufacturer' => trans('general.manufacturer'),
        ];

        $this->users_fields = [
            'id' => trans('general.id'),
-            'company' => trans('general.company'),
-            'location' => trans('general.location'),
-            'department' => trans('general.department'),
-            'first_name' => trans('general.first_name'),
-            'last_name' => trans('general.last_name'),
-            'notes' => trans('general.notes'),
-            'username' => trans('admin/users/table.username'),
-            'jobtitle' => trans('admin/users/table.title'),
-            'phone_number' => trans('admin/users/table.phone'),
-            'manager_first_name' => trans('general.importer.manager_first_name'),
-            'manager_last_name' => trans('general.importer.manager_last_name'),
            'activated' => trans('general.activated'),
            'address' => trans('general.address'),
-            'city' => trans('general.city'),
-            'state' => trans('general.state'),
-            'country' => trans('general.country'),
-            'zip' => trans('general.zip'),
-            'vip' => trans('general.importer.vip'),
-            'remote' => trans('admin/users/general.remote'),
-            'email' => trans('admin/users/table.email'),
-            'website' => trans('general.website'),
            'avatar' => trans('general.image'),
-            'gravatar' => trans('general.importer.gravatar'),
-            'start_date' => trans('general.start_date'),
-            'end_date' => trans('general.end_date'),
+            'city' => trans('general.city'),
+            'company' => trans('general.company'),
+            'country' => trans('general.country'),
+            'department' => trans('general.department'),
+            'email' => trans('admin/users/table.email'),
            'employee_num' => trans('general.employee_number'),
+            'end_date' => trans('general.end_date'),
+            'first_name' => trans('general.first_name'),
+            'gravatar' => trans('general.importer.gravatar'),
+            'jobtitle' => trans('admin/users/table.title'),
+            'last_name' => trans('general.last_name'),
+            'location' => trans('general.location'),
+            'manager_first_name' => trans('general.importer.manager_first_name'),
+            'manager_last_name' => trans('general.importer.manager_last_name'),
+            'notes' => trans('general.notes'),
+            'phone_number' => trans('admin/users/table.phone'),
+            'remote' => trans('admin/users/general.remote'),
+            'start_date' => trans('general.start_date'),
+            'state' => trans('general.state'),
+            'username' => trans('admin/users/table.username'),
+            'vip' => trans('general.importer.vip'),
+            'website' => trans('general.website'),
+            'zip' => trans('general.zip'),
        ];

        $this->locations_fields = [
            'id' => trans('general.id'),
-            'name' => trans('general.item_name_var', ['item' => trans('general.location')]),
            'address' => trans('general.address'),
            'address2' => trans('general.importer.address2'),
            'city' => trans('general.city'),
-            'state' => trans('general.state'),
            'country' => trans('general.country'),
-            'zip' => trans('general.zip'),
            'currency' => trans('general.importer.currency'),
            'ldap_ou' => trans('admin/locations/table.ldap_ou'),
-            'manager_username' => trans('general.importer.manager_username'),
            'manager' => trans('general.importer.manager_full_name'),
-            'parent_location' => trans('admin/locations/table.parent'),
+            'manager_username' => trans('general.importer.manager_username'),
+            'name' => trans('general.item_name_var', ['item' => trans('general.location')]),
            'notes' => trans('general.notes'),
+            'parent_location' => trans('admin/locations/table.parent'),
+            'state' => trans('general.state'),
+            'zip' => trans('general.zip'),
        ];

        $this->assetmodels_fields  = [
-            'item_name' => trans('general.item_name_var', ['item' => trans('general.asset_model')]),
            'category' => trans('general.category'),
+            'eol' => trans('general.eol'),
+            'fieldset' => trans('admin/models/general.fieldset'),
+            'item_name' => trans('general.item_name_var', ['item' => trans('general.asset_model')]),
            'manufacturer' => trans('general.manufacturer'),
+            'min_amt' => trans('mail.min_QTY'),
            'model_number' => trans('general.model_no'),
            'notes' => trans('general.item_notes', ['item' => trans('admin/hardware/form.model')]),
-            'min_amt' => trans('mail.min_QTY'),
-            'fieldset' => trans('admin/models/general.fieldset'),
-            'eol' => trans('general.eol'),
            'requestable' => trans('admin/models/general.requestable'),

        ];
--- a/app/Livewire/LocationScopeCheck.php
+++ b/app/Livewire/LocationScopeCheck.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Livewire;
+
+use App\Helpers\Helper;
+use App\Models\Setting;
+use Livewire\Component;
+
+class LocationScopeCheck extends Component
+{
+    public $mismatched = [];
+    public $setting;
+
+    public function check_locations()
+    {
+        $this->mismatched = Helper::test_locations_fmcs(false);
+    }
+
+    public function mount() {
+        $this->setting = Setting::getSettings();
+        $this->mismatched = Helper::test_locations_fmcs(false);
+    }
+
+    public function render()
+    {
+        return view('livewire.location-scope-check');
+    }
+}
--- a/app/Livewire/OauthClients.php
+++ b/app/Livewire/OauthClients.php
@@ -47,7 +47,7 @@ class OauthClients extends Component
    {
        // test for safety
        // ->delete must be of type Client - thus the model binding
-        if ($clientId->created_by == auth()->id()) {
+        if ($clientId->user_id == auth()->id()) {
            app(ClientRepository::class)->delete($clientId);
        } else {
            Log::warning('User ' . auth()->id() . ' attempted to delete client ' . $clientId->id . ' which belongs to user ' . $clientId->created_by);
--- a/app/Livewire/SlackSettingsForm.php
+++ b/app/Livewire/SlackSettingsForm.php
@@ -71,12 +71,12 @@ class SlackSettingsForm extends Component

        $this->setting = Setting::getSettings();
        $this->save_button = trans('general.save');
-        $this->webhook_selected = $this->setting->webhook_selected;
-        $this->webhook_name = $this->webhook_text[$this->setting->webhook_selected]["name"];
-        $this->webhook_icon = $this->webhook_text[$this->setting->webhook_selected]["icon"];
-        $this->webhook_placeholder = $this->webhook_text[$this->setting->webhook_selected]["placeholder"];
-        $this->webhook_link = $this->webhook_text[$this->setting->webhook_selected]["link"];
-        $this->webhook_test = $this->webhook_text[$this->setting->webhook_selected]["test"];
+        $this->webhook_selected = ($this->setting->webhook_selected !== '') ? $this->setting->webhook_selected : 'slack';
+        $this->webhook_name = $this->webhook_text[$this->setting->webhook_selected]["name"] ?? $this->webhook_text['slack']["name"];
+        $this->webhook_icon = $this->webhook_text[$this->setting->webhook_selected]["icon"] ?? $this->webhook_text['slack']["icon"];
+        $this->webhook_placeholder = $this->webhook_text[$this->setting->webhook_selected]["placeholder"] ?? $this->webhook_text['slack']["placeholder"];
+        $this->webhook_link = $this->webhook_text[$this->setting->webhook_selected]["link"] ?? $this->webhook_text['slack']["link"];
+        $this->webhook_test = $this->webhook_text[$this->setting->webhook_selected]["test"] ?? $this->webhook_text['slack']["test"];
        $this->webhook_endpoint = $this->setting->webhook_endpoint;
        $this->webhook_channel = $this->setting->webhook_channel;
        $this->webhook_botname = $this->setting->webhook_botname;
@@ -90,7 +90,7 @@ class SlackSettingsForm extends Component
            $this->isDisabled= '';
        }
        if($this->webhook_selected === 'microsoft' && $this->teams_webhook_deprecated) {
-            session()->flash('warning', 'The selected Microsoft Teams webhook URL will be deprecated Jan 31st, 2025. Please use a workflow URL. Microsofts Documentation on creating a workflow can be found <a href="https://support.microsoft.com/en-us/office/create-incoming-webhooks-with-workflows-for-microsoft-teams-8ae491c7-0394-4861-ba59-055e33f75498" target="_blank"> here.</a>');
+            session()->flash('warning', trans('admin/settings/message.webhook.ms_teams_deprecation'));
        }
    }
    public function updated($field) {
--- a/app/Models/Asset.php
+++ b/app/Models/Asset.php
@@ -119,7 +119,8 @@ class Asset extends Depreciable
        'byod'              => ['nullable', 'boolean'],
        'order_number'      => ['nullable', 'string', 'max:191'],
        'notes'             => ['nullable', 'string', 'max:65535'],
-        'assigned_to'       => ['nullable', 'integer'],
+        'assigned_to'   => ['nullable', 'integer', 'required_with:assigned_type'],
+        'assigned_type' => ['nullable', 'required_with:assigned_to', 'in:'.User::class.",".Location::class.",".Asset::class],
        'requestable'       => ['nullable', 'boolean'],
        'assigned_user'     => ['nullable', 'exists:users,id,deleted_at,NULL'],
        'assigned_location' => ['nullable', 'exists:locations,id,deleted_at,NULL', 'fmcs_location'],
@@ -655,6 +656,8 @@ class Asset extends Depreciable
            return Storage::disk('public')->url(app('assets_upload_path').e($this->image));
        } elseif ($this->model && ! empty($this->model->image)) {
            return Storage::disk('public')->url(app('models_upload_path').e($this->model->image));
+        } elseif ($this->model?->category && ! empty($this->model->category->image)) {
+            return Storage::disk('public')->url(app('categories_upload_path').e($this->model->category->image));
        }

        return false;
@@ -803,6 +806,7 @@ class Asset extends Depreciable
            ->whereNotNull('warranty_months')
            ->whereNotNull('purchase_date')
            ->whereNull('deleted_at')
+            ->NotArchived()
            ->whereRaw('DATE_ADD(`purchase_date`, INTERVAL `warranty_months` MONTH) <= DATE_ADD(NOW(), INTERVAL '
                                 . $days
                                 . ' DAY) AND DATE_ADD(`purchase_date`, INTERVAL `warranty_months` MONTH) > NOW()')
@@ -1299,7 +1303,7 @@ class Asset extends Depreciable

    public function scopeDueForAudit($query, $settings)
    {
-        $interval = $settings->audit_warning_days ?? 0;
+        $interval = (int) $settings->audit_warning_days ?? 0;
        $today = Carbon::now();
        $interval_date = $today->copy()->addDays($interval)->format('Y-m-d');

@@ -1367,7 +1371,7 @@ class Asset extends Depreciable

    public function scopeDueForCheckin($query, $settings)
    {
-        $interval = $settings->due_checkin_days ?? 0;
+        $interval = (int) $settings->due_checkin_days ?? 0;
        $today = Carbon::now();
        $interval_date = $today->copy()->addDays($interval)->format('Y-m-d');

--- a/app/Models/Category.php
+++ b/app/Models/Category.php
@@ -100,6 +100,14 @@ class Category extends SnipeModel
    public function isDeletable()
    {

+        // We have to check for models as well if the category type is asset
+        if ($this->category_type == 'asset') {
+            return Gate::allows('delete', $this)
+                && ($this->itemCount() == 0)
+                && ($this->models_count == 0)
+                && ($this->deleted_at == '');
+        }
+
        return Gate::allows('delete', $this)
                && ($this->itemCount() == 0)
                && ($this->deleted_at == '');
--- a/app/Models/CustomField.php
+++ b/app/Models/CustomField.php
@@ -79,6 +79,9 @@ class CustomField extends Model
        'auto_add_to_fieldsets',
        'show_in_listview',
        'show_in_email',
+        'display_checkout',
+        'display_checkin',
+        'display_audit',
        'show_in_requestable_list',
    ];

@@ -183,7 +186,44 @@ class CustomField extends Model
    {
        return $this->belongsToMany(\App\Models\CustomFieldset::class);
    }
-   
+
+    public function displayFieldInCheckinForm()
+    {
+        if ($this->display_checkin == '1') {
+            return true;
+        }
+        return false;
+    }
+
+    public function displayFieldInCheckoutForm()
+    {
+        if ($this->display_checkout == '1') {
+            return true;
+        }
+        return false;
+    }
+
+    public function displayFieldInAuditForm()
+    {
+        if ($this->display_audit == '1') {
+            return true;
+        }
+        return false;
+    }
+
+    public function displayFieldInCurrentForm($form_type = null)
+    {
+        switch ($form_type) {
+            case 'audit':
+                return $this->displayFieldInAuditForm();
+            case 'checkin':
+                return $this->displayFieldInCheckinForm();
+            case 'checkout':
+                return $this->displayFieldInCheckoutForm();
+        }
+    }
+
+
    public function assetModels()
    {
       return $this->fieldset()->with('models')->get()->pluck('models')->flatten()->unique('id'); 
@@ -378,7 +418,7 @@ class CustomField extends Model

    /**
     * Check to see if there is a custom regex format type
-     * @see https://github.com/snipe/snipe-it/issues/5896
+     * @see https://github.com/grokability/snipe-it/issues/5896
     *
     * @author Wes Hulette <jwhulette@gmail.com>
     *
--- a/app/Models/CustomFieldset.php
+++ b/app/Models/CustomFieldset.php
@@ -71,6 +71,25 @@ class CustomFieldset extends Model
        return $this->belongsTo(\App\Models\User::class); //WARNING - not all CustomFieldsets have a User!!
    }

+    public function displayAnyFieldsInForm($form_type = null)
+    {
+        if ($this->fields) {
+
+            switch ($form_type) {
+                case 'audit':
+                    return $this->fields->where('display_audit', '1')->count() > 0;
+                case 'checkin':
+                    return $this->fields->where('display_checkin', '1')->count() > 0;
+                case 'checkout':
+                    return $this->fields->where('display_checkout', '1')->count() > 0;
+                default:
+                    return true;
+            }
+        }
+
+        return false;
+    }
+
    /**
     * Determine the validation rules we should apply based on the
     * custom field format
@@ -94,7 +113,10 @@ class CustomFieldset extends Model
                    $rule[] = 'unique_undeleted';
            }

-            array_push($rule, $field->attributes['format']);
+            if ($field->attributes['format']!='') {
+                array_push($rule, $field->attributes['format']);
+            }
+
            $rules[$field->db_column_name()] = $rule;


--- a/app/Models/Group.php
+++ b/app/Models/Group.php
@@ -76,11 +76,32 @@ class Group extends SnipeModel
     *
     * @author A. Gianotto <snipe@snipe.net>
     * @since [v1.0]
-     * @return array
+     * @return array | \stdClass
     */
    public function decodePermissions()
    {
-        return json_decode($this->permissions, true);
+        // If the permissions are an array, convert it to JSON
+        if (is_array($this->permissions)) {
+            $this->permissions = json_encode($this->permissions);
+        }
+
+        $permissions = json_decode($this->permissions ?? '{}', JSON_OBJECT_AS_ARRAY);
+
+        // Otherwise, loop through the permissions and cast the values as integers
+        if ((is_array($permissions)) && ($permissions)) {
+            foreach ($permissions as $permission => $value) {
+
+                if (!is_integer($permission)) {
+                    $permissions[$permission] = (int) $value;
+                } else {
+                    \Log::info('Weird data here - skipping it');
+                    unset($permissions[$permission]);
+                }
+            }
+            return $permissions ?: new \stdClass;
+        }
+        return new \stdClass;
+
    }

    /**
--- a/app/Models/Labels/Sheets/Avery/L7162_B.php
+++ b/app/Models/Labels/Sheets/Avery/L7162_B.php
@@ -55,7 +55,7 @@ class L7162_B extends L7162
                $pdf, $record->get('logo'),
                $pa->x1, $pa->y1,
                self::LOGO_MAX_WIDTH, $usableHeight,
-                'L', 'T', 300, true, false, 0.1
+                'L', 'T', 300, true, false, 0
            );
            $currentX += $logoSize[0] + self::LOGO_MARGIN;
            $usableWidth -= $logoSize[0] + self::LOGO_MARGIN;
@@ -100,4 +100,4 @@ class L7162_B extends L7162
 }


-?>
+?>
--- a/app/Models/Labels/Sheets/Avery/_3490.php
+++ b/app/Models/Labels/Sheets/Avery/_3490.php
@@ -0,0 +1,71 @@
+<?php
+
+namespace App\Models\Labels\Sheets\Avery;
+
+use App\Helpers\Helper;
+use App\Models\Labels\RectangleSheet;
+
+abstract class _3490 extends RectangleSheet
+{
+
+    private const PAPER_FORMAT      = 'A4';
+    private const PAPER_ORIENTATION = 'P';
+
+    /* Data in pt from Word Template */
+    private const COLUMN1_X = 5.00;
+    private const COLUMN2_X = 198.4;
+    private const ROW1_Y    = 10.00;
+    private const ROW2_Y    = 112.00;
+    private const LABEL_W   = 193.4;
+    private const LABEL_H   = 102.00;
+
+
+    private float $pageWidth;
+    private float $pageHeight;
+    private float $pageMarginLeft;
+    private float $pageMarginTop;
+
+    private float $columnSpacing;
+    private float $rowSpacing;
+
+    private float $labelWidth;
+    private float $labelHeight;
+
+    public function __construct() {
+        $paperSize = static::fromFormat(self::PAPER_FORMAT, self::PAPER_ORIENTATION, $this->getUnit(), 2);
+        $this->pageWidth = $paperSize->width;
+        $this->pageHeight = $paperSize->height;
+
+        $this->pageMarginLeft = Helper::convertUnit(self::COLUMN1_X, 'pt', $this->getUnit());
+        $this->pageMarginTop = Helper::convertUnit(self::ROW1_Y, 'pt', $this->getUnit());
+
+        $columnSpacingPt = self::COLUMN2_X - self::COLUMN1_X - self::LABEL_W;
+        $this->columnSpacing = Helper::convertUnit($columnSpacingPt, 'pt', $this->getUnit());
+        $rowSpacingPt = self::ROW2_Y - self::ROW1_Y - self::LABEL_H;
+        $this->rowSpacing = Helper::convertUnit($rowSpacingPt, 'pt', $this->getUnit());
+
+        $this->labelWidth = Helper::convertUnit(self::LABEL_W, 'pt', $this->getUnit());
+        $this->labelHeight = Helper::convertUnit(self::LABEL_H, 'pt', $this->getUnit());
+    }
+
+    public function getPageWidth()  { return $this->pageWidth; }
+    public function getPageHeight() { return $this->pageHeight; }
+
+    public function getPageMarginTop()    { return $this->pageMarginTop; }
+    public function getPageMarginBottom() { return $this->pageMarginTop; }
+    public function getPageMarginLeft()   { return $this->pageMarginLeft; }
+    public function getPageMarginRight()  { return $this->pageMarginLeft; }
+
+    public function getColumns() { return 3; }
+    public function getRows()    { return 10; }
+
+    public function getLabelColumnSpacing() { return $this->columnSpacing; }
+    public function getLabelRowSpacing()    { return $this->rowSpacing; }
+
+    public function getLabelWidth()  { return $this->labelWidth; }
+    public function getLabelHeight() { return $this->labelHeight; }
+
+    public function getLabelBorder() { return 0; }
+}
+
+?>
--- a/app/Models/Labels/Sheets/Avery/_3490_A.php
+++ b/app/Models/Labels/Sheets/Avery/_3490_A.php
@@ -0,0 +1,85 @@
+<?php
+
+namespace App\Models\Labels\Sheets\Avery;
+
+
+class _3490_A extends _3490
+{
+    private const BARCODE_MARGIN =   0.075;
+    private const TAG_SIZE       =   0.125;
+    private const TITLE_SIZE     =   0.140;
+    private const TITLE_MARGIN   =   0.040;
+    private const LABEL_SIZE     =   0.090;
+    private const LABEL_MARGIN   =  -0.015;
+    private const FIELD_SIZE     =   0.150;
+    private const FIELD_MARGIN   =   0.012;
+
+    public function getUnit() { return 'in'; }
+
+    public function getLabelMarginTop()    { return 0.06; }
+    public function getLabelMarginBottom() { return 0.06; }
+    public function getLabelMarginLeft()   { return 0.06; }
+    public function getLabelMarginRight()  { return 0.06; }
+
+    public function getSupportAssetTag()  { return false; }
+    public function getSupport1DBarcode() { return false; }
+    public function getSupport2DBarcode() { return true; }
+    public function getSupportFields()    { return 3; }
+    public function getSupportLogo()      { return false; }
+    public function getSupportTitle()     { return true; }
+
+    public function preparePDF($pdf) {}
+
+    public function write($pdf, $record) {
+        $pa = $this->getLabelPrintableArea();
+
+        $currentX = $pa->x1;
+        $currentY = $pa->y1;
+        $usableWidth = $pa->w;
+        $usableHeight = $pa->h;
+
+        if ($record->has('title')) {
+            static::writeText(
+                $pdf, $record->get('title'),
+                $pa->x1, $pa->y1,
+                'freesans', '', self::TITLE_SIZE, 'C',
+                $pa->w, self::TITLE_SIZE, true, 0
+            );
+            $currentY += self::TITLE_SIZE + self::TITLE_MARGIN;
+            $usableHeight -= self::TITLE_SIZE + self::TITLE_MARGIN;
+        }
+
+        $barcodeSize = $usableHeight;
+        if ($record->has('barcode2d')) {
+            static::write2DBarcode(
+                $pdf, $record->get('barcode2d')->content, $record->get('barcode2d')->type,
+                $currentX, $currentY,
+                $barcodeSize, $barcodeSize
+            );
+            $currentX += $barcodeSize + self::BARCODE_MARGIN;
+            $usableWidth -= $barcodeSize + self::BARCODE_MARGIN;
+        }
+
+        foreach ($record->get('fields') as $field) {
+            static::writeText(
+                $pdf, $field['label'],
+                $currentX, $currentY,
+                'freesans', '', self::LABEL_SIZE, 'L',
+                $usableWidth, self::LABEL_SIZE, true, 0
+            );
+            $currentY += self::LABEL_SIZE + self::LABEL_MARGIN;
+
+            static::writeText(
+                $pdf, $field['value'],
+                $currentX, $currentY,
+                'freemono', 'B', self::FIELD_SIZE, 'L',
+                $usableWidth, self::FIELD_SIZE, true, 0, 0.01
+            );
+            $currentY += self::FIELD_SIZE + self::FIELD_MARGIN;
+        }
+
+    }
+}
+
+
+?>
--- a/app/Models/Labels/Tapes/Brother/TZe_24mm_D.php
+++ b/app/Models/Labels/Tapes/Brother/TZe_24mm_D.php
@@ -70,27 +70,38 @@ class TZe_24mm_D extends TZe_24mm
        }

        foreach ($record->get('fields') as $field) {
-            // Write label and value on the same line
-            // Calculate label width with proportional character spacing
-            $labelWidth = $pdf->GetStringWidth($field['label'], 'freemono', '', self::LABEL_SIZE);
-            $charCount = strlen($field['label']);
-            $spacingPerChar = 0.5;
-            $totalSpacing = $charCount * $spacingPerChar;
-            $adjustedWidth = $labelWidth + $totalSpacing;
+            if (!empty($field['label']) && $field['label'] !== "\u{200B}") {
+                // Write label and value on the same line
+                // Calculate label width with proportional character spacing
+                $labelWidth = $pdf->GetStringWidth($field['label'], 'freemono', '', self::LABEL_SIZE);
+                $charCount = strlen($field['label']);
+                $spacingPerChar = 0.5;
+                $totalSpacing = $charCount * $spacingPerChar;
+                $adjustedWidth = $labelWidth + $totalSpacing;

-            static::writeText(
-                $pdf, $field['label'],
-                $currentX, $currentY,
-                'freemono', 'B', self::LABEL_SIZE, 'L',
-                $adjustedWidth, self::LABEL_SIZE, true, 0, $spacingPerChar
-            );
+                static::writeText(
+                    $pdf, $field['label'],
+                    $currentX, $currentY,
+                    'freemono', 'B', self::LABEL_SIZE, 'L',
+                    $adjustedWidth, self::LABEL_SIZE, true, 0, $spacingPerChar
+                );

-            static::writeText(
-                $pdf, $field['value'],
-                $currentX + $adjustedWidth + 2, $currentY,
-                'freemono', 'B', self::FIELD_SIZE, 'L',
-                $usableWidth - $adjustedWidth - 2, self::FIELD_SIZE, true, 0, 0.3
-            );
+                static::writeText(
+                    $pdf, $field['value'],
+                    $currentX + $adjustedWidth + 2, $currentY,
+                    'freemono', 'B', self::FIELD_SIZE, 'L',
+                    $usableWidth - $adjustedWidth - 2, self::FIELD_SIZE, true, 0, 0.3
+                );
+            } else {
+
+                // Label is empty, so write value only.
+                static::writeText(
+                    $pdf, $field['value'],
+                    $currentX, $currentY, // No offset
+                    'freemono', 'B', self::FIELD_SIZE, 'L',
+                    $usableWidth, self::FIELD_SIZE, true, 0, 0.3
+                );
+            }

            $currentY += max(self::LABEL_SIZE, self::FIELD_SIZE) + self::FIELD_MARGIN;
        }
--- a/app/Models/Location.php
+++ b/app/Models/Location.php
@@ -20,6 +20,7 @@ class Location extends SnipeModel
 {
    use HasFactory;
    use CompanyableTrait;
+    use Loggable;

    protected $presenter = \App\Presenters\LocationPresenter::class;
    use Presentable;
@@ -288,6 +289,23 @@ class Location extends SnipeModel
        return $this->attributes['ldap_ou'] = empty($ldap_ou) ? null : $ldap_ou;
    }

+    /**
+     * Get uploads for this location
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v4.0]
+     * @return \Illuminate\Database\Eloquent\Relations\Relation
+     */
+    public function uploads()
+    {
+        return $this->hasMany('\App\Models\Actionlog', 'item_id')
+            ->where('item_type', '=', Location::class)
+            ->where('action_type', '=', 'uploaded')
+            ->whereNotNull('filename')
+            ->orderBy('created_at', 'desc');
+    }
+
+
    /**
     * Query builder scope to order on parent
     *
--- a/app/Models/Loggable.php
+++ b/app/Models/Loggable.php
@@ -100,13 +100,15 @@ trait Loggable


        foreach ($originalValues as $key => $value) {
+            // TODO - action_date isn't a valid attribute of any first-class object, so we might want to remove this?
            if ($key == 'action_date' && $value != $action_date) {
                $changed[$key]['old'] = $value;
                $changed[$key]['new'] = is_string($action_date) ? $action_date : $action_date->format('Y-m-d H:i:s');
-            } elseif ($value != $this->getAttributes()[$key]) {
+            } elseif (array_key_exists($key, $this->getAttributes()) && $value != $this->getAttributes()[$key]) {
                $changed[$key]['old'] = $value;
                $changed[$key]['new'] = $this->getAttributes()[$key];
            }
+            // NOTE - if the attribute exists in $originalValues, but *not* in ->getAttributes(), it isn't added to $changed
        }

        if (!empty($changed)){
@@ -343,4 +345,24 @@ trait Loggable

        return $log;
    }
+
+    /**
+     * Get latest signature from a specific user
+     *
+     * This just makes the print view a bit cleaner
+     * Returns the latest acceptance ActionLog that contains a signature
+     * from $user or null if there is none
+     *
+     * @param User $user
+     * @return null|Actionlog
+     **/
+    public function getLatestSignedAcceptance(User $user)
+    {
+        return $this->log->where('target_type', User::class)
+            ->where('target_id', $user->id)
+            ->where('action_type', 'accepted')
+            ->where('accept_signature', '!=', null)
+            ->sortByDesc('created_at')
+            ->first();
+    }
 }
--- a/app/Models/Traits/Searchable.php
+++ b/app/Models/Traits/Searchable.php
@@ -77,7 +77,7 @@ trait Searchable
                /**
                 * Making sure to only search in date columns if the search term consists of characters that can make up a MySQL timestamp!
                 *
-                 * @see https://github.com/snipe/snipe-it/issues/4590
+                 * @see https://github.com/grokability/snipe-it/issues/4590
                 */
                if (! preg_match('/^[0-9 :-]++$/', $term) && in_array($column, $this->getDates())) {
                    continue;
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -20,6 +20,7 @@ use Illuminate\Notifications\Notifiable;
 use Illuminate\Support\Facades\Gate;
 use Laravel\Passport\HasApiTokens;
 use Watson\Validating\ValidatingTrait;
+use Illuminate\Database\Eloquent\Casts\Attribute;

 class User extends SnipeModel implements AuthenticatableContract, AuthorizableContract, CanResetPasswordContract, HasLocalePreference
 {
@@ -114,16 +115,21 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
     * @var array
     */
    protected $searchableAttributes = [
-        'first_name',
-        'last_name',
+        'address',
+        'city',
+        'country',
        'email',
-        'username',
+        'employee_num',
+        'first_name',
+        'jobtitle',
+        'last_name',
+        'locale',
        'notes',
        'phone',
-        'jobtitle',
-        'employee_num',
+        'state',
+        'username',
        'website',
-        'locale',
+        'zip',
    ];

    /**
@@ -132,13 +138,36 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
     * @var array
     */
    protected $searchableRelations = [
-        'userloc'    => ['name'],
+        'userloc'    => ['name', 'address', 'address2', 'city', 'state', 'zip'],
        'department' => ['name'],
        'groups'     => ['name'],
        'company'    => ['name'],
        'manager'    => ['first_name', 'last_name', 'username'],
    ];

+
+    /**
+     * This sets the name property on the user. It's not a real field in the database
+     * (since we use first_name and last_name), but the Laravel mailable method
+     * uses this to determine the name of the user to send emails to.
+     *
+     * We only have to do this on the User model and no other models because other
+     * first-class objects have a name field.
+     * @return void
+     */
+
+    public $name;
+
+    protected static function boot()
+    {
+        parent::boot();
+
+        static::retrieved(function($user){
+            $user->name = $user->getFullNameAttribute();
+        });
+    }
+
+
    /**
     * Internally check the user permission for the given section
     *
@@ -279,6 +308,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
        return $this->activated == 1;
    }

+
    /**
     * Returns the full name attribute
     *
@@ -290,7 +320,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
    {
        $setting = Setting::getSettings();

-        if ($setting->name_display_format=='last_first') {
+        if ($setting?->name_display_format == 'last_first') {
            return ($this->last_name) ? $this->last_name.' '.$this->first_name : $this->first_name;
        }
        return $this->last_name ? $this->first_name.' '.$this->last_name : $this->first_name;
@@ -622,6 +652,8 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
                $username = str_slug($first_name).'_'.str_slug($last_name);
            } elseif ($format == 'firstname') {
                $username = str_slug($first_name);
+            } elseif ($format == 'lastname') {
+                $username = str_slug($last_name);
            } elseif ($format == 'firstinitial.lastname') {
                $username = str_slug(substr($first_name, 0, 1).'.'.str_slug($last_name));
            } elseif ($format == 'lastname_firstinitial') {
@@ -714,10 +746,36 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
    }


-
+    /**
+     * Decode JSON permissions into array
+     *
+     * @author A. Gianotto <snipe@snipe.net>
+     * @since [v1.0]
+     * @return array | \stdClass
+     */
    public function decodePermissions()
    {
-        return json_decode($this->permissions, true);
+        // If the permissions are an array, convert it to JSON
+        if (is_array($this->permissions)) {
+            $this->permissions = json_encode($this->permissions);
+        }
+
+        $permissions = json_decode($this->permissions ?? '{}', JSON_OBJECT_AS_ARRAY);
+
+        // Otherwise, loop through the permissions and cast the values as integers
+        if ((is_array($permissions)) && ($permissions)) {
+            foreach ($permissions as $permission => $value) {
+
+                if (!is_integer($permission)) {
+                    $permissions[$permission] = (int) $value;
+                } else {
+                    \Log::info('Weird data here - skipping it');
+                    unset($permissions[$permission]);
+                }
+            }
+            return $permissions ?: new \stdClass;
+        }
+        return new \stdClass;
    }

    /**
@@ -842,10 +900,22 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
        return $query->leftJoin('companies as companies_user', 'users.company_id', '=', 'companies_user.id')->orderBy('companies_user.name', $order);
    }

-    public function preferredLocale()
+
+
+
+    /**
+     * Get the preferred locale for the user.
+     *
+     * This uses the HasLocalePreference contract to determine the user's preferred locale,
+     * used by Laravel's mail system to determine the locale for sending emails.
+     * https://laravel.com/docs/11.x/mail#user-preferred-locales
+     *
+     */
+    public function preferredLocale(): string
    {
-        return $this->locale;
+        return $this->locale ?? Setting::getSettings()->locale ?? config('app.locale');
    }
+
    public function getUserTotalCost(){
        $asset_cost= 0;
        $license_cost= 0;
--- a/app/Notifications/AuditNotification.php
+++ b/app/Notifications/AuditNotification.php
@@ -2,6 +2,7 @@

 namespace App\Notifications;

+use AllowDynamicProperties;
 use App\Models\Setting;
 use Illuminate\Bus\Queueable;
 use Illuminate\Notifications\Channels\SlackWebhookChannel;
@@ -12,7 +13,7 @@ use Illuminate\Support\Str;
 use NotificationChannels\MicrosoftTeams\MicrosoftTeamsChannel;
 use NotificationChannels\MicrosoftTeams\MicrosoftTeamsMessage;

-class AuditNotification extends Notification
+#[AllowDynamicProperties] class AuditNotification extends Notification
 {
    use Queueable;
    /**
--- a/app/Notifications/CheckinAccessoryNotification.php
+++ b/app/Notifications/CheckinAccessoryNotification.php
@@ -73,10 +73,18 @@ class CheckinAccessoryNotification extends Notification
        $channel = ($this->settings->webhook_channel) ? $this->settings->webhook_channel : '';

        $fields = [
-            'To' => '<'.$target->present()->viewUrl().'|'.$target->present()->fullName().'>',
-            'By' => '<'.$admin->present()->viewUrl().'|'.$admin->present()->fullName().'>',
+            trans('general.from') => '<'.$target->present()->viewUrl().'|'.$target->present()->fullName().'>',
+            trans('general.by') => '<'.$admin->present()->viewUrl().'|'.$admin->present()->fullName().'>',
        ];

+        if ($item->location) {
+            $fields[trans('general.location')] = $item->location->name;
+        }
+
+        if ($item->company) {
+            $fields[trans('general.company')] = $item->company->name;
+        }
+
        return (new SlackMessage)
            ->content(':arrow_down: :keyboard: '.trans('mail.Accessory_Checkin_Notification'))
            ->from($botname)
--- a/app/Notifications/CheckinAssetNotification.php
+++ b/app/Notifications/CheckinAssetNotification.php
@@ -83,6 +83,15 @@ class CheckinAssetNotification extends Notification
            trans('general.location') => ($item->location) ? $item->location->name : '',
        ];

+        if ($item->location) {
+            $fields[trans('general.location')] = $item->location->name;
+        }
+
+        if ($item->company) {
+            $fields[trans('general.company')] = $item->company->name;
+        }
+
+
        return (new SlackMessage)
            ->content(':arrow_down: :computer: '.trans('mail.Asset_Checkin_Notification'))
            ->from($botname)
--- a/app/Notifications/CheckinLicenseSeatNotification.php
+++ b/app/Notifications/CheckinLicenseSeatNotification.php
@@ -77,9 +77,18 @@ class CheckinLicenseSeatNotification extends Notification

        if ($admin) {
            $fields = [
-                'To' => '<'.$target->present()->viewUrl().'|'.$target->present()->fullName().'>',
-                'By' => '<'.$admin->present()->viewUrl().'|'.$admin->present()->fullName().'>',
+                trans('general.from')  => '<'.$target->present()->viewUrl().'|'.$target->present()->fullName().'>',
+                trans('general.by') => '<'.$admin->present()->viewUrl().'|'.$admin->present()->fullName().'>',
            ];
+
+            if ($item->location) {
+                $fields[trans('general.location')] = $item->location->name;
+            }
+
+            if ($item->company) {
+                $fields[trans('general.company')] = $item->company->name;
+            }
+
        } else {
            $fields = [
                'To' => '<'.$target->present()->viewUrl().'|'.$target->present()->fullName().'>',
--- a/app/Notifications/CheckoutAccessoryNotification.php
+++ b/app/Notifications/CheckoutAccessoryNotification.php
@@ -100,10 +100,18 @@ class CheckoutAccessoryNotification extends Notification
        $channel = ($this->settings->webhook_channel) ? $this->settings->webhook_channel : '';

        $fields = [
-            'To' => '<'.$target->present()->viewUrl().'|'.$target->present()->fullName().'>',
-            'By' => '<'.$admin->present()->viewUrl().'|'.$admin->present()->fullName().'>',
+            trans('general.to') => '<'.$target->present()->viewUrl().'|'.$target->present()->fullName().'>',
+            trans('general.by') => '<'.$admin->present()->viewUrl().'|'.$admin->present()->fullName().'>',
        ];

+        if ($item->location) {
+            $fields[trans('general.location')] = $item->location->name;
+        }
+
+        if ($item->company) {
+            $fields[trans('general.company')] = $item->company->name;
+        }
+
        return (new SlackMessage)
            ->content(':arrow_up: :keyboard: Accessory Checked Out')
            ->from($botname)
--- a/app/Notifications/CheckoutAssetNotification.php
+++ b/app/Notifications/CheckoutAssetNotification.php
@@ -93,12 +93,20 @@ class CheckoutAssetNotification extends Notification
        $channel = ($this->settings->webhook_channel) ? $this->settings->webhook_channel : '';

        $fields = [
-            'To' => '<'.$target->present()->viewUrl().'|'.$target->present()->fullName().'>',
-            'By' => '<'.$admin->present()->viewUrl().'|'.$admin->present()->fullName().'>',
+            trans('general.to') => '<'.$target->present()->viewUrl().'|'.$target->present()->fullName().'>',
+            trans('general.by') => '<'.$admin->present()->viewUrl().'|'.$admin->present()->fullName().'>',
        ];

+        if ($item->location) {
+            $fields[trans('general.location')] = $item->location->name;
+        }
+
+        if ($item->company) {
+            $fields[trans('general.company')] = $item->company->name;
+        }
+
        if (($this->expected_checkin) && ($this->expected_checkin !== '')) {
-            $fields['Expected Checkin'] = $this->expected_checkin;
+            $fields[trans('general.expected_checkin')] = $this->expected_checkin;
        }

        return (new SlackMessage)
--- a/app/Notifications/CheckoutConsumableNotification.php
+++ b/app/Notifications/CheckoutConsumableNotification.php
@@ -80,10 +80,18 @@ class CheckoutConsumableNotification extends Notification
        $channel = ($this->settings->webhook_channel) ? $this->settings->webhook_channel : '';

        $fields = [
-            'To' => '<'.$target->present()->viewUrl().'|'.$target->present()->fullName().'>',
-            'By' => '<'.$admin->present()->viewUrl().'|'.$admin->present()->fullName().'>',
+            trans('general.to') => '<'.$target->present()->viewUrl().'|'.$target->present()->fullName().'>',
+            trans('general.by') => '<'.$admin->present()->viewUrl().'|'.$admin->present()->fullName().'>',
        ];

+        if ($item->location) {
+            $fields[trans('general.location')] = $item->location->name;
+        }
+
+        if ($item->company) {
+            $fields[trans('general.company')] = $item->company->name;
+        }
+
        return (new SlackMessage)
            ->content(':arrow_up: :paperclip: Consumable Checked Out')
            ->from($botname)
--- a/app/Notifications/CheckoutLicenseSeatNotification.php
+++ b/app/Notifications/CheckoutLicenseSeatNotification.php
@@ -78,10 +78,18 @@ class CheckoutLicenseSeatNotification extends Notification
        $channel = ($this->settings->webhook_channel) ? $this->settings->webhook_channel : '';

        $fields = [
-            'To' => '<'.$target->present()->viewUrl().'|'.$target->present()->fullName().'>',
-            'By' => '<'.$admin->present()->viewUrl().'|'.$admin->present()->fullName().'>',
+            trans('general.to') => '<'.$target->present()->viewUrl().'|'.$target->present()->fullName().'>',
+            trans('general.by') => '<'.$admin->present()->viewUrl().'|'.$admin->present()->fullName().'>',
        ];

+        if ($item->location) {
+            $fields[trans('general.location')] = $item->location->name;
+        }
+
+        if ($item->company) {
+            $fields[trans('general.company')] = $item->company->name;
+        }
+
        return (new SlackMessage)
            ->content(':arrow_up: :floppy_disk: License Checked Out')
            ->from($botname)
--- a/app/Observers/AssetObserver.php
+++ b/app/Observers/AssetObserver.php
@@ -40,8 +40,9 @@ class AssetObserver

        // If the asset isn't being checked out or audited, log the update.
        // (Those other actions already create log entries.)
-	    if (($attributes['assigned_to'] == $attributesOriginal['assigned_to'])
-	    && ($same_checkout_counter) && ($same_checkin_counter)
+        if (array_key_exists('assigned_to', $attributes) && array_key_exists('assigned_to', $attributesOriginal)
+            && ($attributes['assigned_to'] == $attributesOriginal['assigned_to'])
+            && ($same_checkout_counter) && ($same_checkin_counter)
            && ((isset( $attributes['next_audit_date']) ? $attributes['next_audit_date'] : null) == (isset($attributesOriginal['next_audit_date']) ? $attributesOriginal['next_audit_date']: null))
            && ($attributes['last_checkout'] == $attributesOriginal['last_checkout']) && (!$restoring_or_deleting))
        {
@@ -158,7 +159,7 @@ class AssetObserver
     * is used in this observer, it doesn't actually exist yet and the migration will break unless we
     * use saveQuietly() in the migration which skips this observer.
     *
-     * @see https://github.com/snipe/snipe-it/issues/13723#issuecomment-1761315938
+     * @see https://github.com/grokability/snipe-it/issues/13723#issuecomment-1761315938
     */
    public function saving(Asset $asset)
    {
--- a/app/Policies/CustomFieldsetPolicy.php
+++ b/app/Policies/CustomFieldsetPolicy.php
@@ -11,7 +11,7 @@ class CustomFieldsetPolicy extends SnipePermissionsPolicy
         * This allows us to use the existing permissions in use and have more
         * semantically correct authorization checks for custom fieldsets.
         *
-         * See: https://github.com/snipe/snipe-it/pull/5795
+         * See: https://github.com/grokability/snipe-it/pull/5795
         */
        return 'customfields';
    }
--- a/app/Policies/LicensePolicy.php
+++ b/app/Policies/LicensePolicy.php
@@ -22,7 +22,7 @@ class LicensePolicy extends CheckoutablePermissionsPolicy
     * something (maybe I got the product key wrong), and now I can never
     * see/edit that product key.
     *
-     * @see https://github.com/snipe/snipe-it/issues/6956
+     * @see https://github.com/grokability/snipe-it/issues/6956
     * @param  \App\Models\User  $user
     * @param  \App\Models\License  $license
     * @return mixed
--- a/app/Presenters/AssetPresenter.php
+++ b/app/Presenters/AssetPresenter.php
@@ -298,6 +298,7 @@ class AssetPresenter extends Presenter
                'sortable' => true,
                'visible' => false,
                'title' => trans('general.byod'),
+                'class' => 'byod',
                'formatter' => 'trueFalseFormatter',

            ],
--- a/app/Presenters/LicensePresenter.php
+++ b/app/Presenters/LicensePresenter.php
@@ -230,16 +230,7 @@ class LicensePresenter extends Presenter
                'switchable' => true,
                'title' => trans('general.id'),
                'visible' => false,
-           ],
-           [
-                'field' => 'name',
-                'searchable' => false,
-                'sortable' => false,
-                'sorter'   => 'numericOnly',
-                'switchable' => true,
-                'title' => trans('admin/licenses/general.seat'),
-                'visible' => true,
-            ], [
+           ],[
                'field' => 'assigned_user',
                'searchable' => false,
                'sortable' => false,
@@ -280,6 +271,14 @@ class LicensePresenter extends Presenter
                'visible' => true,
                'formatter' => 'locationsLinkObjFormatter',
            ],
+            [
+                'field' => 'updated_at',
+                'searchable' => false,
+                'sortable' => true,
+                'visible' => false,
+                'title' => trans('general.updated_at'),
+                'formatter' => 'dateDisplayFormatter',
+            ],
            [
                'field' => 'notes',
                'searchable' => false,
--- a/app/Presenters/LocationPresenter.php
+++ b/app/Presenters/LocationPresenter.php
@@ -33,7 +33,7 @@ class LocationPresenter extends Presenter
                'switchable' => true,
                'title' => trans('general.company'),
                'visible' => false,
-                'formatter' => 'locationCompanyObjFilterFormatter'
+                'formatter' => 'companiesLinkObjFormatter'
            ],
            [
                'field' => 'name',
--- a/app/Providers/AuthServiceProvider.php
+++ b/app/Providers/AuthServiceProvider.php
@@ -168,6 +168,15 @@ class AuthServiceProvider extends ServiceProvider
            }
        });

+        // -----------------------------------------
+        // Activity
+        // -----------------------------------------
+        Gate::define('activity.view', function ($user) {
+            if (($user->hasAccess('reports.view')) || ($user->hasAccess('admin'))) {
+                return true;
+            }
+        });
+
        // -----------------------------------------
        // Self
        // -----------------------------------------
--- a/app/Providers/BreadcrumbsServiceProvider.php
+++ b/app/Providers/BreadcrumbsServiceProvider.php
@@ -67,6 +67,11 @@ class BreadcrumbsServiceProvider extends ServiceProvider
        ->push(trans('general.create'), route('hardware.create'))
        );

+        Breadcrumbs::for('clone/hardware', fn (Trail $trail) =>
+        $trail->parent('hardware.index', route('hardware.index'))
+            ->push(trans('admin/hardware/general.clone'), route('hardware.create'))
+        );
+
        Breadcrumbs::for('hardware.show', fn (Trail $trail, Asset $asset) =>
        $trail->parent('hardware.index', route('hardware.index'))
            ->push($asset->present()->fullName(), route('hardware.show', $asset))
@@ -74,7 +79,8 @@ class BreadcrumbsServiceProvider extends ServiceProvider

        Breadcrumbs::for('hardware.edit', fn (Trail $trail, Asset $asset) =>
        $trail->parent('hardware.index', route('hardware.index'))
-            ->push(trans('general.breadcrumb_button_actions.edit_item', ['name' => $asset->asset_tag]), route('hardware.edit', $asset))
+            ->push($asset->present()->fullName(), route('hardware.show', $asset))
+            ->push(trans('admin/hardware/general.edit'))
        );


@@ -377,6 +383,12 @@ class BreadcrumbsServiceProvider extends ServiceProvider
            ->push(trans('general.create'), route('locations.create'))
        );

+        Breadcrumbs::for('clone/location', fn (Trail $trail) =>
+        $trail->parent('locations.index', route('locations.index'))
+            ->push(trans('admin/locations/table.clone'), route('locations.create'))
+        );
+
+
        Breadcrumbs::for('locations.show', fn (Trail $trail, Location $location) =>
        $trail->parent('locations.index', route('locations.index'))
            ->push($location->name, route('locations.show', $location))
@@ -384,6 +396,7 @@ class BreadcrumbsServiceProvider extends ServiceProvider

        Breadcrumbs::for('locations.edit', fn (Trail $trail, Location $location) =>
        $trail->parent('locations.index', route('locations.index'))
+            ->push($location->name, route('locations.show', $location))
            ->push(trans('general.breadcrumb_button_actions.edit_item', ['name' => $location->name]), route('locations.edit', $location))
        );

@@ -537,9 +550,16 @@ class BreadcrumbsServiceProvider extends ServiceProvider
            ->push(trans('general.create'), route('users.create'))
        );

+        Breadcrumbs::for('users.clone.show', fn (Trail $trail) =>
+        $trail->parent('users.index', route('users.index'))
+            ->push(trans('admin/users/general.clone'), route('users.create'))
+        );
+
+
+
        Breadcrumbs::for('users.show', fn (Trail $trail, User $user) =>
        $trail->parent('users.index', route('users.index'))
-            ->push($user->username, route('users.show', $user))
+            ->push($user->getFullNameAttribute() ?? 'Missing Username!', route('users.show', $user))
        );

        Breadcrumbs::for('users.edit', fn (Trail $trail, User $user) =>
--- a/app/Providers/RouteServiceProvider.php
+++ b/app/Providers/RouteServiceProvider.php
@@ -45,6 +45,7 @@ class RouteServiceProvider extends ServiceProvider
            require base_path('routes/web/models.php');
            require base_path('routes/web/accessories.php');
            require base_path('routes/web/licenses.php');
+            require base_path('routes/web/locations.php');
            require base_path('routes/web/consumables.php');
            require base_path('routes/web/fields.php');
            require base_path('routes/web/components.php');
--- a/app/Providers/SettingsServiceProvider.php
+++ b/app/Providers/SettingsServiceProvider.php
@@ -65,6 +65,10 @@ class SettingsServiceProvider extends ServiceProvider
            return 'assets/';
        });

+        \App::singleton('audits_upload_path', function () {
+            return 'audits/';
+        });
+
        \App::singleton('accessories_upload_path', function () {
            return 'public/uploads/accessories/';
        });
--- a/app/Rules/UserCannotSwitchCompaniesIfItemsAssigned.php
+++ b/app/Rules/UserCannotSwitchCompaniesIfItemsAssigned.php
@@ -15,7 +15,7 @@ class UserCannotSwitchCompaniesIfItemsAssigned implements ValidationRule
     */
    public function validate(string $attribute, mixed $value, Closure $fail): void
    {
-        $user = User::find(request()->route('user')->id);
+        $user = request()->route('user');

        if (($value) && ($user->allAssignedCount() > 0) && (Setting::getSettings()->full_multiple_companies_support=='1')) {

--- a/app/View/Label.php
+++ b/app/View/Label.php
@@ -184,16 +184,34 @@ class Label implements View
                                // We'll set the label to an empty string since we
                                // injected the label into the value field above.
                                $previous['label'] = '';
-
                                return $previous;
                            });

                        return $toAdd ? $myFields->push($toAdd) : $myFields;
                    }, new Collection());

-                $assetData->put('fields', $fields->take($template->getSupportFields()));
+                $emptyRowsCount = $settings->label2_empty_row_count;
+                if($emptyRowsCount) {
+                    // Create empty rows
+                    $emptyRows = collect(range(1, $emptyRowsCount))->map(function () {
+                        return [
+                            'label' => '',
+                            'value' => '',
+                            'dataSource' => null,
+                        ];
+                    });
+
+                    // Prepend empty rows to the existing fields
+                    $fieldsWithEmpty = $emptyRows->merge($fields);
+
+                    $assetData->put('fields', $fieldsWithEmpty->take($template->getSupportFields()));
+                    return $assetData;
+                }
+               else{
+                   $assetData->put('fields', $fields->take($template->getSupportFields()));
+                   return $assetData;
+               }

-                return $assetData;
            });
        
        if ($template instanceof Sheet) {
--- a/Show More
+++ b/Show More