Re-adding scope

Signed-off-by: snipe <snipe@snipe.net>
Removed the wrong method lol
2025-04-18 04:16:40 +01:00 · 2025-04-18 04:15:40 +01:00 · 2025-04-18 04:12:10 +01:00 · 2025-04-18 04:07:12 +01:00 · 2025-04-18 04:07:12 +01:00 · 2025-04-18 04:07:12 +01:00
3356 changed files with 314832 additions and 97236 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,6 +2607,15 @@
        "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",
@@ -3319,7 +3328,7 @@
    },
    {
      "login": "36864",
-      "name": "36864",
+      "name": 36864,
      "avatar_url": "https://avatars.githubusercontent.com/u/109086466?v=4",
      "profile": "https://github.com/36864",
      "contributions": [
@@ -3343,897 +3352,6 @@
      "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"
-      ]
-    },
-    {
-      "login": "Tinyblargon",
-      "name": "Okean",
-      "avatar_url": "https://avatars.githubusercontent.com/u/76069640?v=4",
-      "profile": "https://github.com/Tinyblargon",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "amedranogil",
-      "name": "Alejandro Medrano",
-      "avatar_url": "https://avatars.githubusercontent.com/u/6515064?v=4",
-      "profile": "https://www.lst.tfo.upm.es/alejandro-medrano/",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "lukaskraic",
-      "name": "Lukas Kraic",
-      "avatar_url": "https://avatars.githubusercontent.com/u/58696401?v=4",
-      "profile": "https://github.com/lukaskraic",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "mckaygerhard",
-      "name": "Герхард PICCORO Lenz McKAY ",
-      "avatar_url": "https://avatars.githubusercontent.com/u/1571724?v=4",
-      "profile": "https://github-readme-stats.vercel.app/api?username=mckaygerhard",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "FlorestanII",
-      "name": "Johannes Pollitt",
-      "avatar_url": "https://avatars.githubusercontent.com/u/15015119?v=4",
-      "profile": "https://github.com/FlorestanII",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "strobelm",
-      "name": "Michael Strobel",
-      "avatar_url": "https://avatars.githubusercontent.com/u/14185442?v=4",
-      "profile": "https://strobelm.de",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "nickwest",
-      "name": "Nicky West",
-      "avatar_url": "https://avatars.githubusercontent.com/u/634790?v=4",
-      "profile": "http://nickwest.me",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "akaspeh1",
-      "name": "akaspeh1",
-      "avatar_url": "https://avatars.githubusercontent.com/u/1347327?v=4",
-      "profile": "https://github.com/akaspeh1",
-      "contributions": [
-        "code"
-      ]
    }
  ]
 }
--- a/.env.docker
+++ b/.env.docker
@@ -28,7 +28,6 @@ PUBLIC_FILESYSTEM_DISK=local_public
 # --------------------------------------------
 DB_CONNECTION=mysql
 DB_HOST=db
-DB_SOCKET=null
 DB_PORT='3306'
 DB_DATABASE=snipeit
 DB_USERNAME=snipeit
@@ -169,7 +168,6 @@ AWS_DEFAULT_REGION=null
 LOGIN_MAX_ATTEMPTS=5
 LOGIN_LOCKOUT_DURATION=60
 RESET_PASSWORD_LINK_EXPIRES=900
-INVITE_PASSWORD_LINK_EXPIRES=1500

 # --------------------------------------------
 # OPTIONAL: MISC
--- a/.env.example
+++ b/.env.example
@@ -24,7 +24,6 @@ PUBLIC_FILESYSTEM_DISK=local_public
 # --------------------------------------------
 DB_CONNECTION=mysql
 DB_HOST=127.0.0.1
-DB_SOCKET=null
 DB_PORT=3306
 DB_DATABASE=null
 DB_USERNAME=null
@@ -175,7 +174,6 @@ LOGIN_AUTOCOMPLETE=false
 RESET_PASSWORD_LINK_EXPIRES=15
 PASSWORD_CONFIRM_TIMEOUT=10800
 PASSWORD_RESET_MAX_ATTEMPTS_PER_MIN=50
-INVITE_PASSWORD_LINK_EXPIRES=1500

 # --------------------------------------------
 # OPTIONAL: MISC
@@ -193,17 +191,11 @@ LDAP_TIME_LIM=600
 IMPORT_TIME_LIMIT=600
 IMPORT_MEMORY_LIMIT=500M
 REPORT_TIME_LIMIT=12000
+REQUIRE_SAML=false
 API_THROTTLE_PER_MINUTE=120
 CSV_ESCAPE_FORMULAS=true
 LIVEWIRE_URL_PREFIX=null

-
-# --------------------------------------------
-# OPTIONAL: SAML SETTINGS
-# --------------------------------------------
-REQUIRE_SAML=false
-SAML_KEY_SIZE=2048
-
 # --------------------------------------------
 # OPTIONAL: HASHING
 # --------------------------------------------
--- a/.github/workflows/SA-codeql.yml
+++ b/.github/workflows/SA-codeql.yml
@@ -26,7 +26,7 @@ jobs:
        language: [ 'javascript' ]
    steps:
    - name: Checkout repository
-      uses: actions/checkout@v5
+      uses: actions/checkout@v4

    # Initializes the CodeQL tools for scanning.
    - name: Initialize CodeQL
--- a/.github/workflows/codacy-analysis.yml
+++ b/.github/workflows/codacy-analysis.yml
@@ -10,10 +10,10 @@ name: Codacy Security Scan

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

@@ -32,11 +32,11 @@ jobs:
    steps:
      # Checkout the repository to the GitHub Actions runner
      - name: Checkout code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4

      # Execute Codacy Analysis CLI and generate a SARIF output with the security issues identified during the analysis
      - name: Run Codacy Analysis CLI
-        uses: codacy/codacy-analysis-cli-action@v4.4.7
+        uses: codacy/codacy-analysis-cli-action@v4.4.5
        with:
          # Check https://github.com/codacy/codacy-analysis-cli#project-token to get your project token from your Codacy repository
          # You can also omit the token and run the tools that support default configurations
--- a/.github/workflows/crowdin-upload.yml
+++ b/.github/workflows/crowdin-upload.yml
@@ -9,7 +9,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4

      - name: Crowdin push
        uses: crowdin/github-action@v2
--- a/.github/workflows/docker-alpine.yml
+++ b/.github/workflows/docker-alpine.yml
@@ -1,86 +0,0 @@
-# Snipe-IT (Alpine) Docker image build for hub.docker.com
-name: Docker images (Alpine)
-
-# 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
-on:
-  push:
-    branches:
-      - master
-      - develop
-    tags:
-      - 'v**'
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
-
-  pull_request:
-
-permissions:
-  contents: read
-
-jobs:
-  docker:
-    # 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)
-      # For a new commit on default branch (master), use the literal tag 'latest' on Docker image.
-      # For a new commit on other branches, use the branch name as the tag for Docker image.
-      # For a new tag, copy that tag name as the tag for Docker image.
-      IMAGE_TAGS: |
-        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
-      # Define default tag "flavor" for docker/metadata-action per
-      # https://github.com/docker/metadata-action#flavor-input
-      # We turn off 'latest' tag by default.
-      TAGS_FLAVOR: |
-        latest=false
-
-    steps:
-      # https://github.com/actions/checkout
-      - name: Checkout codebase
-        uses: actions/checkout@v5
-
-      # https://github.com/docker/setup-buildx-action
-      - name: Setup Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      # https://github.com/docker/login-action
-      - name: Login to DockerHub
-        # Only login if not a PR, as PRs only trigger a Docker build and not a push
-        if: github.event_name != 'pull_request'
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
-
-      ###############################################
-      # Build/Push the 'snipe/snipe-it' image
-      ###############################################
-      # https://github.com/docker/metadata-action
-      # Get Metadata for docker_build step below
-      - name: Sync metadata (tags, labels) from GitHub to Docker for 'snipe-it' image
-        id: meta_build
-        uses: docker/metadata-action@v5
-        with:
-          images: snipe/snipe-it
-          tags: ${{ env.IMAGE_TAGS }}
-          flavor: ${{ env.TAGS_FLAVOR }}
-
-      # https://github.com/docker/build-push-action
-      - name: Build and push 'snipe-it' image
-        id: docker_build
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: ./Dockerfile.alpine
-          platforms: linux/amd64,linux/arm64
-          # For pull requests, we run the Docker build (to ensure no PR changes break the build),
-          # but we ONLY do an image push to DockerHub if it's NOT a PR
-          push: ${{ github.event_name != 'pull_request' }}
-          # Use tags / labels provided by 'docker/metadata-action' above
-          tags: ${{ steps.meta_build.outputs.tags }}
-          labels: ${{ steps.meta_build.outputs.labels }}
--- a/.github/workflows/docker-arm.yml
+++ b/.github/workflows/docker-arm.yml
@@ -0,0 +1,151 @@
+# Snipe-IT Docker image build for hub.docker.com
+name: Docker ARM64 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
+on:
+  push:
+    branches:
+      - master
+      - develop
+    tags:
+      - 'v**'
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+  pull_request:
+
+permissions:
+  contents: read
+
+jobs:
+  docker-ubuntu-arm:
+    # 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-24.04-arm
+    env:
+      # Define tags to use for Docker images based on Git tags/branches (for docker/metadata-action)
+      # For a new commit on default branch (master), use the literal tag 'latest' on Docker image.
+      # For a new commit on other branches, use the branch name as the tag for Docker image.
+      # For a new tag, copy that tag name as the tag for Docker image.
+      IMAGE_TAGS: |
+        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
+      # Define default tag "flavor" for docker/metadata-action per
+      # https://github.com/docker/metadata-action#flavor-input
+      # We turn off 'latest' tag by default.
+      TAGS_FLAVOR: |
+        latest=false
+
+    steps:
+      # https://github.com/actions/checkout
+      - name: Checkout codebase
+        uses: actions/checkout@v4
+
+      # https://github.com/docker/setup-buildx-action
+      - name: Setup Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      # https://github.com/docker/login-action
+      - name: Login to DockerHub
+        # Only login if not a PR, as PRs only trigger a Docker build and not a push
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
+
+      ###############################################
+      # Build/Push the 'grokability/snipe-it' image
+      ###############################################
+      # https://github.com/docker/metadata-action
+      # Get Metadata for docker_build step below
+      - name: Sync metadata (tags, labels) from GitHub to Docker for 'snipe-it' image
+        id: meta_build
+        uses: docker/metadata-action@v5
+        with:
+          images: grokability/snipe-it
+          tags: ${{ env.IMAGE_TAGS }}
+          flavor: ${{ env.TAGS_FLAVOR }}
+
+      # https://github.com/docker/build-push-action
+      - name: Build and push 'snipe-it' image
+        id: docker_build
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: ./Dockerfile
+          platforms: linux/arm64
+          # For pull requests, we run the Docker build (to ensure no PR changes break the build),
+          # but we ONLY do an image push to DockerHub if it's NOT a PR
+          push: ${{ github.event_name != 'pull_request' }}
+          # Use tags / labels provided by 'docker/metadata-action' above
+          tags: ${{ steps.meta_build.outputs.tags }}
+          labels: ${{ steps.meta_build.outputs.labels }}
+  docker-alpine-arm:
+    # 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-24.04-arm
+    env:
+      # Define tags to use for Docker images based on Git tags/branches (for docker/metadata-action)
+      # For a new commit on default branch (master), use the literal tag 'latest' on Docker image.
+      # For a new commit on other branches, use the branch name as the tag for Docker image.
+      # For a new tag, copy that tag name as the tag for Docker image.
+      IMAGE_TAGS: |
+        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 
+      # Define default tag "flavor" for docker/metadata-action per
+      # https://github.com/docker/metadata-action#flavor-input
+      # We turn off 'latest' tag by default.
+      TAGS_FLAVOR: |
+        latest=false
+
+    steps:
+      # https://github.com/actions/checkout
+      - name: Checkout codebase
+        uses: actions/checkout@v4
+
+      # https://github.com/docker/setup-buildx-action
+      - name: Setup Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      # https://github.com/docker/login-action
+      - name: Login to DockerHub
+        # Only login if not a PR, as PRs only trigger a Docker build and not a push
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
+
+      ###############################################
+      # Build/Push the 'grokability/snipe-it' image
+      ###############################################
+      # https://github.com/docker/metadata-action
+      # Get Metadata for docker_build step below
+      - name: Sync metadata (tags, labels) from GitHub to Docker for 'snipe-it' image
+        id: meta_build
+        uses: docker/metadata-action@v5
+        with:
+          images: grokability/snipe-it
+          tags: ${{ env.IMAGE_TAGS }}
+          flavor: ${{ env.TAGS_FLAVOR }}
+
+      # https://github.com/docker/build-push-action
+      - name: Build and push 'snipe-it' image
+        id: docker_build
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: ./Dockerfile.alpine
+          platforms: linux/arm64
+          # For pull requests, we run the Docker build (to ensure no PR changes break the build),
+          # but we ONLY do an image push to DockerHub if it's NOT a PR
+          push: ${{ github.event_name != 'pull_request' }}
+          # Use tags / labels provided by 'docker/metadata-action' above
+          tags: ${{ steps.meta_build.outputs.tags }}
+          labels: ${{ steps.meta_build.outputs.labels }}
--- a/.github/workflows/docker-intel.yml
+++ b/.github/workflows/docker-intel.yml
@@ -0,0 +1,151 @@
+# Snipe-IT Docker image build for hub.docker.com
+name: Docker Intel/amd64 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
+on:
+  push:
+    branches:
+      - master
+      - develop
+    tags:
+      - 'v**'
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+  pull_request:
+
+permissions:
+  contents: read
+
+jobs:
+  docker-ubuntu-intel:
+    # 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)
+      # For a new commit on default branch (master), use the literal tag 'latest' on Docker image.
+      # For a new commit on other branches, use the branch name as the tag for Docker image.
+      # For a new tag, copy that tag name as the tag for Docker image.
+      IMAGE_TAGS: |
+        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
+      # Define default tag "flavor" for docker/metadata-action per
+      # https://github.com/docker/metadata-action#flavor-input
+      # We turn off 'latest' tag by default.
+      TAGS_FLAVOR: |
+        latest=false
+
+    steps:
+      # https://github.com/actions/checkout
+      - name: Checkout codebase
+        uses: actions/checkout@v4
+
+      # https://github.com/docker/setup-buildx-action
+      - name: Setup Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      # https://github.com/docker/login-action
+      - name: Login to DockerHub
+        # Only login if not a PR, as PRs only trigger a Docker build and not a push
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
+
+      ###############################################
+      # Build/Push the 'grokability/snipe-it' image
+      ###############################################
+      # https://github.com/docker/metadata-action
+      # Get Metadata for docker_build step below
+      - name: Sync metadata (tags, labels) from GitHub to Docker for 'snipe-it' image
+        id: meta_build
+        uses: docker/metadata-action@v5
+        with:
+          images: grokability/snipe-it
+          tags: ${{ env.IMAGE_TAGS }}
+          flavor: ${{ env.TAGS_FLAVOR }}
+
+      # https://github.com/docker/build-push-action
+      - name: Build and push 'snipe-it' image
+        id: docker_build
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: ./Dockerfile
+          platforms: linux/amd64
+          # For pull requests, we run the Docker build (to ensure no PR changes break the build),
+          # but we ONLY do an image push to DockerHub if it's NOT a PR
+          push: ${{ github.event_name != 'pull_request' }}
+          # Use tags / labels provided by 'docker/metadata-action' above
+          tags: ${{ steps.meta_build.outputs.tags }}
+          labels: ${{ steps.meta_build.outputs.labels }}
+  docker-alpine-intel:
+    # 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)
+      # For a new commit on default branch (master), use the literal tag 'latest' on Docker image.
+      # For a new commit on other branches, use the branch name as the tag for Docker image.
+      # For a new tag, copy that tag name as the tag for Docker image.
+      IMAGE_TAGS: |
+        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
+      # Define default tag "flavor" for docker/metadata-action per
+      # https://github.com/docker/metadata-action#flavor-input
+      # We turn off 'latest' tag by default.
+      TAGS_FLAVOR: |
+        latest=false
+
+    steps:
+      # https://github.com/actions/checkout
+      - name: Checkout codebase
+        uses: actions/checkout@v4
+
+      # https://github.com/docker/setup-buildx-action
+      - name: Setup Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      # https://github.com/docker/login-action
+      - name: Login to DockerHub
+        # Only login if not a PR, as PRs only trigger a Docker build and not a push
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
+
+      ###############################################
+      # Build/Push the 'grokability/snipe-it' image
+      ###############################################
+      # https://github.com/docker/metadata-action
+      # Get Metadata for docker_build step below
+      - name: Sync metadata (tags, labels) from GitHub to Docker for 'snipe-it' image
+        id: meta_build
+        uses: docker/metadata-action@v5
+        with:
+          images: grokability/snipe-it
+          tags: ${{ env.IMAGE_TAGS }}
+          flavor: ${{ env.TAGS_FLAVOR }}
+
+      # https://github.com/docker/build-push-action
+      - name: Build and push 'snipe-it' image
+        id: docker_build
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: ./Dockerfile.alpine
+          platforms: linux/amd64
+          # For pull requests, we run the Docker build (to ensure no PR changes break the build),
+          # but we ONLY do an image push to DockerHub if it's NOT a PR
+          push: ${{ github.event_name != 'pull_request' }}
+          # Use tags / labels provided by 'docker/metadata-action' above
+          tags: ${{ steps.meta_build.outputs.tags }}
+          labels: ${{ steps.meta_build.outputs.labels }}
--- a/.github/workflows/docker-ubuntu.yml
+++ b/.github/workflows/docker-ubuntu.yml
@@ -1,86 +0,0 @@
-# Snipe-IT Docker image build for hub.docker.com
-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
-on:
-  push:
-    branches:
-      - master
-      - develop
-    tags:
-      - 'v**'
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
-
-  pull_request:
-
-permissions:
-  contents: read
-
-jobs:
-  docker:
-    # 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)
-      # For a new commit on default branch (master), use the literal tag 'latest' on Docker image.
-      # For a new commit on other branches, use the branch name as the tag for Docker image.
-      # For a new tag, copy that tag name as the tag for Docker image.
-      IMAGE_TAGS: |
-        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
-      # Define default tag "flavor" for docker/metadata-action per
-      # https://github.com/docker/metadata-action#flavor-input
-      # We turn off 'latest' tag by default.
-      TAGS_FLAVOR: |
-        latest=false
-
-    steps:
-      # https://github.com/actions/checkout
-      - name: Checkout codebase
-        uses: actions/checkout@v5
-
-      # https://github.com/docker/setup-buildx-action
-      - name: Setup Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      # https://github.com/docker/login-action
-      - name: Login to DockerHub
-        # Only login if not a PR, as PRs only trigger a Docker build and not a push
-        if: github.event_name != 'pull_request'
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_ACCESS_TOKEN }}
-
-      ###############################################
-      # Build/Push the 'snipe/snipe-it' image
-      ###############################################
-      # https://github.com/docker/metadata-action
-      # Get Metadata for docker_build step below
-      - name: Sync metadata (tags, labels) from GitHub to Docker for 'snipe-it' image
-        id: meta_build
-        uses: docker/metadata-action@v5
-        with:
-          images: snipe/snipe-it
-          tags: ${{ env.IMAGE_TAGS }}
-          flavor: ${{ env.TAGS_FLAVOR }}
-
-      # https://github.com/docker/build-push-action
-      - name: Build and push 'snipe-it' image
-        id: docker_build
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: ./Dockerfile
-          platforms: linux/amd64,linux/arm64
-          # For pull requests, we run the Docker build (to ensure no PR changes break the build),
-          # but we ONLY do an image push to DockerHub if it's NOT a PR
-          push: ${{ github.event_name != 'pull_request' }}
-          # Use tags / labels provided by 'docker/metadata-action' above
-          tags: ${{ steps.meta_build.outputs.tags }}
-          labels: ${{ steps.meta_build.outputs.labels }}
--- a/.github/workflows/dockerhub-description.yml
+++ b/.github/workflows/dockerhub-description.yml
@@ -11,7 +11,7 @@ jobs:
  dockerHubDescription:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4

      - name: Docker Hub Description
        uses: grokability/dockerhub-description@7ea9d275c7cdbe2b676a093a0308c50665e3b8b4
--- a/.github/workflows/tests-mysql.yml
+++ b/.github/workflows/tests-mysql.yml
@@ -37,7 +37,7 @@ jobs:
          php-version: "${{ matrix.php-version }}"
          coverage: none

-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4

      - name: Get Composer Cache Directory
        id: composer-cache
--- a/.github/workflows/tests-postgres.yml
+++ b/.github/workflows/tests-postgres.yml
@@ -34,7 +34,7 @@ jobs:
          php-version: "${{ matrix.php-version }}"
          coverage: none

-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4

      - name: Get Composer Cache Directory
        id: composer-cache
--- a/.github/workflows/tests-sqlite.yml
+++ b/.github/workflows/tests-sqlite.yml
@@ -25,7 +25,7 @@ jobs:
          php-version: "${{ matrix.php-version }}"
          coverage: none

-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4

      - name: Get Composer Cache Directory
        id: composer-cache
--- a/.pa11yci.json
+++ b/.pa11yci.json
@@ -1,240 +0,0 @@
-{
-    "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
@@ -1,23 +1,23 @@
 Thanks goes to all of these wonderful people ([emoji key](https://github.com/kentcdodds/all-contributors#emoji-key)) who have helped Snipe-IT get this far:

 <!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
-| [<img src="https://avatars3.githubusercontent.com/u/197404?v=3" width="110px;"/><br /><sub>snipe</sub>](http://www.snipe.net)<br />[💻](https://github.com/snipe/snipe-it/commits?author=snipe "Code") [🚇](#infra-snipe "Infrastructure (Hosting, Build-Tools, etc)") [📖](https://github.com/snipe/snipe-it/commits?author=snipe "Documentation") [⚠️](https://github.com/snipe/snipe-it/commits?author=snipe "Tests") [🐛](https://github.com/snipe/snipe-it/issues?q=author%3Asnipe "Bug reports") [🎨](#design-snipe "Design") [👀](#review-snipe "Reviewed Pull Requests") | [<img src="https://avatars0.githubusercontent.com/u/36335?v=3" width="110px;"/><br /><sub>Brady Wetherington</sub>](http://www.uberbrady.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=uberbrady "Code") [📖](https://github.com/snipe/snipe-it/commits?author=uberbrady "Documentation") [🚇](#infra-uberbrady "Infrastructure (Hosting, Build-Tools, etc)") [👀](#review-uberbrady "Reviewed Pull Requests") | [<img src="https://avatars0.githubusercontent.com/u/3803132?v=3" width="110px;"/><br /><sub>Daniel Meltzer</sub>](https://github.com/dmeltzer)<br />[💻](https://github.com/snipe/snipe-it/commits?author=dmeltzer "Code") [⚠️](https://github.com/snipe/snipe-it/commits?author=dmeltzer "Tests") [📖](https://github.com/snipe/snipe-it/commits?author=dmeltzer "Documentation") | [<img src="https://avatars0.githubusercontent.com/u/1609106?v=3" width="110px;"/><br /><sub>Michael T</sub>](http://www.tuckertechonline.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mtucker6784 "Code") | [<img src="https://avatars2.githubusercontent.com/u/3274937?v=3" width="110px;"/><br /><sub>madd15</sub>](https://github.com/madd15)<br />[📖](https://github.com/snipe/snipe-it/commits?author=madd15 "Documentation") [💬](#question-madd15 "Answering Questions") | [<img src="https://avatars2.githubusercontent.com/u/894126?v=3" width="110px;"/><br /><sub>Vincent Sposato</sub>](https://github.com/vsposato)<br />[💻](https://github.com/snipe/snipe-it/commits?author=vsposato "Code") | [<img src="https://avatars0.githubusercontent.com/u/1639757?v=3" width="110px;"/><br /><sub>Andrea Bergamasco</sub>](https://github.com/vjandrea)<br />[💻](https://github.com/snipe/snipe-it/commits?author=vjandrea "Code") |
-| :---: | :---: | :---: | :---: | :---: | :---: | :---: |
-| [<img src="https://avatars0.githubusercontent.com/u/10640152?v=3" width="110px;"/><br /><sub>Karol</sub>](https://github.com/kpawelski)<br />[🌍](#translation-kpawelski "Translation") [💻](https://github.com/snipe/snipe-it/commits?author=kpawelski "Code") | [<img src="https://avatars3.githubusercontent.com/u/600106?v=3" width="110px;"/><br /><sub>morph027</sub>](http://blog.morph027.de/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=morph027 "Code") | [<img src="https://avatars3.githubusercontent.com/u/22935755?v=3" width="110px;"/><br /><sub>fvleminckx</sub>](https://github.com/fvleminckx)<br />[🚇](#infra-fvleminckx "Infrastructure (Hosting, Build-Tools, etc)") | [<img src="https://avatars2.githubusercontent.com/u/15633547?v=3" width="110px;"/><br /><sub>itsupportcmsukorg</sub>](https://github.com/itsupportcmsukorg)<br />[💻](https://github.com/snipe/snipe-it/commits?author=itsupportcmsukorg "Code") [🐛](https://github.com/snipe/snipe-it/issues?q=author%3Aitsupportcmsukorg "Bug reports") | [<img src="https://avatars3.githubusercontent.com/u/12373799?v=3" width="110px;"/><br /><sub>Frank</sub>](https://override.io)<br />[💻](https://github.com/snipe/snipe-it/commits?author=base-zero "Code") | [<img src="https://avatars0.githubusercontent.com/u/10137?v=3" width="110px;"/><br /><sub>Deleted user</sub>](https://github.com/ghost)<br />[🌍](#translation-ghost "Translation") [💻](https://github.com/snipe/snipe-it/commits?author=ghost "Code") | [<img src="https://avatars1.githubusercontent.com/u/10802313?v=3" width="110px;"/><br /><sub>tiagom62</sub>](https://github.com/tiagom62)<br />[💻](https://github.com/snipe/snipe-it/commits?author=tiagom62 "Code") [🚇](#infra-tiagom62 "Infrastructure (Hosting, Build-Tools, etc)") |
-| [<img src="https://avatars3.githubusercontent.com/u/2389047?v=3" width="110px;"/><br /><sub>Ryan Stafford</sub>](https://github.com/rystaf)<br />[💻](https://github.com/snipe/snipe-it/commits?author=rystaf "Code") | [<img src="https://avatars2.githubusercontent.com/u/10345935?v=3" width="110px;"/><br /><sub>Eammon Hanlon</sub>](https://github.com/ehanlon)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ehanlon "Code") | [<img src="https://avatars0.githubusercontent.com/u/441924?v=3" width="110px;"/><br /><sub>zjean</sub>](https://github.com/zjean)<br />[💻](https://github.com/snipe/snipe-it/commits?author=zjean "Code") | [<img src="https://avatars0.githubusercontent.com/u/12660103?v=3" width="110px;"/><br /><sub>Matthias Frei</sub>](http://www.frei.media)<br />[💻](https://github.com/snipe/snipe-it/commits?author=FREImedia "Code") | [<img src="https://avatars0.githubusercontent.com/u/3767518?v=3" width="110px;"/><br /><sub>opsydev</sub>](https://github.com/opsydev)<br />[💻](https://github.com/snipe/snipe-it/commits?author=opsydev "Code") | [<img src="https://avatars1.githubusercontent.com/u/82290?v=3" width="110px;"/><br /><sub>Daniel Dreier</sub>](http://www.ddreier.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ddreier "Code") | [<img src="https://avatars0.githubusercontent.com/u/23448?v=3" width="110px;"/><br /><sub>Nikolai Prokoschenko</sub>](http://rassie.org)<br />[💻](https://github.com/snipe/snipe-it/commits?author=rassie "Code") |
-| [<img src="https://avatars0.githubusercontent.com/u/13452757?v=3" width="110px;"/><br /><sub>Drew</sub>](https://github.com/YetAnotherCodeMonkey)<br />[💻](https://github.com/snipe/snipe-it/commits?author=YetAnotherCodeMonkey "Code") | [<img src="https://avatars0.githubusercontent.com/u/1342320?v=3" width="110px;"/><br /><sub>Walter</sub>](https://github.com/merid14)<br />[💻](https://github.com/snipe/snipe-it/commits?author=merid14 "Code") | [<img src="https://avatars3.githubusercontent.com/u/11254614?v=3" width="110px;"/><br /><sub>Petr Baloun</sub>](https://github.com/balous)<br />[💻](https://github.com/snipe/snipe-it/commits?author=balous "Code") | [<img src="https://avatars0.githubusercontent.com/u/6117660?v=3" width="110px;"/><br /><sub>reidblomquist</sub>](https://github.com/reidblomquist)<br />[📖](https://github.com/snipe/snipe-it/commits?author=reidblomquist "Documentation") | [<img src="https://avatars0.githubusercontent.com/u/539914?v=3" width="110px;"/><br /><sub>Mathieu Kooiman</sub>](https://github.com/mathieuk)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mathieuk "Code") | [<img src="https://avatars3.githubusercontent.com/u/6606421?v=3" width="110px;"/><br /><sub>csayre</sub>](https://github.com/csayre)<br />[📖](https://github.com/snipe/snipe-it/commits?author=csayre "Documentation") | [<img src="https://avatars1.githubusercontent.com/u/768488?v=3" width="110px;"/><br /><sub>Adam Dunson</sub>](https://github.com/adamdunson)<br />[💻](https://github.com/snipe/snipe-it/commits?author=adamdunson "Code") |
-| [<img src="https://avatars0.githubusercontent.com/u/5547470?v=3" width="110px;"/><br /><sub>Hereward</sub>](https://github.com/thehereward)<br />[💻](https://github.com/snipe/snipe-it/commits?author=thehereward "Code") | [<img src="https://avatars0.githubusercontent.com/u/5802977?v=3" width="110px;"/><br /><sub>swoopdk</sub>](https://github.com/swoopdk)<br />[💻](https://github.com/snipe/snipe-it/commits?author=swoopdk "Code") | [<img src="https://avatars1.githubusercontent.com/u/3470403?v=3" width="110px;"/><br /><sub>Abdullah Alansari</sub>](https://linkedin.com/in/ahimta)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Ahimta "Code") | [<img src="https://avatars0.githubusercontent.com/u/796443?v=3" width="110px;"/><br /><sub>Micael Rodrigues</sub>](https://github.com/MicaelRodrigues)<br />[💻](https://github.com/snipe/snipe-it/commits?author=MicaelRodrigues "Code") | [<img src="https://avatars0.githubusercontent.com/u/614564?v=3" width="110px;"/><br /><sub>Patrick Gallagher</sub>](http://macadmincorner.com)<br />[📖](https://github.com/snipe/snipe-it/commits?author=patgmac "Documentation") | [<img src="https://avatars3.githubusercontent.com/u/7165922?v=3" width="110px;"/><br /><sub>Miliamber</sub>](https://github.com/Miliamber)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Miliamber "Code") | [<img src="https://avatars3.githubusercontent.com/u/861766?v=3" width="110px;"/><br /><sub>hawk554</sub>](https://github.com/hawk554)<br />[💻](https://github.com/snipe/snipe-it/commits?author=hawk554 "Code") |
-| [<img src="https://avatars1.githubusercontent.com/u/1695622?v=3" width="110px;"/><br /><sub>Justin Kerr</sub>](http://jbirdkerr.net)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jbirdkerr "Code") | [<img src="https://avatars3.githubusercontent.com/u/11426176?v=3" width="110px;"/><br /><sub>Ira W. Snyder</sub>](http://www.irasnyder.com/devel/)<br />[📖](https://github.com/snipe/snipe-it/commits?author=irasnyd "Documentation") | [<img src="https://avatars2.githubusercontent.com/u/2475759?v=3" width="110px;"/><br /><sub>Aladin Alaily</sub>](https://github.com/aalaily)<br />[💻](https://github.com/snipe/snipe-it/commits?author=aalaily "Code") | [<img src="https://avatars0.githubusercontent.com/u/10247644?v=3" width="110px;"/><br /><sub>Chase Hansen</sub>](https://github.com/kobie-chasehansen)<br />[💻](https://github.com/snipe/snipe-it/commits?author=kobie-chasehansen "Code") [💬](#question-kobie-chasehansen "Answering Questions") [🐛](https://github.com/snipe/snipe-it/issues?q=author%3Akobie-chasehansen "Bug reports") | [<img src="https://avatars2.githubusercontent.com/u/13545400?v=3" width="110px;"/><br /><sub>IDM Helpdesk</sub>](https://github.com/IDM-Helpdesk)<br />[💻](https://github.com/snipe/snipe-it/commits?author=IDM-Helpdesk "Code") | [<img src="https://avatars2.githubusercontent.com/u/614439?v=3" width="110px;"/><br /><sub>Kai</sub>](http://balticer.de)<br />[💻](https://github.com/snipe/snipe-it/commits?author=balticer "Code") | [<img src="https://avatars1.githubusercontent.com/u/8762511?v=3" width="110px;"/><br /><sub>Michael Daniels</sub>](http://www.michaeldaniels.me)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mdaniels5757 "Code") |
-| [<img src="https://avatars3.githubusercontent.com/u/1532660?v=3" width="110px;"/><br /><sub>Tom Castleman</sub>](http://tomcastleman.me)<br />[💻](https://github.com/snipe/snipe-it/commits?author=tomcastleman "Code") | [<img src="https://avatars3.githubusercontent.com/u/10723243?v=3" width="110px;"/><br /><sub>Daniel Nemanic</sub>](https://github.com/DanielNemanic)<br />[💻](https://github.com/snipe/snipe-it/commits?author=DanielNemanic "Code") | [<img src="https://avatars0.githubusercontent.com/u/150648?v=3" width="110px;"/><br /><sub>SouthWolf</sub>](https://github.com/southwolf)<br />[💻](https://github.com/snipe/snipe-it/commits?author=southwolf "Code") | [<img src="https://avatars2.githubusercontent.com/u/131616?v=3" width="110px;"/><br /><sub>Ivar Nesje</sub>](https://github.com/ivarne)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ivarne "Code") | [<img src="https://avatars1.githubusercontent.com/u/62333?v=3" width="110px;"/><br /><sub>Jérémy Benoist</sub>](http://www.j0k3r.net)<br />[📖](https://github.com/snipe/snipe-it/commits?author=j0k3r "Documentation") | [<img src="https://avatars2.githubusercontent.com/u/724344?v=3" width="110px;"/><br /><sub>Chris Leathley</sub>](https://github.com/cleathley)<br />[🚇](#infra-cleathley "Infrastructure (Hosting, Build-Tools, etc)") | [<img src="https://avatars0.githubusercontent.com/u/972498?v=3" width="110px;"/><br /><sub>splaer</sub>](https://github.com/splaer)<br />[🐛](https://github.com/snipe/snipe-it/issues?q=author%3Asplaer "Bug reports") [💻](https://github.com/snipe/snipe-it/commits?author=splaer "Code") |
-| [<img src="https://avatars1.githubusercontent.com/u/967362?v=3" width="110px;"/><br /><sub>Joe Ferguson</sub>](http://www.joeferguson.me)<br />[💻](https://github.com/snipe/snipe-it/commits?author=svpernova09 "Code") | [<img src="https://avatars3.githubusercontent.com/u/6108682?v=3" width="110px;"/><br /><sub>diwanicki</sub>](https://github.com/diwanicki)<br />[💻](https://github.com/snipe/snipe-it/commits?author=diwanicki "Code") [📖](https://github.com/snipe/snipe-it/commits?author=diwanicki "Documentation") | [<img src="https://avatars3.githubusercontent.com/u/2527115?v=3" width="110px;"/><br /><sub>Lee Thoong Ching</sub>](https://github.com/pakkua80)<br />[📖](https://github.com/snipe/snipe-it/commits?author=pakkua80 "Documentation") [💻](https://github.com/snipe/snipe-it/commits?author=pakkua80 "Code") | [<img src="https://avatars1.githubusercontent.com/u/461491?v=3" width="110px;"/><br /><sub>Marek Šuppa</sub>](http://shu.io)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mrshu "Code") | [<img src="https://avatars1.githubusercontent.com/u/8693762?v=3" width="110px;"/><br /><sub>Juan J. Martinez</sub>](https://github.com/mizar1616)<br />[🌍](#translation-mizar1616 "Translation") | [<img src="https://avatars1.githubusercontent.com/u/1458388?v=3" width="110px;"/><br /><sub>R Ryan Dial</sub>](https://github.com/rrdial)<br />[🌍](#translation-rrdial "Translation") | [<img src="https://avatars2.githubusercontent.com/u/2871745?v=3" width="110px;"/><br /><sub>Andrej Manduch</sub>](https://github.com/burlito)<br />[📖](https://github.com/snipe/snipe-it/commits?author=burlito "Documentation") |
-| [<img src="https://avatars0.githubusercontent.com/u/8341172?v=3" width="110px;"/><br /><sub>Jay Richards</sub>](http://www.cordeos.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=technogenus "Code") | [<img src="https://avatars2.githubusercontent.com/u/7295127?v=3" width="110px;"/><br /><sub>Alexander Innes</sub>](https://necurity.co.uk)<br />[💻](https://github.com/snipe/snipe-it/commits?author=leostat "Code") | [<img src="https://avatars2.githubusercontent.com/u/334485?v=3" width="110px;"/><br /><sub>Danny Garcia</sub>](https://buzzedword.codes)<br />[💻](https://github.com/snipe/snipe-it/commits?author=buzzedword "Code") | [<img src="https://avatars2.githubusercontent.com/u/366855?v=3" width="110px;"/><br /><sub>archpoint</sub>](https://github.com/archpoint)<br />[💻](https://github.com/snipe/snipe-it/commits?author=archpoint "Code") | [<img src="https://avatars1.githubusercontent.com/u/67991?v=3" width="110px;"/><br /><sub>Jake McGraw</sub>](http://www.jakemcgraw.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jakemcgraw "Code") | [<img src="https://avatars1.githubusercontent.com/u/1714374?v=3" width="110px;"/><br /><sub>FleischKarussel</sub>](https://github.com/FleischKarussel)<br />[📖](https://github.com/snipe/snipe-it/commits?author=FleischKarussel "Documentation") | [<img src="https://avatars3.githubusercontent.com/u/319644?v=3" width="110px;"/><br /><sub>Dylan Yi</sub>](https://github.com/feeva)<br />[💻](https://github.com/snipe/snipe-it/commits?author=feeva "Code") |
-| [<img src="https://avatars2.githubusercontent.com/u/857740?v=3" width="110px;"/><br /><sub>Gil Rutkowski</sub>](http://FlashingCursor.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=flashingcursor "Code") | [<img src="https://avatars3.githubusercontent.com/u/129360?v=3" width="110px;"/><br /><sub>Desmond Morris</sub>](http://www.desmondmorris.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=desmondmorris "Code") | [<img src="https://avatars2.githubusercontent.com/u/52936?v=3" width="110px;"/><br /><sub>Nick Peelman</sub>](http://peelman.us)<br />[💻](https://github.com/snipe/snipe-it/commits?author=peelman "Code") | [<img src="https://avatars0.githubusercontent.com/u/53161?v=3" width="110px;"/><br /><sub>Abraham Vegh</sub>](https://abrahamvegh.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=abrahamvegh "Code") | [<img src="https://avatars0.githubusercontent.com/u/2818680?v=3" width="110px;"/><br /><sub>Mohamed Rashid</sub>](https://github.com/rashivkp)<br />[📖](https://github.com/snipe/snipe-it/commits?author=rashivkp "Documentation") | [<img src="https://avatars3.githubusercontent.com/u/1509456?v=3" width="110px;"/><br /><sub>Kasey</sub>](http://hinchk.github.io)<br />[💻](https://github.com/snipe/snipe-it/commits?author=HinchK "Code") | [<img src="https://avatars2.githubusercontent.com/u/10522541?v=3" width="110px;"/><br /><sub>Brett</sub>](https://github.com/BrettFagerlund)<br />[⚠️](https://github.com/snipe/snipe-it/commits?author=BrettFagerlund "Tests") |
-| [<img src="https://avatars2.githubusercontent.com/u/16108587?v=3" width="110px;"/><br /><sub>Jason Spriggs</sub>](http://jasonspriggs.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jasonspriggs "Code") | [<img src="https://avatars2.githubusercontent.com/u/1134568?v=3" width="110px;"/><br /><sub>Nate Felton</sub>](http://n8felton.wordpress.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=n8felton "Code") | [<img src="https://avatars2.githubusercontent.com/u/14036694?v=3" width="110px;"/><br /><sub>Manasses Ferreira</sub>](http://homepages.dcc.ufmg.br/~manassesferreira)<br />[💻](https://github.com/snipe/snipe-it/commits?author=manassesferreira "Code") | [<img src="https://avatars0.githubusercontent.com/u/15913949?v=3" width="110px;"/><br /><sub>Steve</sub>](https://github.com/steveelwood)<br />[⚠️](https://github.com/snipe/snipe-it/commits?author=steveelwood "Tests") | [<img src="https://avatars1.githubusercontent.com/u/3361683?v=3" width="110px;"/><br /><sub>matc</sub>](http://twitter.com/matc)<br />[⚠️](https://github.com/snipe/snipe-it/commits?author=matc "Tests") | [<img src="https://avatars3.githubusercontent.com/u/7405702?v=3" width="110px;"/><br /><sub>Cole R. Davis</sub>](http://www.davisracingteam.com)<br />[⚠️](https://github.com/snipe/snipe-it/commits?author=VanillaNinjaD "Tests") | [<img src="https://avatars2.githubusercontent.com/u/10167681?v=3" width="110px;"/><br /><sub>gibsonjoshua55</sub>](https://github.com/gibsonjoshua55)<br />[💻](https://github.com/snipe/snipe-it/commits?author=gibsonjoshua55 "Code") |
-| [<img src="https://avatars2.githubusercontent.com/u/2809241?v=4" width="110px;"/><br /><sub>Robin Temme</sub>](https://github.com/zwerch)<br />[💻](https://github.com/snipe/snipe-it/commits?author=zwerch "Code") | [<img src="https://avatars0.githubusercontent.com/u/6961695?v=4" width="110px;"/><br /><sub>Iman</sub>](https://github.com/imanghafoori1)<br />[💻](https://github.com/snipe/snipe-it/commits?author=imanghafoori1 "Code") | [<img src="https://avatars1.githubusercontent.com/u/6551003?v=4" width="110px;"/><br /><sub>Richard Hofman</sub>](https://github.com/richardhofman6)<br />[💻](https://github.com/snipe/snipe-it/commits?author=richardhofman6 "Code") | [<img src="https://avatars0.githubusercontent.com/u/3697569?v=4" width="110px;"/><br /><sub>gizzmojr</sub>](https://github.com/gizzmojr)<br />[💻](https://github.com/snipe/snipe-it/commits?author=gizzmojr "Code") | [<img src="https://avatars3.githubusercontent.com/u/404729?v=4" width="110px;"/><br /><sub>Jenny Li</sub>](https://github.com/imjennyli)<br />[📖](https://github.com/snipe/snipe-it/commits?author=imjennyli "Documentation") | [<img src="https://avatars0.githubusercontent.com/u/869227?v=4" width="110px;"/><br /><sub>Geoff Young</sub>](https://github.com/GeoffYoung)<br />[💻](https://github.com/snipe/snipe-it/commits?author=GeoffYoung "Code") | [<img src="https://avatars3.githubusercontent.com/u/1068477?v=4" width="110px;"/><br /><sub>Elliot Blackburn</sub>](http://www.elliotblackburn.com)<br />[📖](https://github.com/snipe/snipe-it/commits?author=BlueHatbRit "Documentation") |
-| [<img src="https://avatars1.githubusercontent.com/u/6357451?v=4" width="110px;"/><br /><sub>Tõnis Ormisson</sub>](http://andmemasin.eu)<br />[💻](https://github.com/snipe/snipe-it/commits?author=TonisOrmisson "Code") | [<img src="https://avatars0.githubusercontent.com/u/449411?v=4" width="110px;"/><br /><sub>Nicolai Essig</sub>](http://www.nicolai-essig.de)<br />[💻](https://github.com/snipe/snipe-it/commits?author=thakilla "Code") | [<img src="https://avatars1.githubusercontent.com/u/14809698?v=4" width="110px;"/><br /><sub>Danielle</sub>](https://github.com/techincolor)<br />[📖](https://github.com/snipe/snipe-it/commits?author=techincolor "Documentation") | [<img src="https://avatars1.githubusercontent.com/u/18545156?v=4" width="110px;"/><br /><sub>Lawrence</sub>](https://github.com/TheVakman)<br />[⚠️](https://github.com/snipe/snipe-it/commits?author=TheVakman "Tests") [🐛](https://github.com/snipe/snipe-it/issues?q=author%3ATheVakman "Bug reports") | [<img src="https://avatars1.githubusercontent.com/u/22473767?v=4" width="110px;"/><br /><sub>uknzaeinozpas</sub>](https://github.com/uknzaeinozpas)<br />[⚠️](https://github.com/snipe/snipe-it/commits?author=uknzaeinozpas "Tests") [💻](https://github.com/snipe/snipe-it/commits?author=uknzaeinozpas "Code") | [<img src="https://avatars3.githubusercontent.com/u/422752?v=4" width="110px;"/><br /><sub>Ryan</sub>](https://github.com/Gelob)<br />[📖](https://github.com/snipe/snipe-it/commits?author=Gelob "Documentation") | [<img src="https://avatars1.githubusercontent.com/u/10672546?v=4" width="110px;"/><br /><sub>vcordes79</sub>](https://github.com/vcordes79)<br />[💻](https://github.com/snipe/snipe-it/commits?author=vcordes79 "Code") |
-| [<img src="https://avatars3.githubusercontent.com/u/27958330?v=4" width="110px;"/><br /><sub>fordster78</sub>](https://github.com/fordster78)<br />[💻](https://github.com/snipe/snipe-it/commits?author=fordster78 "Code") | [<img src="https://avatars0.githubusercontent.com/u/34064225?v=4" width="110px;"/><br /><sub>CronKz</sub>](https://github.com/CronKz)<br />[💻](https://github.com/snipe/snipe-it/commits?author=CronKz "Code") [🌍](#translation-CronKz "Translation") | [<img src="https://avatars1.githubusercontent.com/u/585486?v=4" width="110px;"/><br /><sub>Tim Bishop</sub>](https://github.com/tdb)<br />[💻](https://github.com/snipe/snipe-it/commits?author=tdb "Code") | [<img src="https://avatars2.githubusercontent.com/u/5384694?v=4" width="110px;"/><br /><sub>Sean McIlvenna</sub>](https://www.seanmcilvenna.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=seanmcilvenna "Code") | [<img src="https://avatars3.githubusercontent.com/u/36515590?v=4" width="110px;"/><br /><sub>cepacs</sub>](https://github.com/cepacs)<br />[🐛](https://github.com/snipe/snipe-it/issues?q=author%3Acepacs "Bug reports") [📖](https://github.com/snipe/snipe-it/commits?author=cepacs "Documentation") | [<img src="https://avatars2.githubusercontent.com/u/37537300?v=4" width="110px;"/><br /><sub>lea-mink</sub>](https://github.com/lea-mink)<br />[💻](https://github.com/snipe/snipe-it/commits?author=lea-mink "Code") | [<img src="https://avatars0.githubusercontent.com/u/7140719?v=4" width="110px;"/><br /><sub>Hannah Tinkler</sub>](https://github.com/hannahtinkler)<br />[💻](https://github.com/snipe/snipe-it/commits?author=hannahtinkler "Code") |
-| [<img src="https://avatars1.githubusercontent.com/u/1086388?v=4" width="110px;"/><br /><sub>Doeke Zanstra</sub>](https://github.com/doekman)<br />[💻](https://github.com/snipe/snipe-it/commits?author=doekman "Code") | [<img src="https://avatars1.githubusercontent.com/u/4325936?v=4" width="110px;"/><br /><sub>Djamon Staal</sub>](https://www.sdhd.nl/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=SjamonDaal "Code") | [<img src="https://avatars3.githubusercontent.com/u/12306859?v=4" width="110px;"/><br /><sub>Earl Ramirez</sub>](https://github.com/EarlRamirez)<br />[💻](https://github.com/snipe/snipe-it/commits?author=EarlRamirez "Code") | [<img src="https://avatars2.githubusercontent.com/u/8671456?v=4" width="110px;"/><br /><sub>Richard Ray Thomas</sub>](https://github.com/RichardRay)<br />[💻](https://github.com/snipe/snipe-it/commits?author=RichardRay "Code") | [<img src="https://avatars3.githubusercontent.com/u/1852688?v=4" width="110px;"/><br /><sub>Ryan Kuba</sub>](https://www.taisun.io/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=thelamer "Code") | [<img src="https://avatars1.githubusercontent.com/u/6751928?v=4" width="110px;"/><br /><sub>Brian Monroe</sub>](https://github.com/ParadoxGuitarist)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ParadoxGuitarist "Code") | [<img src="https://avatars1.githubusercontent.com/u/605167?v=4" width="110px;"/><br /><sub>plexorama</sub>](https://github.com/plexorama)<br />[💻](https://github.com/snipe/snipe-it/commits?author=plexorama "Code") |
-| [<img src="https://avatars2.githubusercontent.com/u/1795149?v=4" width="110px;"/><br /><sub>Till Deeke</sub>](https://tilldeeke.de)<br />[💻](https://github.com/snipe/snipe-it/commits?author=tilldeeke "Code") | [<img src="https://avatars0.githubusercontent.com/u/12634129?v=4" width="110px;"/><br /><sub>5quirrel</sub>](https://github.com/5quirrel)<br />[💻](https://github.com/snipe/snipe-it/commits?author=5quirrel "Code") | [<img src="https://avatars1.githubusercontent.com/u/13071957?v=4" width="110px;"/><br /><sub>Jason</sub>](https://github.com/jasonlshelton)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jasonlshelton "Code") | [<img src="https://avatars3.githubusercontent.com/u/7128321?v=4" width="110px;"/><br /><sub>Antti</sub>](https://github.com/chemfy)<br />[💻](https://github.com/snipe/snipe-it/commits?author=chemfy "Code") | [<img src="https://avatars3.githubusercontent.com/u/10080364?v=4" width="110px;"/><br /><sub>DeusMaximus</sub>](https://github.com/DeusMaximus)<br />[💻](https://github.com/snipe/snipe-it/commits?author=DeusMaximus "Code") | [<img src="https://avatars2.githubusercontent.com/u/16384611?v=4" width="110px;"/><br /><sub>a-royal</sub>](https://github.com/A-ROYAL)<br />[🌍](#translation-A-ROYAL "Translation") | [<img src="https://avatars0.githubusercontent.com/u/5358208?v=4" width="110px;"/><br /><sub>Alberto Aldrigo</sub>](https://github.com/albertoaldrigo)<br />[🌍](#translation-albertoaldrigo "Translation") |
+| [<img src="https://avatars3.githubusercontent.com/u/197404?v=3" width="110px;"/><br /><sub>snipe</sub>](http://www.snipe.net)<br />[💻](https://github.com/grokability/snipe-it/commits?author=snipe "Code") [🚇](#infra-snipe "Infrastructure (Hosting, Build-Tools, etc)") [📖](https://github.com/grokability/snipe-it/commits?author=snipe "Documentation") [⚠️](https://github.com/grokability/snipe-it/commits?author=snipe "Tests") [🐛](https://github.com/grokability/snipe-it/issues?q=author%3Asnipe "Bug reports") [🎨](#design-snipe "Design") [👀](#review-snipe "Reviewed Pull Requests") | [<img src="https://avatars0.githubusercontent.com/u/36335?v=3" width="110px;"/><br /><sub>Brady Wetherington</sub>](http://www.uberbrady.com)<br />[💻](https://github.com/grokability/snipe-it/commits?author=uberbrady "Code") [📖](https://github.com/grokability/snipe-it/commits?author=uberbrady "Documentation") [🚇](#infra-uberbrady "Infrastructure (Hosting, Build-Tools, etc)") [👀](#review-uberbrady "Reviewed Pull Requests") | [<img src="https://avatars0.githubusercontent.com/u/3803132?v=3" width="110px;"/><br /><sub>Daniel Meltzer</sub>](https://github.com/dmeltzer)<br />[💻](https://github.com/grokability/snipe-it/commits?author=dmeltzer "Code") [⚠️](https://github.com/grokability/snipe-it/commits?author=dmeltzer "Tests") [📖](https://github.com/grokability/snipe-it/commits?author=dmeltzer "Documentation") |                                                                                    [<img src="https://avatars0.githubusercontent.com/u/1609106?v=3" width="110px;"/><br /><sub>Michael T</sub>](http://www.tuckertechonline.com)<br />[💻](https://github.com/grokability/snipe-it/commits?author=mtucker6784 "Code")                                                                                     |                          [<img src="https://avatars2.githubusercontent.com/u/3274937?v=3" width="110px;"/><br /><sub>madd15</sub>](https://github.com/madd15)<br />[📖](https://github.com/grokability/snipe-it/commits?author=madd15 "Documentation") [💬](#question-madd15 "Answering Questions")                           | [<img src="https://avatars2.githubusercontent.com/u/894126?v=3" width="110px;"/><br /><sub>Vincent Sposato</sub>](https://github.com/vsposato)<br />[💻](https://github.com/grokability/snipe-it/commits?author=vsposato "Code") | [<img src="https://avatars0.githubusercontent.com/u/1639757?v=3" width="110px;"/><br /><sub>Andrea Bergamasco</sub>](https://github.com/vjandrea)<br />[💻](https://github.com/grokability/snipe-it/commits?author=vjandrea "Code") |
+| :---: | :---: | :---: |:---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|:-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:| :---: | :---: |
+| [<img src="https://avatars0.githubusercontent.com/u/10640152?v=3" width="110px;"/><br /><sub>Karol</sub>](https://github.com/kpawelski)<br />[🌍](#translation-kpawelski "Translation") [💻](https://github.com/grokability/snipe-it/commits?author=kpawelski "Code") | [<img src="https://avatars3.githubusercontent.com/u/600106?v=3" width="110px;"/><br /><sub>morph027</sub>](http://blog.morph027.de/)<br />[💻](https://github.com/grokability/snipe-it/commits?author=morph027 "Code") | [<img src="https://avatars3.githubusercontent.com/u/22935755?v=3" width="110px;"/><br /><sub>fvleminckx</sub>](https://github.com/fvleminckx)<br />[🚇](#infra-fvleminckx "Infrastructure (Hosting, Build-Tools, etc)") |                          [<img src="https://avatars2.githubusercontent.com/u/15633547?v=3" width="110px;"/><br /><sub>itsupportcmsukorg</sub>](https://github.com/itsupportcmsukorg)<br />[💻](https://github.com/grokability/snipe-it/commits?author=itsupportcmsukorg "Code") [🐛](https://github.com/grokability/snipe-it/issues?q=author%3Aitsupportcmsukorg "Bug reports")                           |                                                       [<img src="https://avatars3.githubusercontent.com/u/12373799?v=3" width="110px;"/><br /><sub>Frank</sub>](https://override.io)<br />[💻](https://github.com/grokability/snipe-it/commits?author=base-zero "Code")                                                       | [<img src="https://avatars0.githubusercontent.com/u/10137?v=3" width="110px;"/><br /><sub>Deleted user</sub>](https://github.com/ghost)<br />[🌍](#translation-ghost "Translation") [💻](https://github.com/grokability/snipe-it/commits?author=ghost "Code") | [<img src="https://avatars1.githubusercontent.com/u/10802313?v=3" width="110px;"/><br /><sub>tiagom62</sub>](https://github.com/tiagom62)<br />[💻](https://github.com/grokability/snipe-it/commits?author=tiagom62 "Code") [🚇](#infra-tiagom62 "Infrastructure (Hosting, Build-Tools, etc)") |
+| [<img src="https://avatars3.githubusercontent.com/u/2389047?v=3" width="110px;"/><br /><sub>Ryan Stafford</sub>](https://github.com/rystaf)<br />[💻](https://github.com/grokability/snipe-it/commits?author=rystaf "Code") | [<img src="https://avatars2.githubusercontent.com/u/10345935?v=3" width="110px;"/><br /><sub>Eammon Hanlon</sub>](https://github.com/ehanlon)<br />[💻](https://github.com/grokability/snipe-it/commits?author=ehanlon "Code") | [<img src="https://avatars0.githubusercontent.com/u/441924?v=3" width="110px;"/><br /><sub>zjean</sub>](https://github.com/zjean)<br />[💻](https://github.com/grokability/snipe-it/commits?author=zjean "Code") |                                                                                        [<img src="https://avatars0.githubusercontent.com/u/12660103?v=3" width="110px;"/><br /><sub>Matthias Frei</sub>](http://www.frei.media)<br />[💻](https://github.com/grokability/snipe-it/commits?author=FREImedia "Code")                                                                                        |                                                    [<img src="https://avatars0.githubusercontent.com/u/3767518?v=3" width="110px;"/><br /><sub>opsydev</sub>](https://github.com/opsydev)<br />[💻](https://github.com/grokability/snipe-it/commits?author=opsydev "Code")                                                    | [<img src="https://avatars1.githubusercontent.com/u/82290?v=3" width="110px;"/><br /><sub>Daniel Dreier</sub>](http://www.ddreier.com)<br />[💻](https://github.com/grokability/snipe-it/commits?author=ddreier "Code") | [<img src="https://avatars0.githubusercontent.com/u/23448?v=3" width="110px;"/><br /><sub>Nikolai Prokoschenko</sub>](http://rassie.org)<br />[💻](https://github.com/grokability/snipe-it/commits?author=rassie "Code") |
+| [<img src="https://avatars0.githubusercontent.com/u/13452757?v=3" width="110px;"/><br /><sub>Drew</sub>](https://github.com/YetAnotherCodeMonkey)<br />[💻](https://github.com/grokability/snipe-it/commits?author=YetAnotherCodeMonkey "Code") | [<img src="https://avatars0.githubusercontent.com/u/1342320?v=3" width="110px;"/><br /><sub>Walter</sub>](https://github.com/merid14)<br />[💻](https://github.com/grokability/snipe-it/commits?author=merid14 "Code") | [<img src="https://avatars3.githubusercontent.com/u/11254614?v=3" width="110px;"/><br /><sub>Petr Baloun</sub>](https://github.com/balous)<br />[💻](https://github.com/grokability/snipe-it/commits?author=balous "Code") |                                                                            [<img src="https://avatars0.githubusercontent.com/u/6117660?v=3" width="110px;"/><br /><sub>reidblomquist</sub>](https://github.com/reidblomquist)<br />[📖](https://github.com/grokability/snipe-it/commits?author=reidblomquist "Documentation")                                                                             |                                               [<img src="https://avatars0.githubusercontent.com/u/539914?v=3" width="110px;"/><br /><sub>Mathieu Kooiman</sub>](https://github.com/mathieuk)<br />[💻](https://github.com/grokability/snipe-it/commits?author=mathieuk "Code")                                                | [<img src="https://avatars3.githubusercontent.com/u/6606421?v=3" width="110px;"/><br /><sub>csayre</sub>](https://github.com/csayre)<br />[📖](https://github.com/grokability/snipe-it/commits?author=csayre "Documentation") | [<img src="https://avatars1.githubusercontent.com/u/768488?v=3" width="110px;"/><br /><sub>Adam Dunson</sub>](https://github.com/adamdunson)<br />[💻](https://github.com/grokability/snipe-it/commits?author=adamdunson "Code") |
+| [<img src="https://avatars0.githubusercontent.com/u/5547470?v=3" width="110px;"/><br /><sub>Hereward</sub>](https://github.com/thehereward)<br />[💻](https://github.com/grokability/snipe-it/commits?author=thehereward "Code") | [<img src="https://avatars0.githubusercontent.com/u/5802977?v=3" width="110px;"/><br /><sub>swoopdk</sub>](https://github.com/swoopdk)<br />[💻](https://github.com/grokability/snipe-it/commits?author=swoopdk "Code") | [<img src="https://avatars1.githubusercontent.com/u/3470403?v=3" width="110px;"/><br /><sub>Abdullah Alansari</sub>](https://linkedin.com/in/ahimta)<br />[💻](https://github.com/grokability/snipe-it/commits?author=Ahimta "Code") |                                                                              [<img src="https://avatars0.githubusercontent.com/u/796443?v=3" width="110px;"/><br /><sub>Micael Rodrigues</sub>](https://github.com/MicaelRodrigues)<br />[💻](https://github.com/grokability/snipe-it/commits?author=MicaelRodrigues "Code")                                                                              |                                           [<img src="https://avatars0.githubusercontent.com/u/614564?v=3" width="110px;"/><br /><sub>Patrick Gallagher</sub>](http://macadmincorner.com)<br />[📖](https://github.com/grokability/snipe-it/commits?author=patgmac "Documentation")                                            | [<img src="https://avatars3.githubusercontent.com/u/7165922?v=3" width="110px;"/><br /><sub>Miliamber</sub>](https://github.com/Miliamber)<br />[💻](https://github.com/grokability/snipe-it/commits?author=Miliamber "Code") | [<img src="https://avatars3.githubusercontent.com/u/861766?v=3" width="110px;"/><br /><sub>hawk554</sub>](https://github.com/hawk554)<br />[💻](https://github.com/grokability/snipe-it/commits?author=hawk554 "Code") |
+| [<img src="https://avatars1.githubusercontent.com/u/1695622?v=3" width="110px;"/><br /><sub>Justin Kerr</sub>](http://jbirdkerr.net)<br />[💻](https://github.com/grokability/snipe-it/commits?author=jbirdkerr "Code") | [<img src="https://avatars3.githubusercontent.com/u/11426176?v=3" width="110px;"/><br /><sub>Ira W. Snyder</sub>](http://www.irasnyder.com/devel/)<br />[📖](https://github.com/grokability/snipe-it/commits?author=irasnyd "Documentation") | [<img src="https://avatars2.githubusercontent.com/u/2475759?v=3" width="110px;"/><br /><sub>Aladin Alaily</sub>](https://github.com/aalaily)<br />[💻](https://github.com/grokability/snipe-it/commits?author=aalaily "Code") | [<img src="https://avatars0.githubusercontent.com/u/10247644?v=3" width="110px;"/><br /><sub>Chase Hansen</sub>](https://github.com/kobie-chasehansen)<br />[💻](https://github.com/grokability/snipe-it/commits?author=kobie-chasehansen "Code") [💬](#question-kobie-chasehansen "Answering Questions") [🐛](https://github.com/grokability/snipe-it/issues?q=author%3Akobie-chasehansen "Bug reports") |                                            [<img src="https://avatars2.githubusercontent.com/u/13545400?v=3" width="110px;"/><br /><sub>IDM Helpdesk</sub>](https://github.com/IDM-Helpdesk)<br />[💻](https://github.com/grokability/snipe-it/commits?author=IDM-Helpdesk "Code")                                            | [<img src="https://avatars2.githubusercontent.com/u/614439?v=3" width="110px;"/><br /><sub>Kai</sub>](http://balticer.de)<br />[💻](https://github.com/grokability/snipe-it/commits?author=balticer "Code") | [<img src="https://avatars1.githubusercontent.com/u/8762511?v=3" width="110px;"/><br /><sub>Michael Daniels</sub>](http://www.michaeldaniels.me)<br />[💻](https://github.com/grokability/snipe-it/commits?author=mdaniels5757 "Code") |
+| [<img src="https://avatars3.githubusercontent.com/u/1532660?v=3" width="110px;"/><br /><sub>Tom Castleman</sub>](http://tomcastleman.me)<br />[💻](https://github.com/grokability/snipe-it/commits?author=tomcastleman "Code") | [<img src="https://avatars3.githubusercontent.com/u/10723243?v=3" width="110px;"/><br /><sub>Daniel Nemanic</sub>](https://github.com/DanielNemanic)<br />[💻](https://github.com/grokability/snipe-it/commits?author=DanielNemanic "Code") | [<img src="https://avatars0.githubusercontent.com/u/150648?v=3" width="110px;"/><br /><sub>SouthWolf</sub>](https://github.com/southwolf)<br />[💻](https://github.com/grokability/snipe-it/commits?author=southwolf "Code") |                                                                                          [<img src="https://avatars2.githubusercontent.com/u/131616?v=3" width="110px;"/><br /><sub>Ivar Nesje</sub>](https://github.com/ivarne)<br />[💻](https://github.com/grokability/snipe-it/commits?author=ivarne "Code")                                                                                          |                                                 [<img src="https://avatars1.githubusercontent.com/u/62333?v=3" width="110px;"/><br /><sub>Jérémy Benoist</sub>](http://www.j0k3r.net)<br />[📖](https://github.com/grokability/snipe-it/commits?author=j0k3r "Documentation")                                                 | [<img src="https://avatars2.githubusercontent.com/u/724344?v=3" width="110px;"/><br /><sub>Chris Leathley</sub>](https://github.com/cleathley)<br />[🚇](#infra-cleathley "Infrastructure (Hosting, Build-Tools, etc)") | [<img src="https://avatars0.githubusercontent.com/u/972498?v=3" width="110px;"/><br /><sub>splaer</sub>](https://github.com/splaer)<br />[🐛](https://github.com/grokability/snipe-it/issues?q=author%3Asplaer "Bug reports") [💻](https://github.com/grokability/snipe-it/commits?author=splaer "Code") |
+| [<img src="https://avatars1.githubusercontent.com/u/967362?v=3" width="110px;"/><br /><sub>Joe Ferguson</sub>](http://www.joeferguson.me)<br />[💻](https://github.com/grokability/snipe-it/commits?author=svpernova09 "Code") | [<img src="https://avatars3.githubusercontent.com/u/6108682?v=3" width="110px;"/><br /><sub>diwanicki</sub>](https://github.com/diwanicki)<br />[💻](https://github.com/grokability/snipe-it/commits?author=diwanicki "Code") [📖](https://github.com/grokability/snipe-it/commits?author=diwanicki "Documentation") | [<img src="https://avatars3.githubusercontent.com/u/2527115?v=3" width="110px;"/><br /><sub>Lee Thoong Ching</sub>](https://github.com/pakkua80)<br />[📖](https://github.com/grokability/snipe-it/commits?author=pakkua80 "Documentation") [💻](https://github.com/grokability/snipe-it/commits?author=pakkua80 "Code") |                                                                                                [<img src="https://avatars1.githubusercontent.com/u/461491?v=3" width="110px;"/><br /><sub>Marek Šuppa</sub>](http://shu.io)<br />[💻](https://github.com/grokability/snipe-it/commits?author=mrshu "Code")                                                                                                |                                                               [<img src="https://avatars1.githubusercontent.com/u/8693762?v=3" width="110px;"/><br /><sub>Juan J. Martinez</sub>](https://github.com/mizar1616)<br />[🌍](#translation-mizar1616 "Translation")                                                               | [<img src="https://avatars1.githubusercontent.com/u/1458388?v=3" width="110px;"/><br /><sub>R Ryan Dial</sub>](https://github.com/rrdial)<br />[🌍](#translation-rrdial "Translation") | [<img src="https://avatars2.githubusercontent.com/u/2871745?v=3" width="110px;"/><br /><sub>Andrej Manduch</sub>](https://github.com/burlito)<br />[📖](https://github.com/grokability/snipe-it/commits?author=burlito "Documentation") |
+| [<img src="https://avatars0.githubusercontent.com/u/8341172?v=3" width="110px;"/><br /><sub>Jay Richards</sub>](http://www.cordeos.com)<br />[💻](https://github.com/grokability/snipe-it/commits?author=technogenus "Code") | [<img src="https://avatars2.githubusercontent.com/u/7295127?v=3" width="110px;"/><br /><sub>Alexander Innes</sub>](https://necurity.co.uk)<br />[💻](https://github.com/grokability/snipe-it/commits?author=leostat "Code") | [<img src="https://avatars2.githubusercontent.com/u/334485?v=3" width="110px;"/><br /><sub>Danny Garcia</sub>](https://buzzedword.codes)<br />[💻](https://github.com/grokability/snipe-it/commits?author=buzzedword "Code") |                                                                                       [<img src="https://avatars2.githubusercontent.com/u/366855?v=3" width="110px;"/><br /><sub>archpoint</sub>](https://github.com/archpoint)<br />[💻](https://github.com/grokability/snipe-it/commits?author=archpoint "Code")                                                                                        |                                                  [<img src="https://avatars1.githubusercontent.com/u/67991?v=3" width="110px;"/><br /><sub>Jake McGraw</sub>](http://www.jakemcgraw.com)<br />[💻](https://github.com/grokability/snipe-it/commits?author=jakemcgraw "Code")                                                  | [<img src="https://avatars1.githubusercontent.com/u/1714374?v=3" width="110px;"/><br /><sub>FleischKarussel</sub>](https://github.com/FleischKarussel)<br />[📖](https://github.com/grokability/snipe-it/commits?author=FleischKarussel "Documentation") | [<img src="https://avatars3.githubusercontent.com/u/319644?v=3" width="110px;"/><br /><sub>Dylan Yi</sub>](https://github.com/feeva)<br />[💻](https://github.com/grokability/snipe-it/commits?author=feeva "Code") |
+| [<img src="https://avatars2.githubusercontent.com/u/857740?v=3" width="110px;"/><br /><sub>Gil Rutkowski</sub>](http://FlashingCursor.com)<br />[💻](https://github.com/grokability/snipe-it/commits?author=flashingcursor "Code") | [<img src="https://avatars3.githubusercontent.com/u/129360?v=3" width="110px;"/><br /><sub>Desmond Morris</sub>](http://www.desmondmorris.com)<br />[💻](https://github.com/grokability/snipe-it/commits?author=desmondmorris "Code") | [<img src="https://avatars2.githubusercontent.com/u/52936?v=3" width="110px;"/><br /><sub>Nick Peelman</sub>](http://peelman.us)<br />[💻](https://github.com/grokability/snipe-it/commits?author=peelman "Code") |                                                                                        [<img src="https://avatars0.githubusercontent.com/u/53161?v=3" width="110px;"/><br /><sub>Abraham Vegh</sub>](https://abrahamvegh.com)<br />[💻](https://github.com/grokability/snipe-it/commits?author=abrahamvegh "Code")                                                                                        |                                           [<img src="https://avatars0.githubusercontent.com/u/2818680?v=3" width="110px;"/><br /><sub>Mohamed Rashid</sub>](https://github.com/rashivkp)<br />[📖](https://github.com/grokability/snipe-it/commits?author=rashivkp "Documentation")                                           | [<img src="https://avatars3.githubusercontent.com/u/1509456?v=3" width="110px;"/><br /><sub>Kasey</sub>](http://hinchk.github.io)<br />[💻](https://github.com/grokability/snipe-it/commits?author=HinchK "Code") | [<img src="https://avatars2.githubusercontent.com/u/10522541?v=3" width="110px;"/><br /><sub>Brett</sub>](https://github.com/BrettFagerlund)<br />[⚠️](https://github.com/grokability/snipe-it/commits?author=BrettFagerlund "Tests") |
+| [<img src="https://avatars2.githubusercontent.com/u/16108587?v=3" width="110px;"/><br /><sub>Jason Spriggs</sub>](http://jasonspriggs.com)<br />[💻](https://github.com/grokability/snipe-it/commits?author=jasonspriggs "Code") | [<img src="https://avatars2.githubusercontent.com/u/1134568?v=3" width="110px;"/><br /><sub>Nate Felton</sub>](http://n8felton.wordpress.com)<br />[💻](https://github.com/grokability/snipe-it/commits?author=n8felton "Code") | [<img src="https://avatars2.githubusercontent.com/u/14036694?v=3" width="110px;"/><br /><sub>Manasses Ferreira</sub>](http://homepages.dcc.ufmg.br/~manassesferreira)<br />[💻](https://github.com/grokability/snipe-it/commits?author=manassesferreira "Code") |                                                                                      [<img src="https://avatars0.githubusercontent.com/u/15913949?v=3" width="110px;"/><br /><sub>Steve</sub>](https://github.com/steveelwood)<br />[⚠️](https://github.com/grokability/snipe-it/commits?author=steveelwood "Tests")                                                                                      |                                                        [<img src="https://avatars1.githubusercontent.com/u/3361683?v=3" width="110px;"/><br /><sub>matc</sub>](http://twitter.com/matc)<br />[⚠️](https://github.com/grokability/snipe-it/commits?author=matc "Tests")                                                        | [<img src="https://avatars3.githubusercontent.com/u/7405702?v=3" width="110px;"/><br /><sub>Cole R. Davis</sub>](http://www.davisracingteam.com)<br />[⚠️](https://github.com/grokability/snipe-it/commits?author=VanillaNinjaD "Tests") | [<img src="https://avatars2.githubusercontent.com/u/10167681?v=3" width="110px;"/><br /><sub>gibsonjoshua55</sub>](https://github.com/gibsonjoshua55)<br />[💻](https://github.com/grokability/snipe-it/commits?author=gibsonjoshua55 "Code") |
+| [<img src="https://avatars2.githubusercontent.com/u/2809241?v=4" width="110px;"/><br /><sub>Robin Temme</sub>](https://github.com/zwerch)<br />[💻](https://github.com/grokability/snipe-it/commits?author=zwerch "Code") | [<img src="https://avatars0.githubusercontent.com/u/6961695?v=4" width="110px;"/><br /><sub>Iman</sub>](https://github.com/imanghafoori1)<br />[💻](https://github.com/grokability/snipe-it/commits?author=imanghafoori1 "Code") | [<img src="https://avatars1.githubusercontent.com/u/6551003?v=4" width="110px;"/><br /><sub>Richard Hofman</sub>](https://github.com/richardhofman6)<br />[💻](https://github.com/grokability/snipe-it/commits?author=richardhofman6 "Code") |                                                                                        [<img src="https://avatars0.githubusercontent.com/u/3697569?v=4" width="110px;"/><br /><sub>gizzmojr</sub>](https://github.com/gizzmojr)<br />[💻](https://github.com/grokability/snipe-it/commits?author=gizzmojr "Code")                                                                                         |                                             [<img src="https://avatars3.githubusercontent.com/u/404729?v=4" width="110px;"/><br /><sub>Jenny Li</sub>](https://github.com/imjennyli)<br />[📖](https://github.com/grokability/snipe-it/commits?author=imjennyli "Documentation")                                              | [<img src="https://avatars0.githubusercontent.com/u/869227?v=4" width="110px;"/><br /><sub>Geoff Young</sub>](https://github.com/GeoffYoung)<br />[💻](https://github.com/grokability/snipe-it/commits?author=GeoffYoung "Code") | [<img src="https://avatars3.githubusercontent.com/u/1068477?v=4" width="110px;"/><br /><sub>Elliot Blackburn</sub>](http://www.elliotblackburn.com)<br />[📖](https://github.com/grokability/snipe-it/commits?author=BlueHatbRit "Documentation") |
+| [<img src="https://avatars1.githubusercontent.com/u/6357451?v=4" width="110px;"/><br /><sub>Tõnis Ormisson</sub>](http://andmemasin.eu)<br />[💻](https://github.com/grokability/snipe-it/commits?author=TonisOrmisson "Code") | [<img src="https://avatars0.githubusercontent.com/u/449411?v=4" width="110px;"/><br /><sub>Nicolai Essig</sub>](http://www.nicolai-essig.de)<br />[💻](https://github.com/grokability/snipe-it/commits?author=thakilla "Code") | [<img src="https://avatars1.githubusercontent.com/u/14809698?v=4" width="110px;"/><br /><sub>Danielle</sub>](https://github.com/techincolor)<br />[📖](https://github.com/grokability/snipe-it/commits?author=techincolor "Documentation") |                                          [<img src="https://avatars1.githubusercontent.com/u/18545156?v=4" width="110px;"/><br /><sub>Lawrence</sub>](https://github.com/TheVakman)<br />[⚠️](https://github.com/grokability/snipe-it/commits?author=TheVakman "Tests") [🐛](https://github.com/grokability/snipe-it/issues?q=author%3ATheVakman "Bug reports")                                           | [<img src="https://avatars1.githubusercontent.com/u/22473767?v=4" width="110px;"/><br /><sub>uknzaeinozpas</sub>](https://github.com/uknzaeinozpas)<br />[⚠️](https://github.com/grokability/snipe-it/commits?author=uknzaeinozpas "Tests") [💻](https://github.com/grokability/snipe-it/commits?author=uknzaeinozpas "Code") | [<img src="https://avatars3.githubusercontent.com/u/422752?v=4" width="110px;"/><br /><sub>Ryan</sub>](https://github.com/Gelob)<br />[📖](https://github.com/grokability/snipe-it/commits?author=Gelob "Documentation") | [<img src="https://avatars1.githubusercontent.com/u/10672546?v=4" width="110px;"/><br /><sub>vcordes79</sub>](https://github.com/vcordes79)<br />[💻](https://github.com/grokability/snipe-it/commits?author=vcordes79 "Code") |
+| [<img src="https://avatars3.githubusercontent.com/u/27958330?v=4" width="110px;"/><br /><sub>fordster78</sub>](https://github.com/fordster78)<br />[💻](https://github.com/grokability/snipe-it/commits?author=fordster78 "Code") | [<img src="https://avatars0.githubusercontent.com/u/34064225?v=4" width="110px;"/><br /><sub>CronKz</sub>](https://github.com/CronKz)<br />[💻](https://github.com/grokability/snipe-it/commits?author=CronKz "Code") [🌍](#translation-CronKz "Translation") | [<img src="https://avatars1.githubusercontent.com/u/585486?v=4" width="110px;"/><br /><sub>Tim Bishop</sub>](https://github.com/tdb)<br />[💻](https://github.com/grokability/snipe-it/commits?author=tdb "Code") |                                                                                  [<img src="https://avatars2.githubusercontent.com/u/5384694?v=4" width="110px;"/><br /><sub>Sean McIlvenna</sub>](https://www.seanmcilvenna.com)<br />[💻](https://github.com/grokability/snipe-it/commits?author=seanmcilvenna "Code")                                                                                  |      [<img src="https://avatars3.githubusercontent.com/u/36515590?v=4" width="110px;"/><br /><sub>cepacs</sub>](https://github.com/cepacs)<br />[🐛](https://github.com/grokability/snipe-it/issues?q=author%3Acepacs "Bug reports") [📖](https://github.com/grokability/snipe-it/commits?author=cepacs "Documentation")      | [<img src="https://avatars2.githubusercontent.com/u/37537300?v=4" width="110px;"/><br /><sub>lea-mink</sub>](https://github.com/lea-mink)<br />[💻](https://github.com/grokability/snipe-it/commits?author=lea-mink "Code") | [<img src="https://avatars0.githubusercontent.com/u/7140719?v=4" width="110px;"/><br /><sub>Hannah Tinkler</sub>](https://github.com/hannahtinkler)<br />[💻](https://github.com/grokability/snipe-it/commits?author=hannahtinkler "Code") |
+| [<img src="https://avatars1.githubusercontent.com/u/1086388?v=4" width="110px;"/><br /><sub>Doeke Zanstra</sub>](https://github.com/doekman)<br />[💻](https://github.com/grokability/snipe-it/commits?author=doekman "Code") | [<img src="https://avatars1.githubusercontent.com/u/4325936?v=4" width="110px;"/><br /><sub>Djamon Staal</sub>](https://www.sdhd.nl/)<br />[💻](https://github.com/grokability/snipe-it/commits?author=SjamonDaal "Code") | [<img src="https://avatars3.githubusercontent.com/u/12306859?v=4" width="110px;"/><br /><sub>Earl Ramirez</sub>](https://github.com/EarlRamirez)<br />[💻](https://github.com/grokability/snipe-it/commits?author=EarlRamirez "Code") |                                                                                 [<img src="https://avatars2.githubusercontent.com/u/8671456?v=4" width="110px;"/><br /><sub>Richard Ray Thomas</sub>](https://github.com/RichardRay)<br />[💻](https://github.com/grokability/snipe-it/commits?author=RichardRay "Code")                                                                                  |                                                    [<img src="https://avatars3.githubusercontent.com/u/1852688?v=4" width="110px;"/><br /><sub>Ryan Kuba</sub>](https://www.taisun.io/)<br />[💻](https://github.com/grokability/snipe-it/commits?author=thelamer "Code")                                                     | [<img src="https://avatars1.githubusercontent.com/u/6751928?v=4" width="110px;"/><br /><sub>Brian Monroe</sub>](https://github.com/ParadoxGuitarist)<br />[💻](https://github.com/grokability/snipe-it/commits?author=ParadoxGuitarist "Code") | [<img src="https://avatars1.githubusercontent.com/u/605167?v=4" width="110px;"/><br /><sub>plexorama</sub>](https://github.com/plexorama)<br />[💻](https://github.com/grokability/snipe-it/commits?author=plexorama "Code") |
+| [<img src="https://avatars2.githubusercontent.com/u/1795149?v=4" width="110px;"/><br /><sub>Till Deeke</sub>](https://tilldeeke.de)<br />[💻](https://github.com/grokability/snipe-it/commits?author=tilldeeke "Code") | [<img src="https://avatars0.githubusercontent.com/u/12634129?v=4" width="110px;"/><br /><sub>5quirrel</sub>](https://github.com/5quirrel)<br />[💻](https://github.com/grokability/snipe-it/commits?author=5quirrel "Code") | [<img src="https://avatars1.githubusercontent.com/u/13071957?v=4" width="110px;"/><br /><sub>Jason</sub>](https://github.com/jasonlshelton)<br />[💻](https://github.com/grokability/snipe-it/commits?author=jasonlshelton "Code") |                                                                                            [<img src="https://avatars3.githubusercontent.com/u/7128321?v=4" width="110px;"/><br /><sub>Antti</sub>](https://github.com/chemfy)<br />[💻](https://github.com/grokability/snipe-it/commits?author=chemfy "Code")                                                                                            |                                             [<img src="https://avatars3.githubusercontent.com/u/10080364?v=4" width="110px;"/><br /><sub>DeusMaximus</sub>](https://github.com/DeusMaximus)<br />[💻](https://github.com/grokability/snipe-it/commits?author=DeusMaximus "Code")                                              | [<img src="https://avatars2.githubusercontent.com/u/16384611?v=4" width="110px;"/><br /><sub>a-royal</sub>](https://github.com/A-ROYAL)<br />[🌍](#translation-A-ROYAL "Translation") | [<img src="https://avatars0.githubusercontent.com/u/5358208?v=4" width="110px;"/><br /><sub>Alberto Aldrigo</sub>](https://github.com/albertoaldrigo)<br />[🌍](#translation-albertoaldrigo "Translation") |
 | [<img src="https://avatars0.githubusercontent.com/u/1412342?v=4" width="110px;"/><br /><sub>Alex Stanev</sub>](http://alex.stanev.org/blog)<br />[🌍](#translation-RealEnder "Translation") | [<img src="https://avatars0.githubusercontent.com/u/177295?v=4" width="110px;"/><br /><sub>Andreas Rehm</sub>](http://devel.itsolution2.de)<br />[🌍](#translation-sirrus "Translation") | [<img src="https://avatars0.githubusercontent.com/u/5080535?v=4" width="110px;"/><br /><sub>Andreas Erhard</sub>](https://github.com/xelan)<br />[🌍](#translation-xelan "Translation") |                                                                                                [<img src="https://avatars2.githubusercontent.com/u/142350?v=4" width="110px;"/><br /><sub>Andrés Vanegas Jiménez</sub>](https://github.com/angeldeejay)<br />[🌍](#translation-angeldeejay "Translation")                                                                                                 |                                                             [<img src="https://avatars0.githubusercontent.com/u/3910403?v=4" width="110px;"/><br /><sub>Antonio Schiavon</sub>](https://github.com/aschiavon91)<br />[🌍](#translation-aschiavon91 "Translation")                                                             | [<img src="https://avatars0.githubusercontent.com/u/10464547?v=4" width="110px;"/><br /><sub>benunter</sub>](https://github.com/benunter)<br />[🌍](#translation-benunter "Translation") | [<img src="https://avatars1.githubusercontent.com/u/5038647?v=4" width="110px;"/><br /><sub>Borys Żmuda</sub>](http://catweb24.pl)<br />[🌍](#translation-rudashi "Translation") |
 | [<img src="https://avatars0.githubusercontent.com/u/5539359?v=4" width="110px;"/><br /><sub>chibacityblues</sub>](https://github.com/chibacityblues)<br />[🌍](#translation-chibacityblues "Translation") | [<img src="https://avatars1.githubusercontent.com/u/1954830?v=4" width="110px;"/><br /><sub>Chien Wei Lin</sub>](https://github.com/cwlin0416)<br />[🌍](#translation-cwlin0416 "Translation") | [<img src="https://avatars3.githubusercontent.com/u/11700533?v=4" width="110px;"/><br /><sub>Christian Schuster</sub>](https://github.com/Againstreality)<br />[🌍](#translation-Againstreality "Translation") |                                                                                                    [<img src="https://avatars1.githubusercontent.com/u/4308704?v=4" width="110px;"/><br /><sub>Christian Stefanus</sub>](http://chriss.webhostid.com)<br />[🌍](#translation-kopi-item "Translation")                                                                                                     |                                                                           [<img src="https://avatars3.githubusercontent.com/u/3009327?v=4" width="110px;"/><br /><sub>wxcafé</sub>](http://wxcafe.net)<br />[🌍](#translation-wxcafe "Translation")                                                                           | [<img src="https://avatars3.githubusercontent.com/u/35761525?v=4" width="110px;"/><br /><sub>dpyroc</sub>](https://github.com/dpyroc)<br />[🌍](#translation-dpyroc "Translation") | [<img src="https://avatars1.githubusercontent.com/u/2153639?v=4" width="110px;"/><br /><sub>Daniel Friedlmaier</sub>](http://www.friedlmaier.net)<br />[🌍](#translation-da-friedl "Translation") |
 | [<img src="https://avatars1.githubusercontent.com/u/2947640?v=4" width="110px;"/><br /><sub>Daniel Heene</sub>](https://github.com/danielheene)<br />[🌍](#translation-danielheene "Translation") | [<img src="https://avatars3.githubusercontent.com/u/319022?v=4" width="110px;"/><br /><sub>danielcb</sub>](https://github.com/danielcb)<br />[🌍](#translation-danielcb "Translation") | [<img src="https://avatars3.githubusercontent.com/u/15846537?v=4" width="110px;"/><br /><sub>Dominik Senti</sub>](https://github.com/dominiksenti)<br />[🌍](#translation-dominiksenti "Translation") |                                                                                                         [<img src="https://avatars0.githubusercontent.com/u/25570954?v=4" width="110px;"/><br /><sub>Eric Gautheron</sub>](http://www.konectik.com)<br />[🌍](#translation-EpixFr "Translation")                                                                                                          |                                                                        [<img src="https://avatars1.githubusercontent.com/u/5732623?v=4" width="110px;"/><br /><sub>Erlend Pilø</sub>](https://erlpil.com)<br />[🌍](#translation-Erlpil "Translation")                                                                        | [<img src="https://avatars0.githubusercontent.com/u/541832?v=4" width="110px;"/><br /><sub>Fabio Rapposelli</sub>](http://fabio.technology)<br />[🌍](#translation-frapposelli "Translation") | [<img src="https://avatars2.githubusercontent.com/u/3605240?v=4" width="110px;"/><br /><sub>Felipe Barros</sub>](https://github.com/fgbs)<br />[🌍](#translation-fgbs "Translation") |
@@ -27,48 +27,34 @@ Thanks goes to all of these wonderful people ([emoji key](https://github.com/ken
 | [<img src="https://avatars2.githubusercontent.com/u/982885?v=4" width="110px;"/><br /><sub>Martin Stub</sub>](http://martinstub.dk)<br />[🌍](#translation-stubben "Translation") | [<img src="https://avatars2.githubusercontent.com/u/28959963?v=4" width="110px;"/><br /><sub>Meyer Flavio</sub>](https://github.com/meyerf99)<br />[🌍](#translation-meyerf99 "Translation") | [<img src="https://avatars3.githubusercontent.com/u/796443?v=4" width="110px;"/><br /><sub>Micael Rodrigues</sub>](https://github.com/MicaelRodrigues)<br />[🌍](#translation-MicaelRodrigues "Translation") |                                                                                                         [<img src="https://avatars0.githubusercontent.com/u/10481331?v=4" width="110px;"/><br /><sub>Mikael Rasmussen</sub>](http://rubixy.com/)<br />[🌍](#translation-mikaelssen "Translation")                                                                                                         |                                                                       [<img src="https://avatars1.githubusercontent.com/u/1544552?v=4" width="110px;"/><br /><sub>IxFail</sub>](https://github.com/IxFail)<br />[🌍](#translation-IxFail "Translation")                                                                       | [<img src="https://avatars3.githubusercontent.com/u/18483118?v=4" width="110px;"/><br /><sub>Mohammed Fota</sub>](http://www.mohammedfota.com)<br />[🌍](#translation-MohammedFota "Translation") | [<img src="https://avatars0.githubusercontent.com/u/227080?v=4" width="110px;"/><br /><sub>Moayad Alserihi</sub>](https://github.com/omego)<br />[🌍](#translation-omego "Translation") |
 | [<img src="https://avatars0.githubusercontent.com/u/1680266?v=4" width="110px;"/><br /><sub>saymd</sub>](https://github.com/saymd)<br />[🌍](#translation-saymd "Translation") | [<img src="https://avatars0.githubusercontent.com/u/1826808?v=4" width="110px;"/><br /><sub>Patrik Larsson</sub>](https://nordsken.se)<br />[🌍](#translation-pooot "Translation") | [<img src="https://avatars1.githubusercontent.com/u/20584746?v=4" width="110px;"/><br /><sub>drcryo</sub>](https://github.com/drcryo)<br />[🌍](#translation-drcryo "Translation") |                                                                                                        [<img src="https://avatars1.githubusercontent.com/u/19408004?v=4" width="110px;"/><br /><sub>pawel1615</sub>](https://github.com/pawel1615)<br />[🌍](#translation-pawel1615 "Translation")                                                                                                        |                                                                  [<img src="https://avatars2.githubusercontent.com/u/23340468?v=4" width="110px;"/><br /><sub>bodrovics</sub>](https://github.com/bodrovics)<br />[🌍](#translation-bodrovics "Translation")                                                                  | [<img src="https://avatars0.githubusercontent.com/u/3257654?v=4" width="110px;"/><br /><sub>priatna</sub>](https://github.com/priatna)<br />[🌍](#translation-priatna "Translation") | [<img src="https://avatars1.githubusercontent.com/u/5358374?v=4" width="110px;"/><br /><sub>Fan Jiang</sub>](https://amayume.net)<br />[🌍](#translation-ProfFan "Translation") |
 | [<img src="https://avatars1.githubusercontent.com/u/22555451?v=4" width="110px;"/><br /><sub>ragnarcx</sub>](https://github.com/ragnarcx)<br />[🌍](#translation-ragnarcx "Translation") | [<img src="https://avatars2.githubusercontent.com/u/18654582?v=4" width="110px;"/><br /><sub>Rein van Haaren</sub>](http://www.reinvanhaaren.nl/)<br />[🌍](#translation-reinvanhaaren "Translation") | [<img src="https://avatars1.githubusercontent.com/u/386672?v=4" width="110px;"/><br /><sub>Teguh Dwicaksana</sub>](http://dheche.songolimo.net)<br />[🌍](#translation-dheche "Translation") |                                                                                                           [<img src="https://avatars2.githubusercontent.com/u/2572552?v=4" width="110px;"/><br /><sub>fraccie</sub>](https://github.com/FRaccie)<br />[🌍](#translation-FRaccie "Translation")                                                                                                            |                                                                [<img src="https://avatars0.githubusercontent.com/u/35182720?v=4" width="110px;"/><br /><sub>vinzruzell</sub>](https://github.com/vinzruzell)<br />[🌍](#translation-vinzruzell "Translation")                                                                 | [<img src="https://avatars1.githubusercontent.com/u/7883603?v=4" width="110px;"/><br /><sub>Kevin Austin</sub>](http://kevinaustin.com)<br />[🌍](#translation-vipsystem "Translation") | [<img src="https://avatars3.githubusercontent.com/u/3861828?v=4" width="110px;"/><br /><sub>Wira Sandy</sub>](http://azuraweb.xyz)<br />[🌍](#translation-wira-sandy "Translation") |
-| [<img src="https://avatars2.githubusercontent.com/u/8663789?v=4" width="110px;"/><br /><sub>Илья</sub>](https://github.com/GrayHoax)<br />[🌍](#translation-GrayHoax "Translation") | [<img src="https://avatars3.githubusercontent.com/u/30119111?v=4" width="110px;"/><br /><sub>GodUseVPN</sub>](https://github.com/godusevpn)<br />[🌍](#translation-godusevpn "Translation") | [<img src="https://avatars1.githubusercontent.com/u/745576?v=4" width="110px;"/><br /><sub>周周</sub>](https://github.com/EngrZhou)<br />[🌍](#translation-EngrZhou "Translation") | [<img src="https://avatars3.githubusercontent.com/u/1631095?v=4" width="110px;"/><br /><sub>Sam</sub>](https://github.com/takuy)<br />[💻](https://github.com/snipe/snipe-it/commits?author=takuy "Code") | [<img src="https://avatars1.githubusercontent.com/u/264022?v=4" width="110px;"/><br /><sub>Azerothian</sub>](https://www.illisian.com.au)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Azerothian "Code") | [<img src="https://avatars1.githubusercontent.com/u/4930051?v=4" width="110px;"/><br /><sub>Wes Hulette</sub>](http://macfoo.wordpress.com/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jwhulette "Code") | [<img src="https://avatars0.githubusercontent.com/u/8134591?v=4" width="110px;"/><br /><sub>patrict</sub>](https://github.com/patrict)<br />[💻](https://github.com/snipe/snipe-it/commits?author=patrict "Code") |
-| [<img src="https://avatars3.githubusercontent.com/u/2611616?v=4" width="110px;"/><br /><sub>Dmitriy Minaev</sub>](https://github.com/VELIKII-DIVAN)<br />[💻](https://github.com/snipe/snipe-it/commits?author=VELIKII-DIVAN "Code") | [<img src="https://avatars0.githubusercontent.com/u/5132245?v=4" width="110px;"/><br /><sub>liquidhorse</sub>](https://github.com/liquidhorse)<br />[💻](https://github.com/snipe/snipe-it/commits?author=liquidhorse "Code") | [<img src="https://avatars1.githubusercontent.com/u/183678?v=4" width="110px;"/><br /><sub>Jordi Boggiano</sub>](https://seld.be/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Seldaek "Code") | [<img src="https://avatars0.githubusercontent.com/u/653557?v=4" width="110px;"/><br /><sub>Ivan Nieto</sub>](https://github.com/inietov)<br />[💻](https://github.com/snipe/snipe-it/commits?author=inietov "Code") | [<img src="https://avatars2.githubusercontent.com/u/6764151?v=4" width="110px;"/><br /><sub>Ben RUBSON</sub>](https://github.com/benrubson)<br />[💻](https://github.com/snipe/snipe-it/commits?author=benrubson "Code") | [<img src="https://avatars2.githubusercontent.com/u/8554558?v=4" width="110px;"/><br /><sub>NMathar</sub>](https://github.com/NMathar)<br />[💻](https://github.com/snipe/snipe-it/commits?author=NMathar "Code") | [<img src="https://avatars1.githubusercontent.com/u/139566?v=4" width="110px;"/><br /><sub>Steffen</sub>](https://github.com/smb)<br />[💻](https://github.com/snipe/snipe-it/commits?author=smb "Code") |
-| [<img src="https://avatars0.githubusercontent.com/u/6609453?v=4" width="110px;"/><br /><sub>Sxderp</sub>](https://github.com/Sxderp)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Sxderp "Code") | [<img src="https://avatars1.githubusercontent.com/u/4807843?v=4" width="110px;"/><br /><sub>fanta8897</sub>](https://github.com/fanta8897)<br />[💻](https://github.com/snipe/snipe-it/commits?author=fanta8897 "Code") | [<img src="https://avatars2.githubusercontent.com/u/2576509?v=4" width="110px;"/><br /><sub>Andrey Bolonin</sub>](https://andreybolonin.com/phpconsulting/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=andreybolonin "Code") | [<img src="https://avatars3.githubusercontent.com/u/2173307?v=4" width="110px;"/><br /><sub>shinayoshi</sub>](http://www.shinayoshi.net/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=shinayoshi "Code") | [<img src="https://avatars3.githubusercontent.com/u/2130159?v=4" width="110px;"/><br /><sub>Hubert</sub>](https://github.com/reuser)<br />[💻](https://github.com/snipe/snipe-it/commits?author=reuser "Code") | [<img src="https://avatars0.githubusercontent.com/u/6865789?v=4" width="110px;"/><br /><sub>KeenRivals</sub>](https://brashear.me)<br />[💻](https://github.com/snipe/snipe-it/commits?author=KeenRivals "Code") | [<img src="https://avatars3.githubusercontent.com/u/2902513?v=4" width="110px;"/><br /><sub>omyno</sub>](https://github.com/omyno)<br />[💻](https://github.com/snipe/snipe-it/commits?author=omyno "Code") |
-| [<img src="https://avatars1.githubusercontent.com/u/6271335?v=4" width="110px;"/><br /><sub>Evgeny</sub>](https://github.com/jackka)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jackka "Code") | [<img src="https://avatars2.githubusercontent.com/u/1169963?v=4" width="110px;"/><br /><sub>Colin Campbell</sub>](https://digitalist.se)<br />[💻](https://github.com/snipe/snipe-it/commits?author=colin-campbell "Code") | [<img src="https://avatars3.githubusercontent.com/u/2872098?v=4" width="110px;"/><br /><sub>Ľubomír Kučera</sub>](https://github.com/lubo)<br />[💻](https://github.com/snipe/snipe-it/commits?author=lubo "Code") | [<img src="https://avatars3.githubusercontent.com/u/570639?v=4" width="110px;"/><br /><sub>Martin Meredith</sub>](https://www.sourceguru.net)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Mezzle "Code") | [<img src="https://avatars1.githubusercontent.com/u/7632599?v=4" width="110px;"/><br /><sub>Tim Farmer</sub>](https://github.com/timothyfarmer)<br />[💻](https://github.com/snipe/snipe-it/commits?author=timothyfarmer "Code") | [<img src="https://avatars0.githubusercontent.com/u/17459600?v=4" width="110px;"/><br /><sub>Marián Skrip</sub>](https://github.com/mskrip)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mskrip "Code") | [<img src="https://avatars2.githubusercontent.com/u/47435081?v=4" width="110px;"/><br /><sub>Godfrey Martinez</sub>](https://github.com/Godmartinz)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Godmartinz "Code") |
-| [<img src="https://avatars1.githubusercontent.com/u/2075128?v=4" width="110px;"/><br /><sub>bigtreeEdo</sub>](https://github.com/bigtreeEdo)<br />[💻](https://github.com/snipe/snipe-it/commits?author=bigtreeEdo "Code") | [<img src="https://avatars0.githubusercontent.com/u/5000430?v=4" width="110px;"/><br /><sub>Colin  McNeil</sub>](https://colinmcneil.me/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ColinMcNeil "Code") | [<img src="https://avatars0.githubusercontent.com/u/421625?v=4" width="110px;"/><br /><sub>JoKneeMo</sub>](https://github.com/JoKneeMo)<br />[💻](https://github.com/snipe/snipe-it/commits?author=JoKneeMo "Code") | [<img src="https://avatars0.githubusercontent.com/u/54849013?v=4" width="110px;"/><br /><sub>Joshi</sub>](http://www.redbridge.se)<br />[💻](https://github.com/snipe/snipe-it/commits?author=joshi-redbridge "Code") | [<img src="https://avatars2.githubusercontent.com/u/15731458?v=4" width="110px;"/><br /><sub>Anthony Burns</sub>](https://github.com/anthonypburns)<br />[💻](https://github.com/snipe/snipe-it/commits?author=anthonypburns "Code") | [<img src="https://avatars1.githubusercontent.com/u/63399474?v=4" width="110px;"/><br /><sub>johnson-yi</sub>](https://github.com/johnson-yi)<br />[💻](https://github.com/snipe/snipe-it/commits?author=johnson-yi "Code") | [<img src="https://avatars1.githubusercontent.com/u/1862720?v=4" width="110px;"/><br /><sub>Sanjay Govind</sub>](https://tangentmc.net)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sanjay900 "Code") |
-| [<img src="https://avatars0.githubusercontent.com/u/1255375?v=4" width="110px;"/><br /><sub>Peter Upfold</sub>](https://peter.upfold.org.uk/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=PeterUpfold "Code") | [<img src="https://avatars2.githubusercontent.com/u/961717?v=4" width="110px;"/><br /><sub>Jared Biel</sub>](https://github.com/jbiel)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jbiel "Code") | [<img src="https://avatars1.githubusercontent.com/u/1733625?v=4" width="110px;"/><br /><sub>Dampfklon</sub>](https://github.com/dampfklon)<br />[💻](https://github.com/snipe/snipe-it/commits?author=dampfklon "Code") | [<img src="https://avatars2.githubusercontent.com/u/52973156?v=4" width="110px;"/><br /><sub>Charles Hamilton</sub>](https://communityclosing.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=chamilton-ccn "Code") | [<img src="https://avatars.githubusercontent.com/u/551789?v=4" width="110px;"/><br /><sub>Giuseppe Iannello</sub>](https://github.com/giannello)<br />[💻](https://github.com/snipe/snipe-it/commits?author=giannello "Code") | [<img src="https://avatars.githubusercontent.com/u/3691490?v=4" width="110px;"/><br /><sub>Peter Dave Hello</sub>](https://www.peterdavehello.org/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=PeterDaveHello "Code") | [<img src="https://avatars.githubusercontent.com/u/6106332?v=4" width="110px;"/><br /><sub>sigmoidal</sub>](https://github.com/sigmoidal)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sigmoidal "Code") |
-| [<img src="https://avatars.githubusercontent.com/u/2082554?v=4" width="110px;"/><br /><sub>Vincent Lainé</sub>](https://github.com/phenixdotnet)<br />[💻](https://github.com/snipe/snipe-it/commits?author=phenixdotnet "Code") | [<img src="https://avatars.githubusercontent.com/u/1943040?v=4" width="110px;"/><br /><sub>Lucas Pleß</sub>](http://www.lucas-pless.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=derlucas "Code") | [<img src="https://avatars.githubusercontent.com/u/472804?v=4" width="110px;"/><br /><sub>Ian Littman</sub>](http://twitter.com/iansltx)<br />[💻](https://github.com/snipe/snipe-it/commits?author=iansltx "Code") | [<img src="https://avatars.githubusercontent.com/u/3519029?v=4" width="110px;"/><br /><sub>João Paulo</sub>](https://github.com/PauloLuna)<br />[💻](https://github.com/snipe/snipe-it/commits?author=PauloLuna "Code") | [<img src="https://avatars.githubusercontent.com/u/70443365?v=4" width="110px;"/><br /><sub>ThoBur</sub>](https://github.com/ThoBur)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ThoBur "Code") | [<img src="https://avatars.githubusercontent.com/u/1972329?v=4" width="110px;"/><br /><sub>Alexander Chibrikin</sub>](http://phpprofi.ru/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=alek13 "Code") | [<img src="https://avatars.githubusercontent.com/u/438332?v=4" width="110px;"/><br /><sub>Anthony Winstanley</sub>](https://github.com/winstan)<br />[💻](https://github.com/snipe/snipe-it/commits?author=winstan "Code") |
-| [<img src="https://avatars.githubusercontent.com/u/3075214?v=4" width="110px;"/><br /><sub>Folke</sub>](https://github.com/fashberg)<br />[💻](https://github.com/snipe/snipe-it/commits?author=fashberg "Code") | [<img src="https://avatars.githubusercontent.com/u/1351571?v=4" width="110px;"/><br /><sub>Bennett Blodinger</sub>](https://github.com/benwa)<br />[💻](https://github.com/snipe/snipe-it/commits?author=benwa "Code") | [<img src="https://avatars.githubusercontent.com/u/2974631?v=4" width="110px;"/><br /><sub>NMC</sub>](https://nmc.dev)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ncareau "Code") | [<img src="https://avatars.githubusercontent.com/u/52182449?v=4" width="110px;"/><br /><sub>andres-baller</sub>](https://github.com/andres-baller)<br />[💻](https://github.com/snipe/snipe-it/commits?author=andres-baller "Code") | [<img src="https://avatars.githubusercontent.com/u/67109348?v=4" width="110px;"/><br /><sub>sean-borg</sub>](https://github.com/sean-borg)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sean-borg "Code") | [<img src="https://avatars.githubusercontent.com/u/32170051?v=4" width="110px;"/><br /><sub>EDVLeer</sub>](https://github.com/EDVLeer)<br />[💻](https://github.com/snipe/snipe-it/commits?author=EDVLeer "Code") | [<img src="https://avatars.githubusercontent.com/u/23075196?v=4" width="110px;"/><br /><sub>Kurokat</sub>](https://github.com/Kurokat)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Kurokat "Code") |
-| [<img src="https://avatars.githubusercontent.com/u/915514?v=4" width="110px;"/><br /><sub>Kevin Köllmann</sub>](https://www.kevinkoellmann.de)<br />[💻](https://github.com/snipe/snipe-it/commits?author=koelle25 "Code") | [<img src="https://avatars.githubusercontent.com/u/49025941?v=4" width="110px;"/><br /><sub>sw-mreyes</sub>](https://github.com/sw-mreyes)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sw-mreyes "Code") | [<img src="https://avatars.githubusercontent.com/u/70129?v=4" width="110px;"/><br /><sub>Joel Pittet</sub>](https://pittet.ca)<br />[💻](https://github.com/snipe/snipe-it/commits?author=joelpittet "Code") | [<img src="https://avatars.githubusercontent.com/u/792695?v=4" width="110px;"/><br /><sub>Eli Young</sub>](https://elyscape.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=elyscape "Code") | [<img src="https://avatars.githubusercontent.com/u/317015?v=4" width="110px;"/><br /><sub>Raell Dottin</sub>](https://github.com/raelldottin)<br />[💻](https://github.com/snipe/snipe-it/commits?author=raelldottin "Code") | [<img src="https://avatars.githubusercontent.com/u/1446856?v=4" width="110px;"/><br /><sub>Tom Misilo</sub>](https://github.com/misilot)<br />[💻](https://github.com/snipe/snipe-it/commits?author=misilot "Code") | [<img src="https://avatars.githubusercontent.com/u/4496300?v=4" width="110px;"/><br /><sub>David Davenne</sub>](http://david.davenne.be)<br />[💻](https://github.com/snipe/snipe-it/commits?author=JuustoMestari "Code") |
-| [<img src="https://avatars.githubusercontent.com/u/9255772?v=4" width="110px;"/><br /><sub>Mark Stenglein</sub>](https://markstenglein.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ocelotsloth "Code") | [<img src="https://avatars.githubusercontent.com/u/35658596?v=4" width="110px;"/><br /><sub>ajsy</sub>](https://github.com/ajsy)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ajsy "Code") | [<img src="https://avatars.githubusercontent.com/u/3628035?v=4" width="110px;"/><br /><sub>Jan Kiesewetter</sub>](https://github.com/t3easy)<br />[💻](https://github.com/snipe/snipe-it/commits?author=t3easy "Code") | [<img src="https://avatars.githubusercontent.com/u/79449630?v=4" width="110px;"/><br /><sub>Tetrachloromethane250</sub>](https://github.com/Tetrachloromethane250)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Tetrachloromethane250 "Code") | [<img src="https://avatars.githubusercontent.com/u/22004482?v=4" width="110px;"/><br /><sub>Lars Kajes</sub>](https://www.kajes.se/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=kajes "Code") | [<img src="https://avatars.githubusercontent.com/u/13993216?v=4" width="110px;"/><br /><sub>Joly0</sub>](https://github.com/Joly0)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Joly0 "Code") | [<img src="https://avatars.githubusercontent.com/u/1501022?v=4" width="110px;"/><br /><sub>theburger</sub>](https://github.com/limeless)<br />[💻](https://github.com/snipe/snipe-it/commits?author=limeless "Code") |
-| [<img src="https://avatars.githubusercontent.com/u/36065681?v=4" width="110px;"/><br /><sub>David Valin Alonso</sub>](https://github.com/deivishome)<br />[💻](https://github.com/snipe/snipe-it/commits?author=deivishome "Code") | [<img src="https://avatars.githubusercontent.com/u/8290389?v=4" width="110px;"/><br /><sub>andreaci</sub>](https://github.com/andreaci)<br />[💻](https://github.com/snipe/snipe-it/commits?author=andreaci "Code") | [<img src="https://avatars.githubusercontent.com/u/1828542?v=4" width="110px;"/><br /><sub>Jelle Sebreghts</sub>](http://www.jellesebreghts.be)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Jelle-S "Code") | [<img src="https://avatars.githubusercontent.com/u/11180862?v=4" width="110px;"/><br /><sub>Michael Pietsch</sub>](https://github.com/Skywalker-11)<br /> | [<img src="https://avatars.githubusercontent.com/u/22068886?v=4" width="110px;"/><br /><sub>Masudul Haque Shihab</sub>](https://github.com/sh1hab)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sh1hab "Code") | [<img src="https://avatars.githubusercontent.com/u/16099942?v=4" width="110px;"/><br /><sub>Supapong Areeprasertkul</sub>](http://www.freedomdive.com/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=zybersup "Code") | [<img src="https://avatars.githubusercontent.com/u/207358?v=4" width="110px;"/><br /><sub>Peter Sarossy</sub>](https://github.com/psarossy)<br />[💻](https://github.com/snipe/snipe-it/commits?author=psarossy "Code") |
-| [<img src="https://avatars.githubusercontent.com/u/11823649?v=4" width="110px;"/><br /><sub>Renee Margaret McConahy</sub>](https://github.com/nepella)<br />[💻](https://github.com/snipe/snipe-it/commits?author=nepella "Code") | [<img src="https://avatars.githubusercontent.com/u/5553884?v=4" width="110px;"/><br /><sub>JohnnyPicnic</sub>](https://github.com/JohnnyPicnic)<br />[💻](https://github.com/snipe/snipe-it/commits?author=JohnnyPicnic "Code") | [<img src="https://avatars.githubusercontent.com/u/8799594?v=4" width="110px;"/><br /><sub>markbrule</sub>](https://github.com/markbrule)<br />[💻](https://github.com/snipe/snipe-it/commits?author=markbrule "Code") | [<img src="https://avatars.githubusercontent.com/u/1962801?v=4" width="110px;"/><br /><sub>Mike Campbell</sub>](https://github.com/mikecmpbll)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mikecmpbll "Code") | [<img src="https://avatars.githubusercontent.com/u/11973217?v=4" width="110px;"/><br /><sub>tbrconnect</sub>](https://github.com/tbrconnect)<br />[💻](https://github.com/snipe/snipe-it/commits?author=tbrconnect "Code") | [<img src="https://avatars.githubusercontent.com/u/12447225?v=4" width="110px;"/><br /><sub>kcoyo</sub>](https://github.com/kcoyo)<br />[💻](https://github.com/snipe/snipe-it/commits?author=kcoyo "Code") | [<img src="https://avatars.githubusercontent.com/u/494017?v=4" width="110px;"/><br /><sub>Travis Miller</sub>](https://travismiller.com/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=travismiller "Code") |
-| [<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/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") | [<img src="https://avatars.githubusercontent.com/u/76069640?v=4" width="110px;"/><br /><sub>Okean</sub>](https://github.com/Tinyblargon)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Tinyblargon "Code") | [<img src="https://avatars.githubusercontent.com/u/6515064?v=4" width="110px;"/><br /><sub>Alejandro Medrano</sub>](https://www.lst.tfo.upm.es/alejandro-medrano/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=amedranogil "Code") | [<img src="https://avatars.githubusercontent.com/u/58696401?v=4" width="110px;"/><br /><sub>Lukas Kraic</sub>](https://github.com/lukaskraic)<br />[💻](https://github.com/snipe/snipe-it/commits?author=lukaskraic "Code") |
-| [<img src="https://avatars.githubusercontent.com/u/1571724?v=4" width="110px;"/><br /><sub>Герхард PICCORO Lenz McKAY </sub>](https://github-readme-stats.vercel.app/api?username=mckaygerhard)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mckaygerhard "Code") | [<img src="https://avatars.githubusercontent.com/u/15015119?v=4" width="110px;"/><br /><sub>Johannes Pollitt</sub>](https://github.com/FlorestanII)<br />[💻](https://github.com/snipe/snipe-it/commits?author=FlorestanII "Code") | [<img src="https://avatars.githubusercontent.com/u/14185442?v=4" width="110px;"/><br /><sub>Michael Strobel</sub>](https://strobelm.de)<br />[💻](https://github.com/snipe/snipe-it/commits?author=strobelm "Code") | [<img src="https://avatars.githubusercontent.com/u/634790?v=4" width="110px;"/><br /><sub>Nicky West</sub>](http://nickwest.me)<br />[💻](https://github.com/snipe/snipe-it/commits?author=nickwest "Code") | [<img src="https://avatars.githubusercontent.com/u/1347327?v=4" width="110px;"/><br /><sub>akaspeh1</sub>](https://github.com/akaspeh1)<br />[💻](https://github.com/snipe/snipe-it/commits?author=akaspeh1 "Code") |
+| [<img src="https://avatars2.githubusercontent.com/u/8663789?v=4" width="110px;"/><br /><sub>Илья</sub>](https://github.com/GrayHoax)<br />[🌍](#translation-GrayHoax "Translation") | [<img src="https://avatars3.githubusercontent.com/u/30119111?v=4" width="110px;"/><br /><sub>GodUseVPN</sub>](https://github.com/godusevpn)<br />[🌍](#translation-godusevpn "Translation") | [<img src="https://avatars1.githubusercontent.com/u/745576?v=4" width="110px;"/><br /><sub>周周</sub>](https://github.com/EngrZhou)<br />[🌍](#translation-EngrZhou "Translation") |                                                                                              [<img src="https://avatars3.githubusercontent.com/u/1631095?v=4" width="110px;"/><br /><sub>Sam</sub>](https://github.com/takuy)<br />[💻](https://github.com/grokability/snipe-it/commits?author=takuy "Code")                                                                                              |                                                 [<img src="https://avatars1.githubusercontent.com/u/264022?v=4" width="110px;"/><br /><sub>Azerothian</sub>](https://www.illisian.com.au)<br />[💻](https://github.com/grokability/snipe-it/commits?author=Azerothian "Code")                                                 | [<img src="https://avatars1.githubusercontent.com/u/4930051?v=4" width="110px;"/><br /><sub>Wes Hulette</sub>](http://macfoo.wordpress.com/)<br />[💻](https://github.com/grokability/snipe-it/commits?author=jwhulette "Code") | [<img src="https://avatars0.githubusercontent.com/u/8134591?v=4" width="110px;"/><br /><sub>patrict</sub>](https://github.com/patrict)<br />[💻](https://github.com/grokability/snipe-it/commits?author=patrict "Code") |
+| [<img src="https://avatars3.githubusercontent.com/u/2611616?v=4" width="110px;"/><br /><sub>Dmitriy Minaev</sub>](https://github.com/VELIKII-DIVAN)<br />[💻](https://github.com/grokability/snipe-it/commits?author=VELIKII-DIVAN "Code") | [<img src="https://avatars0.githubusercontent.com/u/5132245?v=4" width="110px;"/><br /><sub>liquidhorse</sub>](https://github.com/liquidhorse)<br />[💻](https://github.com/grokability/snipe-it/commits?author=liquidhorse "Code") | [<img src="https://avatars1.githubusercontent.com/u/183678?v=4" width="110px;"/><br /><sub>Jordi Boggiano</sub>](https://seld.be/)<br />[💻](https://github.com/grokability/snipe-it/commits?author=Seldaek "Code") |                                                                                         [<img src="https://avatars0.githubusercontent.com/u/653557?v=4" width="110px;"/><br /><sub>Ivan Nieto</sub>](https://github.com/inietov)<br />[💻](https://github.com/grokability/snipe-it/commits?author=inietov "Code")                                                                                         |                                                [<img src="https://avatars2.githubusercontent.com/u/6764151?v=4" width="110px;"/><br /><sub>Ben RUBSON</sub>](https://github.com/benrubson)<br />[💻](https://github.com/grokability/snipe-it/commits?author=benrubson "Code")                                                 | [<img src="https://avatars2.githubusercontent.com/u/8554558?v=4" width="110px;"/><br /><sub>NMathar</sub>](https://github.com/NMathar)<br />[💻](https://github.com/grokability/snipe-it/commits?author=NMathar "Code") | [<img src="https://avatars1.githubusercontent.com/u/139566?v=4" width="110px;"/><br /><sub>Steffen</sub>](https://github.com/smb)<br />[💻](https://github.com/grokability/snipe-it/commits?author=smb "Code") |
+| [<img src="https://avatars0.githubusercontent.com/u/6609453?v=4" width="110px;"/><br /><sub>Sxderp</sub>](https://github.com/Sxderp)<br />[💻](https://github.com/grokability/snipe-it/commits?author=Sxderp "Code") | [<img src="https://avatars1.githubusercontent.com/u/4807843?v=4" width="110px;"/><br /><sub>fanta8897</sub>](https://github.com/fanta8897)<br />[💻](https://github.com/grokability/snipe-it/commits?author=fanta8897 "Code") | [<img src="https://avatars2.githubusercontent.com/u/2576509?v=4" width="110px;"/><br /><sub>Andrey Bolonin</sub>](https://andreybolonin.com/phpconsulting/)<br />[💻](https://github.com/grokability/snipe-it/commits?author=andreybolonin "Code") |                                                                                       [<img src="https://avatars3.githubusercontent.com/u/2173307?v=4" width="110px;"/><br /><sub>shinayoshi</sub>](http://www.shinayoshi.net/)<br />[💻](https://github.com/grokability/snipe-it/commits?author=shinayoshi "Code")                                                                                       |                                                     [<img src="https://avatars3.githubusercontent.com/u/2130159?v=4" width="110px;"/><br /><sub>Hubert</sub>](https://github.com/reuser)<br />[💻](https://github.com/grokability/snipe-it/commits?author=reuser "Code")                                                      | [<img src="https://avatars0.githubusercontent.com/u/6865789?v=4" width="110px;"/><br /><sub>KeenRivals</sub>](https://brashear.me)<br />[💻](https://github.com/grokability/snipe-it/commits?author=KeenRivals "Code") | [<img src="https://avatars3.githubusercontent.com/u/2902513?v=4" width="110px;"/><br /><sub>omyno</sub>](https://github.com/omyno)<br />[💻](https://github.com/grokability/snipe-it/commits?author=omyno "Code") |
+| [<img src="https://avatars1.githubusercontent.com/u/6271335?v=4" width="110px;"/><br /><sub>Evgeny</sub>](https://github.com/jackka)<br />[💻](https://github.com/grokability/snipe-it/commits?author=jackka "Code") | [<img src="https://avatars2.githubusercontent.com/u/1169963?v=4" width="110px;"/><br /><sub>Colin Campbell</sub>](https://digitalist.se)<br />[💻](https://github.com/grokability/snipe-it/commits?author=colin-campbell "Code") | [<img src="https://avatars3.githubusercontent.com/u/2872098?v=4" width="110px;"/><br /><sub>Ľubomír Kučera</sub>](https://github.com/lubo)<br />[💻](https://github.com/grokability/snipe-it/commits?author=lubo "Code") |                                                                                       [<img src="https://avatars3.githubusercontent.com/u/570639?v=4" width="110px;"/><br /><sub>Martin Meredith</sub>](https://www.sourceguru.net)<br />[💻](https://github.com/grokability/snipe-it/commits?author=Mezzle "Code")                                                                                       |                                            [<img src="https://avatars1.githubusercontent.com/u/7632599?v=4" width="110px;"/><br /><sub>Tim Farmer</sub>](https://github.com/timothyfarmer)<br />[💻](https://github.com/grokability/snipe-it/commits?author=timothyfarmer "Code")                                             | [<img src="https://avatars0.githubusercontent.com/u/17459600?v=4" width="110px;"/><br /><sub>Marián Skrip</sub>](https://github.com/mskrip)<br />[💻](https://github.com/grokability/snipe-it/commits?author=mskrip "Code") | [<img src="https://avatars2.githubusercontent.com/u/47435081?v=4" width="110px;"/><br /><sub>Godfrey Martinez</sub>](https://github.com/Godmartinz)<br />[💻](https://github.com/grokability/snipe-it/commits?author=Godmartinz "Code") |
+| [<img src="https://avatars1.githubusercontent.com/u/2075128?v=4" width="110px;"/><br /><sub>bigtreeEdo</sub>](https://github.com/bigtreeEdo)<br />[💻](https://github.com/grokability/snipe-it/commits?author=bigtreeEdo "Code") | [<img src="https://avatars0.githubusercontent.com/u/5000430?v=4" width="110px;"/><br /><sub>Colin  McNeil</sub>](https://colinmcneil.me/)<br />[💻](https://github.com/grokability/snipe-it/commits?author=ColinMcNeil "Code") | [<img src="https://avatars0.githubusercontent.com/u/421625?v=4" width="110px;"/><br /><sub>JoKneeMo</sub>](https://github.com/JoKneeMo)<br />[💻](https://github.com/grokability/snipe-it/commits?author=JoKneeMo "Code") |                                                                                        [<img src="https://avatars0.githubusercontent.com/u/54849013?v=4" width="110px;"/><br /><sub>Joshi</sub>](http://www.redbridge.se)<br />[💻](https://github.com/grokability/snipe-it/commits?author=joshi-redbridge "Code")                                                                                        |                                          [<img src="https://avatars2.githubusercontent.com/u/15731458?v=4" width="110px;"/><br /><sub>Anthony Burns</sub>](https://github.com/anthonypburns)<br />[💻](https://github.com/grokability/snipe-it/commits?author=anthonypburns "Code")                                           | [<img src="https://avatars1.githubusercontent.com/u/63399474?v=4" width="110px;"/><br /><sub>johnson-yi</sub>](https://github.com/johnson-yi)<br />[💻](https://github.com/grokability/snipe-it/commits?author=johnson-yi "Code") | [<img src="https://avatars1.githubusercontent.com/u/1862720?v=4" width="110px;"/><br /><sub>Sanjay Govind</sub>](https://tangentmc.net)<br />[💻](https://github.com/grokability/snipe-it/commits?author=sanjay900 "Code") |
+| [<img src="https://avatars0.githubusercontent.com/u/1255375?v=4" width="110px;"/><br /><sub>Peter Upfold</sub>](https://peter.upfold.org.uk/)<br />[💻](https://github.com/grokability/snipe-it/commits?author=PeterUpfold "Code") | [<img src="https://avatars2.githubusercontent.com/u/961717?v=4" width="110px;"/><br /><sub>Jared Biel</sub>](https://github.com/jbiel)<br />[💻](https://github.com/grokability/snipe-it/commits?author=jbiel "Code") | [<img src="https://avatars1.githubusercontent.com/u/1733625?v=4" width="110px;"/><br /><sub>Dampfklon</sub>](https://github.com/dampfklon)<br />[💻](https://github.com/grokability/snipe-it/commits?author=dampfklon "Code") |                                                                                 [<img src="https://avatars2.githubusercontent.com/u/52973156?v=4" width="110px;"/><br /><sub>Charles Hamilton</sub>](https://communityclosing.com)<br />[💻](https://github.com/grokability/snipe-it/commits?author=chamilton-ccn "Code")                                                                                 |                                              [<img src="https://avatars.githubusercontent.com/u/551789?v=4" width="110px;"/><br /><sub>Giuseppe Iannello</sub>](https://github.com/giannello)<br />[💻](https://github.com/grokability/snipe-it/commits?author=giannello "Code")                                              | [<img src="https://avatars.githubusercontent.com/u/3691490?v=4" width="110px;"/><br /><sub>Peter Dave Hello</sub>](https://www.peterdavehello.org/)<br />[💻](https://github.com/grokability/snipe-it/commits?author=PeterDaveHello "Code") | [<img src="https://avatars.githubusercontent.com/u/6106332?v=4" width="110px;"/><br /><sub>sigmoidal</sub>](https://github.com/sigmoidal)<br />[💻](https://github.com/grokability/snipe-it/commits?author=sigmoidal "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/2082554?v=4" width="110px;"/><br /><sub>Vincent Lainé</sub>](https://github.com/phenixdotnet)<br />[💻](https://github.com/grokability/snipe-it/commits?author=phenixdotnet "Code") | [<img src="https://avatars.githubusercontent.com/u/1943040?v=4" width="110px;"/><br /><sub>Lucas Pleß</sub>](http://www.lucas-pless.com)<br />[💻](https://github.com/grokability/snipe-it/commits?author=derlucas "Code") | [<img src="https://avatars.githubusercontent.com/u/472804?v=4" width="110px;"/><br /><sub>Ian Littman</sub>](http://twitter.com/iansltx)<br />[💻](https://github.com/grokability/snipe-it/commits?author=iansltx "Code") |                                                                                       [<img src="https://avatars.githubusercontent.com/u/3519029?v=4" width="110px;"/><br /><sub>João Paulo</sub>](https://github.com/PauloLuna)<br />[💻](https://github.com/grokability/snipe-it/commits?author=PauloLuna "Code")                                                                                       |                                                     [<img src="https://avatars.githubusercontent.com/u/70443365?v=4" width="110px;"/><br /><sub>ThoBur</sub>](https://github.com/ThoBur)<br />[💻](https://github.com/grokability/snipe-it/commits?author=ThoBur "Code")                                                      | [<img src="https://avatars.githubusercontent.com/u/1972329?v=4" width="110px;"/><br /><sub>Alexander Chibrikin</sub>](http://phpprofi.ru/)<br />[💻](https://github.com/grokability/snipe-it/commits?author=alek13 "Code") | [<img src="https://avatars.githubusercontent.com/u/438332?v=4" width="110px;"/><br /><sub>Anthony Winstanley</sub>](https://github.com/winstan)<br />[💻](https://github.com/grokability/snipe-it/commits?author=winstan "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/3075214?v=4" width="110px;"/><br /><sub>Folke</sub>](https://github.com/fashberg)<br />[💻](https://github.com/grokability/snipe-it/commits?author=fashberg "Code") | [<img src="https://avatars.githubusercontent.com/u/1351571?v=4" width="110px;"/><br /><sub>Bennett Blodinger</sub>](https://github.com/benwa)<br />[💻](https://github.com/grokability/snipe-it/commits?author=benwa "Code") | [<img src="https://avatars.githubusercontent.com/u/2974631?v=4" width="110px;"/><br /><sub>NMC</sub>](https://nmc.dev)<br />[💻](https://github.com/grokability/snipe-it/commits?author=ncareau "Code") |                                                                                 [<img src="https://avatars.githubusercontent.com/u/52182449?v=4" width="110px;"/><br /><sub>andres-baller</sub>](https://github.com/andres-baller)<br />[💻](https://github.com/grokability/snipe-it/commits?author=andres-baller "Code")                                                                                 |                                                 [<img src="https://avatars.githubusercontent.com/u/67109348?v=4" width="110px;"/><br /><sub>sean-borg</sub>](https://github.com/sean-borg)<br />[💻](https://github.com/grokability/snipe-it/commits?author=sean-borg "Code")                                                 | [<img src="https://avatars.githubusercontent.com/u/32170051?v=4" width="110px;"/><br /><sub>EDVLeer</sub>](https://github.com/EDVLeer)<br />[💻](https://github.com/grokability/snipe-it/commits?author=EDVLeer "Code") | [<img src="https://avatars.githubusercontent.com/u/23075196?v=4" width="110px;"/><br /><sub>Kurokat</sub>](https://github.com/Kurokat)<br />[💻](https://github.com/grokability/snipe-it/commits?author=Kurokat "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/915514?v=4" width="110px;"/><br /><sub>Kevin Köllmann</sub>](https://www.kevinkoellmann.de)<br />[💻](https://github.com/grokability/snipe-it/commits?author=koelle25 "Code") | [<img src="https://avatars.githubusercontent.com/u/49025941?v=4" width="110px;"/><br /><sub>sw-mreyes</sub>](https://github.com/sw-mreyes)<br />[💻](https://github.com/grokability/snipe-it/commits?author=sw-mreyes "Code") | [<img src="https://avatars.githubusercontent.com/u/70129?v=4" width="110px;"/><br /><sub>Joel Pittet</sub>](https://pittet.ca)<br />[💻](https://github.com/grokability/snipe-it/commits?author=joelpittet "Code") |                                                                                            [<img src="https://avatars.githubusercontent.com/u/792695?v=4" width="110px;"/><br /><sub>Eli Young</sub>](https://elyscape.com)<br />[💻](https://github.com/grokability/snipe-it/commits?author=elyscape "Code")                                                                                             |                                              [<img src="https://avatars.githubusercontent.com/u/317015?v=4" width="110px;"/><br /><sub>Raell Dottin</sub>](https://github.com/raelldottin)<br />[💻](https://github.com/grokability/snipe-it/commits?author=raelldottin "Code")                                               | [<img src="https://avatars.githubusercontent.com/u/1446856?v=4" width="110px;"/><br /><sub>Tom Misilo</sub>](https://github.com/misilot)<br />[💻](https://github.com/grokability/snipe-it/commits?author=misilot "Code") | [<img src="https://avatars.githubusercontent.com/u/4496300?v=4" width="110px;"/><br /><sub>David Davenne</sub>](http://david.davenne.be)<br />[💻](https://github.com/grokability/snipe-it/commits?author=JuustoMestari "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/9255772?v=4" width="110px;"/><br /><sub>Mark Stenglein</sub>](https://markstenglein.com)<br />[💻](https://github.com/grokability/snipe-it/commits?author=ocelotsloth "Code") | [<img src="https://avatars.githubusercontent.com/u/35658596?v=4" width="110px;"/><br /><sub>ajsy</sub>](https://github.com/ajsy)<br />[💻](https://github.com/grokability/snipe-it/commits?author=ajsy "Code") | [<img src="https://avatars.githubusercontent.com/u/3628035?v=4" width="110px;"/><br /><sub>Jan Kiesewetter</sub>](https://github.com/t3easy)<br />[💻](https://github.com/grokability/snipe-it/commits?author=t3easy "Code") |                                                                     [<img src="https://avatars.githubusercontent.com/u/79449630?v=4" width="110px;"/><br /><sub>Tetrachloromethane250</sub>](https://github.com/Tetrachloromethane250)<br />[💻](https://github.com/grokability/snipe-it/commits?author=Tetrachloromethane250 "Code")                                                                     |                                                      [<img src="https://avatars.githubusercontent.com/u/22004482?v=4" width="110px;"/><br /><sub>Lars Kajes</sub>](https://www.kajes.se/)<br />[💻](https://github.com/grokability/snipe-it/commits?author=kajes "Code")                                                      | [<img src="https://avatars.githubusercontent.com/u/13993216?v=4" width="110px;"/><br /><sub>Joly0</sub>](https://github.com/Joly0)<br />[💻](https://github.com/grokability/snipe-it/commits?author=Joly0 "Code") | [<img src="https://avatars.githubusercontent.com/u/1501022?v=4" width="110px;"/><br /><sub>theburger</sub>](https://github.com/limeless)<br />[💻](https://github.com/grokability/snipe-it/commits?author=limeless "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/36065681?v=4" width="110px;"/><br /><sub>David Valin Alonso</sub>](https://github.com/deivishome)<br />[💻](https://github.com/grokability/snipe-it/commits?author=deivishome "Code") | [<img src="https://avatars.githubusercontent.com/u/8290389?v=4" width="110px;"/><br /><sub>andreaci</sub>](https://github.com/andreaci)<br />[💻](https://github.com/grokability/snipe-it/commits?author=andreaci "Code") | [<img src="https://avatars.githubusercontent.com/u/1828542?v=4" width="110px;"/><br /><sub>Jelle Sebreghts</sub>](http://www.jellesebreghts.be)<br />[💻](https://github.com/grokability/snipe-it/commits?author=Jelle-S "Code") |                                                                                                                         [<img src="https://avatars.githubusercontent.com/u/11180862?v=4" width="110px;"/><br /><sub>Michael Pietsch</sub>](https://github.com/Skywalker-11)<br />                                                                                                                         |                                              [<img src="https://avatars.githubusercontent.com/u/22068886?v=4" width="110px;"/><br /><sub>Masudul Haque Shihab</sub>](https://github.com/sh1hab)<br />[💻](https://github.com/grokability/snipe-it/commits?author=sh1hab "Code")                                               | [<img src="https://avatars.githubusercontent.com/u/16099942?v=4" width="110px;"/><br /><sub>Supapong Areeprasertkul</sub>](http://www.freedomdive.com/)<br />[💻](https://github.com/grokability/snipe-it/commits?author=zybersup "Code") | [<img src="https://avatars.githubusercontent.com/u/207358?v=4" width="110px;"/><br /><sub>Peter Sarossy</sub>](https://github.com/psarossy)<br />[💻](https://github.com/grokability/snipe-it/commits?author=psarossy "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/11823649?v=4" width="110px;"/><br /><sub>Renee Margaret McConahy</sub>](https://github.com/nepella)<br />[💻](https://github.com/grokability/snipe-it/commits?author=nepella "Code") | [<img src="https://avatars.githubusercontent.com/u/5553884?v=4" width="110px;"/><br /><sub>JohnnyPicnic</sub>](https://github.com/JohnnyPicnic)<br />[💻](https://github.com/grokability/snipe-it/commits?author=JohnnyPicnic "Code") | [<img src="https://avatars.githubusercontent.com/u/8799594?v=4" width="110px;"/><br /><sub>markbrule</sub>](https://github.com/markbrule)<br />[💻](https://github.com/grokability/snipe-it/commits?author=markbrule "Code") |                                                                                    [<img src="https://avatars.githubusercontent.com/u/1962801?v=4" width="110px;"/><br /><sub>Mike Campbell</sub>](https://github.com/mikecmpbll)<br />[💻](https://github.com/grokability/snipe-it/commits?author=mikecmpbll "Code")                                                                                     |                                               [<img src="https://avatars.githubusercontent.com/u/11973217?v=4" width="110px;"/><br /><sub>tbrconnect</sub>](https://github.com/tbrconnect)<br />[💻](https://github.com/grokability/snipe-it/commits?author=tbrconnect "Code")                                                | [<img src="https://avatars.githubusercontent.com/u/12447225?v=4" width="110px;"/><br /><sub>kcoyo</sub>](https://github.com/kcoyo)<br />[💻](https://github.com/grokability/snipe-it/commits?author=kcoyo "Code") | [<img src="https://avatars.githubusercontent.com/u/494017?v=4" width="110px;"/><br /><sub>Travis Miller</sub>](https://travismiller.com/)<br />[💻](https://github.com/grokability/snipe-it/commits?author=travismiller "Code") |
+| [<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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/snipe-it/commits?author=bryanlopezinc "Code") [⚠️](https://github.com/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/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/grokability/snipe-it/commits?author=36864 "Code") |[<img src="https://avatars.githubusercontent.com/u/365751?v=4" width="110px;"/><br /><sub>CloCkWeRX</sub>](https://github.com/CloCkWeRX)<br />[💻](https://github.com/grokability/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/grokability/snipe-it/commits?author=BeatSpark "Code")                                                  |
 <!-- ALL-CONTRIBUTORS-LIST:END -->

 This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome!
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 ![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/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)
+[![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/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
@@ -133,15 +133,9 @@ 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.

-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,7 +11,6 @@ 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/app/Console/Commands/CleanIncorrectCheckoutAcceptances.php
+++ b/app/Console/Commands/CleanIncorrectCheckoutAcceptances.php
@@ -1,68 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use App\Models\CheckoutAcceptance;
-use App\Models\LicenseSeat;
-use App\Models\User;
-use Illuminate\Console\Command;
-
-class CleanIncorrectCheckoutAcceptances extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'snipeit:clean-checkout-acceptances';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = "Delete checkout acceptances for checkouts to non-users";
-
-    /**
-     * Execute the console command.
-     */
-    public function handle()
-    {
-        $deletions = 0;
-        $skips = 0;
-
-        // This walks *every* checkoutacceptance. That's gnarly. But necessary
-        $this->withProgressBar(CheckoutAcceptance::all(), function ($checkoutAcceptance) use (&$deletions, &$skips) {
-            $item = $checkoutAcceptance->checkoutable;
-            $checkout_to_id = $checkoutAcceptance->assigned_to_id;
-            if(is_null($item)) {
-                $this->info("'Checkoutable' Item is null, going to next record");
-                return; //'false' allegedly breaks execution entirely, so 'true' maybe doesn't? hrm. just straight return maybe?
-            }
-            if(get_class($item) == LicenseSeat::class) {
-                $item = $item->license;
-            }
-            foreach($item->assetlog()->where('action_type','checkout')->get() as $assetlog) {
-                if ($assetlog->target_id == $checkout_to_id && $assetlog->target_type != User::class) {
-                    //We have a checkout-to an ID for a non-User, which matches to an ID in the checkout_acceptances table
-
-                    //now, let's compare the _times_ - are they close?
-                    //I'm picking `created_at` over `action_date` because I'm more interested in when the actionlogs
-                    //were _created_, not when they were alleged to have happened - those created_at times need to be within 'X' seconds of
-                    //each other (currently 5)
-                    if ($assetlog->created_at->diffInSeconds($checkoutAcceptance->created_at, true) <= 5) { //we're allowing for five _ish_ seconds of slop
-                        $deletions++;
-                        $checkoutAcceptance->forceDelete(); // HARD delete this record; it should have never been
-                        return;
-                    } else {
-                        //$this->info("The two records are too far apart");
-                    }
-                } else {
-                    //$this->info("No match! checkout to id: " . $checkout_to_id." target_id: ".$assetlog->target_id." target_type: ".$assetlog->target_type);
-                }
-            }
-            $skips++;
-        });
-        $this->error("Final deletion count: $deletions, and skip count: $skips");
-    }
-}
--- a/app/Console/Commands/CleanOldCheckoutRequests.php
+++ b/app/Console/Commands/CleanOldCheckoutRequests.php
@@ -1,74 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use App\Models\CheckoutRequest;
-use Illuminate\Console\Command;
-
-class CleanOldCheckoutRequests extends Command
-{
-    private int $deletions = 0;
-    private int $skips = 0;
-
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'snipeit:clean-old-checkout-requests';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Removes checkout requests that reference deleted assets or users.';
-
-    /**
-     * Execute the console command.
-     */
-    public function handle()
-    {
-        $requests = CheckoutRequest::with([
-            'user' => function ($query) {
-                $query->withTrashed();
-            },
-            'requestedItem' => function ($query) {
-                $query->withTrashed();
-            },
-        ])->get();
-
-        $this->info("Processing {$requests->count()} checkout requests");
-
-        $this->withProgressBar($requests, function ($request) {
-            if ($this->shouldForceDelete($request)) {
-                $request->forceDelete();
-                $this->deletions++;
-                return;
-            }
-
-            if ($this->shouldSoftDelete($request)) {
-                $request->delete();
-                $this->deletions++;
-                return;
-            }
-
-            $this->skips++;
-        });
-
-        $this->info("Final deletion count: $this->deletions, and skip count: $this->skips");
-
-        return 0;
-    }
-
-    private function shouldForceDelete(CheckoutRequest $request)
-    {
-        // check if the requestable or user relationship is null
-        return !$request->requestable || !$request->user;
-    }
-
-    private function shouldSoftDelete(CheckoutRequest $request)
-    {
-        return $request->requestable->trashed() || $request->user->trashed();
-    }
-}
--- a/app/Console/Commands/DisableSAML.php
+++ b/app/Console/Commands/DisableSAML.php
@@ -1,53 +0,0 @@
-<?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/FixUpAssignedTypeWithoutAssignedTo.php
+++ b/app/Console/Commands/FixUpAssignedTypeWithoutAssignedTo.php
@@ -1,32 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use Illuminate\Console\Command;
-use Illuminate\Support\Facades\DB;
-
-class FixUpAssignedTypeWithoutAssignedTo extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'snipeit:assigned-type-fixup';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Fixes up assets that have an assigned_type but no assigned_to';
-
-    /**
-     * Execute the console command.
-     */
-    public function handle()
-    {
-        DB::table('assets')->whereNotNull('assigned_type')->whereNull('assigned_to')->update(['assigned_type' => null]);
-        $this->info("Assets with an assigned_type but no assigned_to are fixed");
-    }
-}
--- a/app/Console/Commands/LdapSync.php
+++ b/app/Console/Commands/LdapSync.php
@@ -55,8 +55,6 @@ class LdapSync extends Command
        ini_set('max_execution_time', env('LDAP_TIME_LIM', 600)); //600 seconds = 10 minutes
        ini_set('memory_limit', env('LDAP_MEM_LIM', '500M'));

-
-        // Map the LDAP attributes to the Snipe-IT user fields.
        $ldap_map = [
            "username" => Setting::getSettings()->ldap_username_field,
            "last_name" => Setting::getSettings()->ldap_lname_field,
@@ -65,17 +63,11 @@ class LdapSync extends Command
            "emp_num" => Setting::getSettings()->ldap_emp_num,
            "email" => Setting::getSettings()->ldap_email,
            "phone" => Setting::getSettings()->ldap_phone_field,
-            "mobile" => Setting::getSettings()->ldap_mobile,
            "jobtitle" => Setting::getSettings()->ldap_jobtitle,
-            "address" => Setting::getSettings()->ldap_address,
-            "city" => Setting::getSettings()->ldap_city,
-            "state" => Setting::getSettings()->ldap_state,
-            "zip" => Setting::getSettings()->ldap_zip,
            "country" => Setting::getSettings()->ldap_country,
            "location" => Setting::getSettings()->ldap_location,
            "dept" => Setting::getSettings()->ldap_dept,
            "manager" => Setting::getSettings()->ldap_manager,
-            "display_name" => Setting::getSettings()->ldap_display_name,
        ];

        $ldap_default_group = Setting::getSettings()->ldap_default_group;
@@ -190,7 +182,7 @@ class LdapSync extends Command
            // Inject location information fields
            for ($i = 0; $i < $results['count']; $i++) {
                $results[$i]['ldap_location_override'] = false;
-                $results[$i]['location_id'] = null;
+                $results[$i]['location_id'] = 0;
            }

            // Grab subsets based on location-specific DNs, and overwrite location for these users.
@@ -242,11 +234,9 @@ class LdapSync extends Command
        }


-        // Assign the mapped LDAP attributes for each user to the Snipe-IT user fields
        for ($i = 0; $i < $results['count']; $i++) {
            $item = [];
            $item['username'] = $results[$i][$ldap_map["username"]][0] ?? '';
-            $item['display_name'] = $results[$i][$ldap_map["display_name"]][0] ?? '';
            $item['employee_number'] = $results[$i][$ldap_map["emp_num"]][0] ?? '';
            $item['lastname'] = $results[$i][$ldap_map["last_name"]][0] ?? '';
            $item['firstname'] = $results[$i][$ldap_map["first_name"]][0] ?? '';
@@ -254,13 +244,8 @@ class LdapSync extends Command
            $item['ldap_location_override'] = $results[$i]['ldap_location_override'] ?? '';
            $item['location_id'] = $results[$i]['location_id'] ?? '';
            $item['telephone'] = $results[$i][$ldap_map["phone"]][0] ?? '';
-            $item['mobile'] = $results[$i][$ldap_map["mobile"]][0] ?? '';
            $item['jobtitle'] = $results[$i][$ldap_map["jobtitle"]][0] ?? '';
-            $item['address'] = $results[$i][$ldap_map["address"]][0] ?? '';
-            $item['city'] = $results[$i][$ldap_map["city"]][0] ?? '';
-            $item['state'] = $results[$i][$ldap_map["state"]][0] ?? '';
            $item['country'] = $results[$i][$ldap_map["country"]][0] ?? '';
-            $item['zip'] = $results[$i][$ldap_map["zip"]][0] ?? '';
            $item['department'] = $results[$i][$ldap_map["dept"]][0] ?? '';
            $item['manager'] = $results[$i][$ldap_map["manager"]][0] ?? '';
            $item['location'] = $results[$i][$ldap_map["location"]][0] ?? '';
@@ -293,9 +278,6 @@ class LdapSync extends Command
            if($ldap_map["username"]  != null){
                $user->username = $item['username'];
            }
-            if($ldap_map["display_name"]  != null){
-                $user->display_name = $item['display_name'];
-            }
            if($ldap_map["last_name"] != null){
                $user->last_name = $item['lastname'];
            }
@@ -311,9 +293,6 @@ class LdapSync extends Command
            if($ldap_map["phone"] != null){
                $user->phone = $item['telephone'];
            }
-            if($ldap_map["mobile"] != null){
-                $user->mobile = $item['mobile'];
-            }
            if($ldap_map["jobtitle"] != null){
                $user->jobtitle = $item['jobtitle'];
            }
--- a/app/Console/Commands/LdapTroubleshooter.php
+++ b/app/Console/Commands/LdapTroubleshooter.php
@@ -6,7 +6,6 @@ use Illuminate\Console\Command;
 use App\Models\Setting;
 use Exception;
 use Illuminate\Support\Facades\Crypt;
-use App\Models\Ldap;

 /**
 * Check if a given ip is in a network
@@ -161,15 +160,7 @@ class LdapTroubleshooter extends Command
            $output[] = "-x";
            $output[] = "-b ".escapeshellarg($settings->ldap_basedn);
            $output[] = "-D ".escapeshellarg($settings->ldap_uname);
-
-            try {
-                $w = Crypt::Decrypt($settings->ldap_pword);
-            } catch (\Exception $e) {
-                $this->warn("Could not decrypt password. This usually means an LDAP password was not set or the APP_KEY was changed since the LDAP pasword was last saved.  Aborting.");
-                exit(0);
-            }
-
-            $output[] = "-w ". escapeshellarg($w);
+            $output[] = "-w ".escapeshellarg(Crypt::Decrypt($settings->ldap_pword));
            $output[] = escapeshellarg(parenthesized_filter($settings->ldap_filter));
            if($settings->ldap_tls) {
                $this->line("# adding STARTTLS option");
@@ -180,23 +171,6 @@ class LdapTroubleshooter extends Command
            $this->line(implode(" \\\n",$output));
            exit(0);
        }
-
-        //PHP Version check for warning
-        $php_version = phpversion();
-        list($major, $minor, $patch) = explode('.', $php_version);
-        if (
-            $major < 8 ||
-            ($major == 8 && $minor < 3) ||
-            ($major == 8 && $minor == 3 && $patch < 21) ||
-            ($major == 8 && $minor == 4 && $patch < 7)
-        ) {
-            $this->warn("PHP Version: $php_version WARNING - Versions before 8.3.21 or 8.4.7 will return INCONSISTENT results!");
-            if (!$this->confirm("Are you sure you wish to continue?")) {
-                $this->warn("ABORTING");
-                exit(-1);
-            }
-        }
-
        if(!$this->option('force')) {
            $confirmation = $this->confirm('WARNING: This command will make several attempts to connect to your LDAP server. Are you sure this is ok?');
            if(!$confirmation) {
@@ -205,7 +179,7 @@ class LdapTroubleshooter extends Command
            }
        }
        //$this->line(print_r($settings,true));
-        $this->line("STAGE 1: Checking settings");
+        $this->info("STAGE 1: Checking settings");
        if(!$settings->ldap_enabled) {
            $this->error("WARNING: Snipe-IT's LDAP setting is not turned on. (That may be OK if you're still trying to figure out settings)");
        }
@@ -236,40 +210,32 @@ class LdapTroubleshooter extends Command
            $this->info("Determined LDAP hostname to be: ".$parsed['host']);
        }

-        $raw_ips = [];
-
-        if (inet_pton($parsed['host']) !== false) {
-            $this->line($parsed['host'] . " already looks like an address; skipping DNS lookup");
-            $raw_ips[] = $parsed['host'];
-        } else {
-            $this->line("Performing DNS lookup of: " . $parsed['host']);
+        $this->info("Performing DNS lookup of: ".$parsed['host']);
        $ips = dns_get_record($parsed['host']);
+        $raw_ips = [];

        //$this->info("Host IP is: ".print_r($ips,true));

-            if (!$ips || count($ips) == 0) {
-                $this->error("ERROR: DNS lookup of host: " . $parsed['host'] . " has failed. ABORTING.");
+        if(!$ips || count($ips) == 0) {
+            $this->error("ERROR: DNS lookup of host: ".$parsed['host']." has failed. ABORTING.");
            exit(-1);
        }
-            $this->debugout("IP's? " . print_r($ips, true));
-            foreach ($ips as $ip) {
-                if (!isset($ip['ip'])) {
+        $this->debugout("IP's? ".print_r($ips,true));
+        foreach($ips as $ip) {
+            if(!isset($ip['ip'])) {
                continue;
            }
-                $raw_ips[] = $ip['ip'];
-            }
-        }
-        foreach ($raw_ips as $ip) {
-            if ($ip == "127.0.0.1") {
+            $raw_ips[]=$ip['ip'];
+            if($ip['ip'] == "127.0.0.1") {
                $this->error("WARNING: Using the localhost IP as the LDAP server. This is usually wrong");
            }
-            if (ip_in_range($ip, '10.0.0.0/8') || ip_in_range($ip, '192.168.0.0/16') || ip_in_range($ip, '172.16.0.0/12')) {
+            if(ip_in_range($ip['ip'],'10.0.0.0/8') || ip_in_range($ip['ip'],'192.168.0.0/16') || ip_in_range($ip['ip'], '172.16.0.0/12')) {
                $this->error("WARNING: Using an RFC1918 Private address for LDAP server. This may be correct, but it can be a problem if your Snipe-IT instance is not hosted on your private network");
            }
        }

-        $this->line("STAGE 2: Checking basic network connectivity");
-        $ports = [636, 389];
+        $this->info("STAGE 2: Checking basic network connectivity");
+        $ports = [389,636];
        if(@$parsed['port'] && !in_array($parsed['port'],$ports)) {
            $ports[] = $parsed['port'];
        }
@@ -280,7 +246,7 @@ class LdapTroubleshooter extends Command
            $errstr = '';
            $timeout = 30.0;
            $result = '';
-            $this->line("Attempting to connect to port: " . $port . " - may take up to $timeout seconds");
+            $this->info("Attempting to connect to port: ".$port." - may take up to $timeout seconds");
            try {
                $result = fsockopen($parsed['host'], $port, $errno, $errstr, 30.0);
            } catch(Exception $e) {
@@ -299,9 +265,9 @@ class LdapTroubleshooter extends Command
            exit(-1);
        }

-        $this->line("STAGE 3: Determine encryption algorithm, if any");
+        $this->info("STAGE 3: Determine encryption algorithm, if any");

-        $ldap_urls = []; // [url, cert-check?, start_tls?]
+        $ldap_urls = [];
        $pretty_ldap_urls = [];
        foreach($open_ports as $port) {
            $this->line("Trying TLS first for port $port");
@@ -309,46 +275,35 @@ class LdapTroubleshooter extends Command
            if($this->test_anonymous_bind($ldap_url)) {
                $this->info("Anonymous bind succesful to $ldap_url!");
                $ldap_urls[] = [ $ldap_url, true, false ];
-                $pretty_ldap_urls[] = [$ldap_url, "enabled", "n/a (no)"];
+                $pretty_ldap_urls[] = [ $ldap_url, "YES", "no" ];
                continue; // TODO - lots of copypasta in these if(test_anonymous_bind()) routines...
            } else {
                $this->error("WARNING: Failed to bind to $ldap_url - trying without certificate checks.");
            }

            if($this->test_anonymous_bind($ldap_url, false)) {
-                $this->info("Anonymous bind successful to $ldap_url with certificate-checks disabled");
-                $ldap_urls[] = [$ldap_url, false, false];
-                $pretty_ldap_urls[] = [$ldap_url, "DISABLED", "n/a (no)"];
+                $this->info("Anonymous bind succesful to $ldap_url with certifcate-checks disabled");
+                $ldap_urls[] = [ $ldap_url, false, false ]; 
+                $pretty_ldap_urls[] = [ $ldap_url, "no", "no" ]; 
                continue;
            } else {
                $this->error("WARNING: Failed to bind to $ldap_url with certificate checks disabled. Trying unencrypted with STARTTLS");
            }

-            // now switching to ldap:// URL's from ldaps://
            $ldap_url = "ldap://".$parsed['host'].":$port";
-
            if($this->test_anonymous_bind($ldap_url, true, true)) {
                $this->info("Plain connection to $ldap_url with STARTTLS succesful!");
                $ldap_urls[] = [ $ldap_url, true, true ];
-                $pretty_ldap_urls[] = [$ldap_url, "enabled", "STARTTLS ENABLED"];
+                $pretty_ldap_urls[] = [ $ldap_url, "YES", "YES" ];
                continue;
            } else {
-                $this->error("WARNING: Failed to bind to $ldap_url with STARTTLS enabled. Trying without certificate checks.");
-            }
-
-            if ($this->test_anonymous_bind($ldap_url, false, true)) {
-                $this->info("Plain connection to $ldap_url with STARTTLS and cert checks *disabled* successful!");
-                $ldap_urls[] = [$ldap_url, false, true];
-                $pretty_ldap_urls[] = [$ldap_url, "DISABLED", "STARTTLS ENABLED"];
-                continue;
-            } else {
-                $this->error("WARNING: Failed to bind to $ldap_url with STARTTLS enabled, and cert checks disabled. Trying without STARTTLS");
+                $this->error("WARNING: Failed to bind to $ldap_url with STARTTLS enabled. Trying without STARTTLS");
            }

            if($this->test_anonymous_bind($ldap_url)) {
                $this->info("Plain connection to $ldap_url succesful!");
                $ldap_urls[] = [ $ldap_url, true, false ];
-                $pretty_ldap_urls[] = [$ldap_url, "n/a", "starttls disabled"];
+                $pretty_ldap_urls[] = [ $ldap_url, "YES", "no" ];
                continue;
            } else {
                $this->error("WARNING: Failed to bind to $ldap_url. Giving up on port $port");
@@ -358,29 +313,23 @@ class LdapTroubleshooter extends Command
        $this->debugout(print_r($ldap_urls,true));

        if(count($ldap_urls) > 0 ) {
-            $this->debugout("Found working LDAP URL's: ");
+            $this->info("Found working LDAP URL's: ");
            foreach($ldap_urls as $ldap_url) { // TODO maybe do this as a $this->table() instead?
-                $this->debugout("LDAP URL: " . $ldap_url[0]);
-                $this->debugout($ldap_url[0] . ($ldap_url[1] ? " certificate checks enabled" : " certificate checks disabled") . ($ldap_url[2] ? " STARTTLS Enabled " : " STARTTLS Disabled"));
+                $this->info("LDAP URL: ".$ldap_url[0]);
+                $this->info($ldap_url[0]. ($ldap_url[1] ? " certificate checks enabled" : " certificate checks disabled"). ($ldap_url[2] ? " STARTTLS Enabled ": " STARTTLS Disabled"));
            }
-            $this->table(["URL", "Cert Checks?", "STARTTLS?"], $pretty_ldap_urls);
+            $this->table(["URL", "Cert Checks Enabled?", "STARTTLS Enabled?"],$pretty_ldap_urls);
        } else {
            $this->error("ERROR - no valid LDAP URL's available - ABORTING");
            exit(1);
        }

-        $this->line("STAGE 4: Test Administrative Bind for LDAP Sync");
+        $this->info("STAGE 4: Test Administrative Bind for LDAP Sync");
        foreach($ldap_urls AS $ldap_url) {
-            try {
-                $w = Crypt::Decrypt($settings->ldap_pword);
-            } catch (\Exception $e) {
-                $this->warn("Could not decrypt password. This usually means an LDAP password was not set or the APP_KEY was changed since the LDAP pasword was last saved.  Aborting.");
-                exit(0);
-            }
-            $this->test_authed_bind($ldap_url[0], $ldap_url[1], $ldap_url[2], $settings->ldap_uname, $w);
+            $this->test_authed_bind($ldap_url[0], $ldap_url[1], $ldap_url[2], $settings->ldap_uname, Crypt::decrypt($settings->ldap_pword));
        }

-        $this->line("STAGE 5: Test BaseDN");
+        $this->info("STAGE 5: Test BaseDN");
        //grab all LDAP_ constants and fill up a reversed array mapping from weird LDAP dotted-strings to (Constant Name)
        $all_defined_constants = get_defined_constants();
        $ldap_constants = [];
@@ -392,23 +341,16 @@ class LdapTroubleshooter extends Command
        $this->debugout("LDAP constants are: ".print_r($ldap_constants,true));

        foreach($ldap_urls AS $ldap_url) {
-            try {
-                $w = Crypt::Decrypt($settings->ldap_pword);
-            } catch (\Exception $e) {
-                $this->warn("Could not decrypt password. This usually means an LDAP password was not set or the APP_KEY was changed since the LDAP pasword was last saved.  Aborting.");
-                exit(0);
-            }
-
-            if($this->test_informational_bind($ldap_url[0],$ldap_url[1],$ldap_url[2],$settings->ldap_uname,$w,$settings)) {
+            if($this->test_informational_bind($ldap_url[0],$ldap_url[1],$ldap_url[2],$settings->ldap_uname,Crypt::decrypt($settings->ldap_pword),$settings)) {
                $this->info("Success getting informational bind!");
            } else {
                $this->error("Unable to get information from bind.");
            }
        }

-        $this->line("STAGE 6: Test LDAP Login to Snipe-IT");
+        $this->info("STAGE 6: Test LDAP Login to Snipe-IT");
        foreach($ldap_urls AS $ldap_url) {
-            $this->line("Starting auth to " . $ldap_url[0]);
+            $this->info("Starting auth to ".$ldap_url[0]);
            while(true) {
                $with_tls = $ldap_url[1] ? "with": "without";
                $with_startssl = $ldap_url[2] ? "using": "not using";
@@ -417,12 +359,7 @@ class LdapTroubleshooter extends Command
                }
                $username = $this->ask("Username");
                $password = $this->secret("Password");
-                $results = $this->test_authed_bind($ldap_url[0], $ldap_url[1], $ldap_url[2], $username, $password); // FIXME - should do some other stuff here, maybe with the concatenating or something? maybe? and/or should put up some results?
-                if ($results) {
-                    $this->info("Success authenticating with " . $username);
-                } else {
-                    $this->error("Unable to authenticate with " . $username);
-                }
+                $this->test_authed_bind($ldap_url[0], $ldap_url[1], $ldap_url[2], $username, $password); // FIXME - should do some other stuff here, maybe with the concatenating or something? maybe? and/or should put up some results?
            }
        }

@@ -431,17 +368,14 @@ class LdapTroubleshooter extends Command

    public function connect_to_ldap($ldap_url, $check_cert, $start_tls) 
    {
-        if ($check_cert) {
-            $this->line("we *ARE* checking certs");
-            Ldap::ignoreCertificates(false);
-
-        } else {
-            $this->line("we are IGNORING certs");
-            Ldap::ignoreCertificates(true);
-        }
        $lconn = ldap_connect($ldap_url);
        ldap_set_option($lconn, LDAP_OPT_PROTOCOL_VERSION, 3); // should we 'test' different protocol versions here? Does anyone even use anything other than LDAPv3?
                                                             // no - it's formally deprecated: https://tools.ietf.org/html/rfc3494
+        if(!$check_cert) {
+            putenv('LDAPTLS_REQCERT=never'); // This is horrible; is this *really* the only way to do it?
+        } else {
+            putenv('LDAPTLS_REQCERT'); // have to very explicitly and manually *UN* set the env var here to ensure it works
+        }
        if($this->settings->ldap_client_tls_cert && $this->settings->ldap_client_tls_key) {
            // client-side TLS certificate support for LDAP (Google Secure LDAP)
            putenv('LDAPTLS_CERT=storage/ldap_client_tls.cert');
@@ -470,10 +404,9 @@ class LdapTroubleshooter extends Command
        return $this->timed_boolean_execute(function () use ($ldap_url, $check_cert , $start_tls) {
            try {
                $lconn = $this->connect_to_ldap($ldap_url, $check_cert, $start_tls);
-                $this->line("Attempting to bind now, this can take a while if we mess it up");
+                $this->info("gonna try to bind now, this can take a while if we mess it up");
                $bind_results = ldap_bind($lconn);
-                $this->line("Bind results are: " . $bind_results . " which translate into boolean: " . (bool)$bind_results);
-                ldap_close($lconn);
+                $this->info("Bind results are: ".$bind_results." which translate into boolean: ".(bool)$bind_results);
                return (bool)$bind_results;
            } catch (Exception $e) {
                $this->error("WARNING: Exception caught during bind - ".$e->getMessage());
@@ -488,7 +421,6 @@ class LdapTroubleshooter extends Command
            try {
                $lconn = $this->connect_to_ldap($ldap_url, $check_cert, $start_tls);
                $bind_results = ldap_bind($lconn, $username, $password);
-                ldap_close($lconn);
                if(!$bind_results) {
                    $this->error("WARNING: Failed to bind to $ldap_url as $username");
                    return false;
@@ -514,62 +446,22 @@ class LdapTroubleshooter extends Command
                    return false;
                }
                $this->info("SUCCESS - Able to bind to $ldap_url as $username");
-                $cleaned_results = [];
-                try {
-                    // This _may_ only work for Active Directory?
                $result = ldap_read($conn, '', '(objectClass=*)'/* , ['supportedControl']*/);
                $results = ldap_get_entries($conn, $result);
                $cleaned_results = $this->ldap_results_cleaner($results);
-                    //$this->line(print_r($cleaned_results,true));
-                    $default_naming_contexts = $cleaned_results[0]['namingcontexts'];
-                    $this->info("Default Naming Contexts:");
-                    $this->info(implode(", ", $default_naming_contexts));
+                $this->line(print_r($cleaned_results,true));
                //okay, great - now how do we display those results? I have no idea.
-                } catch (\Exception $e) {
-                    $this->error("Unable to get base naming contexts - here's what we *did* get:");
-                    $this->line(print_r($cleaned_results, true));
-                }
                // I don't see why this throws an Exception for Google LDAP, but I guess we ought to try and catch it?
-                $this->debugout("I guess we're trying to do the ldap search here, but sometimes it takes too long?");
+                $this->comment("I guess we're trying to do the ldap search here, but sometimes it takes too long?");
                $this->debugout("Base DN is: ".$settings->ldap_basedn." and filter is: ".parenthesized_filter($settings->ldap_filter));
                $search_results = ldap_search($conn, $settings->ldap_basedn, parenthesized_filter($settings->ldap_filter));
-                $entries = ldap_get_entries($conn, $search_results);
                $this->info("Printing first 10 results: ");
-                $pretty_data = array_slice($this->ldap_results_cleaner($entries), 0, 10);
-                //print_r($data);
-                $headers = [];
-                foreach ($pretty_data as $row) {
-                    //populate headers
-                    foreach ($row as $key => $value) {
-                        //skip objectsid and objectguid because it junks up output
-                        if ($key == "objectsid" || $key == "objectguid") {
-                            continue;
+                for($i=0;$i<10;$i++) {
+                    $this->info($search_results[$i]);
                }
-                        if (!in_array($key, $headers)) {
-                            $headers[] = $key;
-                        }
-                    }
-                }
-                $table = [];
-                //repeat again to populate table
-                foreach ($pretty_data as $row) {
-                    $newrow = [];
-                    foreach ($headers as $header) {
-                        if (is_array(@$row[$header])) {
-                            $newrow[] = "[" . implode(", ", $row[$header]) . "]";
-                        } else {
-                            $newrow[] = @$row[$header];
-                        }
-                    }
-                    $table[] = $newrow;
-                }
-
-                $this->table($headers, $table);
            } catch (\Exception $e) {
                $this->error("WARNING: Exception caught during Authed bind to $username - ".$e->getMessage());
                return false;
-            } finally {
-                ldap_close($conn);
            }
        });
    }
@@ -585,7 +477,7 @@ class LdapTroubleshooter extends Command
    {
        if(!(function_exists('pcntl_sigtimedwait') && function_exists('posix_getpid') && function_exists('pcntl_fork') && function_exists('posix_kill') && function_exists('pcntl_wifsignaled'))) {
            // POSIX functions needed for forking aren't present, just run the function inline (ignoring timeout)
-            $this->line('WARNING: Unable to execute POSIX fork() commands, timeout may not be respected');
+            $this->info('WARNING: Unable to execute POSIX fork() commands, timeout may not be respected');
            return $function();
        } else {
            $parent_pid = posix_getpid();
@@ -622,6 +514,4 @@ class LdapTroubleshooter extends Command
        }

    }
-
-
 }
--- a/app/Console/Commands/MoveUploadsToNewDisk.php
+++ b/app/Console/Commands/MoveUploadsToNewDisk.php
@@ -96,7 +96,7 @@ class MoveUploadsToNewDisk extends Command
        $private_uploads['assets'] = glob('storage/private_uploads/assets'."/*.*");
        $private_uploads['signatures'] = glob('storage/private_uploads/signatures'."/*.*");
        $private_uploads['audits'] = glob('storage/private_uploads/audits'."/*.*");
-        $private_uploads['assetmodels'] = glob('storage/private_uploads/models'."/*.*");
+        $private_uploads['assetmodels'] = glob('storage/private_uploads/assetmodels'."/*.*");
        $private_uploads['imports'] = glob('storage/private_uploads/imports'."/*.*");
        $private_uploads['licenses'] = glob('storage/private_uploads/licenses'."/*.*");
        $private_uploads['users'] = glob('storage/private_uploads/users'."/*.*");
--- a/app/Console/Commands/PaveIt.php
+++ b/app/Console/Commands/PaveIt.php
@@ -4,7 +4,7 @@ namespace App\Console\Commands;

 use App\Models\Asset;
 use App\Models\CustomField;
-use Illuminate\Support\Facades\Schema;
+use Schema;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Console\Command;

@@ -66,8 +66,8 @@ class PaveIt extends Command
        foreach ($custom_fields as $custom_field) {
            $this->info('DROP the '.$custom_field->db_column.' column from assets as well.');

-            if (Schema::hasColumn('assets', $custom_field->db_column)) {
-                Schema::table('assets', function ($table) use ($custom_field) {
+            if (\Schema::hasColumn('assets', $custom_field->db_column)) {
+                \Schema::table('assets', function ($table) use ($custom_field) {
                    $table->dropColumn($custom_field->db_column);
                });
            }
@@ -84,8 +84,8 @@ class PaveIt extends Command
        }

        // Leave in the demo oauth keys so we don't have to reset them every day in the demos
-        DB::statement('delete from oauth_clients WHERE id > 2');
-        DB::statement('delete from oauth_access_tokens WHERE user_id > 2');
+        \DB::statement('delete from oauth_clients WHERE id > 2');
+        \DB::statement('delete from oauth_access_tokens WHERE id > 2');
    
    }
 }
--- a/app/Console/Commands/Purge.php
+++ b/app/Console/Commands/Purge.php
@@ -62,19 +62,19 @@ class Purge extends Command
            $assetcount = $assets->count();
            $this->info($assets->count().' assets purged.');
            $asset_assoc = 0;
-            $maintenances = 0;
+            $asset_maintenances = 0;

            foreach ($assets as $asset) {
                $this->info('- Asset "'.$asset->present()->name().'" deleted.');
                $asset_assoc += $asset->assetlog()->count();
                $asset->assetlog()->forceDelete();
-                $maintenances += $asset->maintenances()->count();
-                $asset->maintenances()->forceDelete();
+                $asset_maintenances += $asset->assetmaintenances()->count();
+                $asset->assetmaintenances()->forceDelete();
                $asset->forceDelete();
            }

            $this->info($asset_assoc.' corresponding log records purged.');
-            $this->info($maintenances.' corresponding maintenance records purged.');
+            $this->info($asset_maintenances.' corresponding maintenance records purged.');

            $locations = Location::whereNotNull('deleted_at')->withTrashed()->get();
            $this->info($locations->count().' locations purged.');
--- a/app/Console/Commands/RestoreFromBackup.php
+++ b/app/Console/Commands/RestoreFromBackup.php
@@ -243,15 +243,12 @@ class RestoreFromBackup extends Command
        $private_dirs = [
            'storage/private_uploads/accessories',
            'storage/private_uploads/assetmodels',
-            'storage/private_uploads/maintenances',
-            'storage/private_uploads/models',
            'storage/private_uploads/assets', // these are asset _files_, not the pictures.
            'storage/private_uploads/audits',
            'storage/private_uploads/components',
            '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',
@@ -262,10 +259,9 @@ class RestoreFromBackup extends Command
        ];
        $public_dirs = [
            'public/uploads/accessories',
-            'public/uploads/assetmodels',
-            'public/uploads/maintenances',
            'public/uploads/assets', // these are asset _pictures_, not asset files
            'public/uploads/avatars',
+            //'public/uploads/barcodes', // we don't want this, let the barcodes be regenerated
            'public/uploads/categories',
            'public/uploads/companies',
            'public/uploads/components',
@@ -332,9 +328,9 @@ class RestoreFromBackup extends Command
                    }
                }
            }
-
-            $good_extensions = config('filesystems.allowed_upload_extensions_array');
-
+            $good_extensions = ['png', 'gif', 'jpg', 'svg', 'jpeg', 'doc', 'docx', 'pdf', 'txt',
+                                '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) {
--- a/app/Console/Commands/SendAcceptanceReminder.php
+++ b/app/Console/Commands/SendAcceptanceReminder.php
@@ -77,7 +77,7 @@ class SendAcceptanceReminder extends Command
            if(!$email){
                $no_email_list[] = [
                    'id' => $acceptance->assignedTo?->id,
-                    'name' => $acceptance->assignedTo?->display_name,
+                    'name' => $acceptance->assignedTo?->present()->fullName(),
                ];
            } else {
                $count++;
@@ -99,11 +99,8 @@ class SendAcceptanceReminder extends Command
        foreach ($no_email_list as $user) {
            $rows[] = [$user['id'], $user['name']];
        }
-
-        if (!empty($rows)) {
        $this->info("The following users do not have an email address:");
        $this->table($headers, $rows);
-        }

        return 0;
    }
--- 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 a few moments if have a very large dataset.');
+        $this->info('This could take 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/Events/CheckoutableCheckedIn.php
+++ b/app/Events/CheckoutableCheckedIn.php
@@ -28,7 +28,7 @@ class CheckoutableCheckedIn
        $this->checkedOutTo = $checkedOutTo;
        $this->checkedInBy = $checkedInBy;
        $this->note = $note;
-        $this->action_date = $action_date ?? date('Y-m-d H:i:s');
+        $this->action_date = $action_date ?? date('Y-m-d');
        $this->originalValues = $originalValues;
    }
 }
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -11,7 +11,6 @@ use Illuminate\Support\Facades\Log;
 use Throwable;
 use JsonException;
 use Carbon\Exceptions\InvalidFormatException;
-use Illuminate\Http\Exceptions\ThrottleRequestsException;

 class Handler extends ExceptionHandler
 {
@@ -108,43 +107,27 @@ class Handler extends ExceptionHandler

                $statusCode = $e->getStatusCode();

-                // API throttle requests are handled in the RouteServiceProvider configureRateLimiting() method, so we don't need to handle them here
                switch ($e->getStatusCode()) {
                    case '404':
                       return response()->json(Helper::formatStandardApiResponse('error', null, $statusCode . ' endpoint not found'), 404);
+                    case '429':
+                        return response()->json(Helper::formatStandardApiResponse('error', null, 'Too many requests'), 429);
                     case '405':
                        return response()->json(Helper::formatStandardApiResponse('error', null, 'Method not allowed'), 405);
                    default:
                        return response()->json(Helper::formatStandardApiResponse('error', null, $statusCode), $statusCode);
-                }

                }
-
-            // This handles API validation exceptions that happen at the Form Request level, so they
-            // never even get to the controller where we normally  nicely format JSON responses
-            if ($e instanceof ValidationException) {
-                $response = $this->invalidJson($request, $e);
-                return response()->json(Helper::formatStandardApiResponse('error', null,  $e->errors()), 200);
            }
-
        }


        // This is traaaaash but it handles models that are not found while using route model binding :(
        // The only alternative is to set that at *each* route, which is crazypants
        if ($e instanceof \Illuminate\Database\Eloquent\ModelNotFoundException) {
-            $ids = method_exists($e, 'getIds') ? $e->getIds() : [];
-
-            if (in_array('bulkedit', $ids, true)) {
-            $error_array = session()->get('bulk_asset_errors');
-                return redirect()
-                    ->route('hardware.index')
-                    ->withErrors($error_array, 'bulk_asset_errors')
-                    ->withInput();
-            }

            // This gets the MVC model name from the exception and formats in a way that's less fugly
-            $model_name = trim(strtolower(implode(" ", preg_split('/(?=[A-Z])/', last(explode('\\', $e->getModel()))))));
+            $model_name = strtolower(implode(" ", preg_split('/(?=[A-Z])/', last(explode('\\', $e->getModel())))));
            $route = str_plural(strtolower(last(explode('\\', $e->getModel())))).'.index';

            // Sigh.
@@ -160,8 +143,6 @@ class Handler extends ExceptionHandler
                $route = 'maintenances.index';
            } elseif ($route === 'licenseseats.index') {
                $route = 'licenses.index';
-            } elseif (($route === 'customfieldsets.index') || ($route === 'customfields.index')) {
-                $route = 'fields.index';
            }

            return redirect()
@@ -220,7 +201,6 @@ class Handler extends ExceptionHandler
     */
    public function register()
    {
-
        $this->reportable(function (Throwable $e) {
            //
        });
--- a/app/Helpers/Helper.php
+++ b/app/Helpers/Helper.php
@@ -13,7 +13,6 @@ use App\Models\Setting;
 use App\Models\Statuslabel;
 use App\Models\License;
 use App\Models\Location;
-use Illuminate\Http\RedirectResponse;
 use Illuminate\Support\Facades\Crypt;
 use Illuminate\Contracts\Encryption\DecryptException;
 use Carbon\Carbon;
@@ -723,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') && (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>'),
+            '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>'),
        ];

        // if item of concern is being used and its being used with the deprecated values return the notification array.
@@ -877,48 +876,6 @@ class Helper
        return false;
    }

-    /**
-     * Check if the file is a video, so we can show a preview
-     *
-     * @param File $file
-     * @return string | Boolean
-     * @author [B. Wetherington] [<bwetherington@grokability.com>]
-     * @since [v8.1.18]
-     */
-    public static function checkUploadIsVideo($file)
-    {
-        $finfo = @finfo_open(FILEINFO_MIME_TYPE); // return mime type ala mimetype extension
-        $filetype = @finfo_file($finfo, $file);
-        finfo_close($finfo);
-
-        if (($filetype == 'video/mp4') || ($filetype == 'video/quicktime') || ($filetype == 'video/mpeg') || ($filetype == 'video/ogg') || ($filetype == 'video/webm') || ($filetype == 'video/x-msvide')) {
-            return $filetype;
-        }
-
-        return false;
-    }
-
-    /**
-     * Check if the file is audio, so we can show a preview
-     *
-     * @param File $file
-     * @return string | Boolean
-     * @author [A. Gianotto] [<snipe@snipe.net>]
-     * @since [v3.0]
-     */
-    public static function checkUploadIsAudio($file)
-    {
-        $finfo = @finfo_open(FILEINFO_MIME_TYPE); // return mime type ala mimetype extension
-        $filetype = @finfo_file($finfo, $file);
-        finfo_close($finfo);
-
-        if (($filetype == 'audio/mpeg') || ($filetype == 'audio/ogg')) {
-            return $filetype;
-        }
-
-        return false;
-    }
-
    /**
     * Walks through the permissions in the permissions config file and determines if
     * permissions are granted based on a $selected_arr array.
@@ -939,12 +896,6 @@ 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++) {
@@ -955,13 +906,13 @@ class Helper
                    if (is_array($selected_arr)) {

                        if (array_key_exists($permission_name, $selected_arr)) {
-                            $permissions_arr[$permission_name] = (int) $selected_arr[$permission_name];
+                            $permissions_arr[$permission_name] = $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';
                    }
                }
            }
@@ -1197,42 +1148,22 @@ class Helper
            'webp'   => 'far fa-image',
            'avif'   => 'far fa-image',
            'svg' => 'fas fa-vector-square',
-
            // word
            'doc'   => 'far fa-file-word',
            'docx'   => 'far fa-file-word',
-
            // Excel
            'xls'   => 'far fa-file-excel',
            'xlsx'   => 'far fa-file-excel',
-            'ods'   => 'far fa-file-excel',
-
-            // Presentation
-            'ppt'   => 'far fa-file-powerpoint',
-            'odp'   => 'far fa-file-powerpoint',
-
            // archive
            'zip'   => 'fas fa-file-archive',
            'rar'   => 'fas fa-file-archive',
-
            //Text
-            'odt'   => 'far fa-file-alt',
            'txt'   => 'far fa-file-alt',
            'rtf'   => 'far fa-file-alt',
            'xml'   => 'fas fa-code',
-
            // Misc
            'pdf'   => 'far fa-file-pdf',
            'lic'   => 'far fa-save',
-
-            // video
-            'mov'   => 'fa-solid fa-video',
-            'mp4'   => 'fa-solid fa-video',
-
-            // audio
-            'ogg'   => 'fa-solid fa-file-audio',
-            'mp3'   => 'fa-solid fa-file-audio',
-            'wav'   => 'fa-solid fa-file-audio',
        ];

        if ($extension && array_key_exists($extension, $allowedExtensionMap)) {
@@ -1376,24 +1307,25 @@ class Helper
        switch ($item) {
            case 'asset':
                return 'fas fa-barcode';
+                break;
            case 'accessory':
                return 'fas fa-keyboard';
+                break;
            case 'component':
                return 'fas fa-hdd';
+                break;
            case 'consumable':
                return 'fas fa-tint';
+                break;
            case 'license':
                return 'far fa-save';
+                break;
            case 'location':
                return 'fas fa-map-marker-alt';
+                break;
            case 'user':
                return 'fas fa-user';
-            case 'supplier':
-                return 'fa-solid fa-store';
-            case 'manufacturer':
-                return 'fa-solid fa-building';
-            case 'category':
-                return 'fa-solid fa-table-columns';
+                break;
        }

    }
@@ -1543,62 +1475,60 @@ class Helper
    }


-    static public function getRedirectOption($request, $id, $table, $item_id = null) : RedirectResponse
+    static public function getRedirectOption($request, $id, $table, $item_id = null)
    {

-        $redirect_option = Session::get('redirect_option') ?? $request->redirect_option;
-        $checkout_to_type = Session::get('checkout_to_type') ?? null;
+        $redirect_option = Session::get('redirect_option');
+        $checkout_to_type = Session::get('checkout_to_type');
        $checkedInFrom = Session::get('checkedInFrom');
-        $other_redirect = Session::get('other_redirect');
-        $backUrl = Session::pull('back_url', route('home'));
-
-       // return to previous page
-        if ($redirect_option === 'back') {
-            return redirect()->to($backUrl);
-        }

        // return to index
        if ($redirect_option == 'index') {
-            return match ($table) {
-                'Assets' => redirect()->route('hardware.index'),
-                'Users' => redirect()->route('users.index'),
-                'Licenses' => redirect()->route('licenses.index'),
-                'Accessories' => redirect()->route('accessories.index'),
-                'Components' => redirect()->route('components.index'),
-                'Consumables' => redirect()->route('consumables.index'),
-            };
+            switch ($table) {
+                case "Assets":
+                    return route('hardware.index');
+                case "Users":
+                    return route('users.index');
+                case "Licenses":
+                    return route('licenses.index');
+                case "Accessories":
+                    return route('accessories.index');
+                case "Components":
+                    return route('components.index');
+                case "Consumables":
+                    return route('consumables.index');
+            }
        }

        // return to thing being assigned
        if ($redirect_option == 'item') {
-            return match ($table) {
-                'Assets'      => redirect()->route('hardware.show', $id ?? $item_id),
-                'Users'       => redirect()->route('users.show', $id ?? $item_id),
-                'Licenses'    => redirect()->route('licenses.show', $id ?? $item_id),
-                'Accessories' => redirect()->route('accessories.show', $id ?? $item_id),
-                'Components'  => redirect()->route('components.show', $id ?? $item_id),
-                'Consumables' => redirect()->route('consumables.show', $id ?? $item_id),
-            };
+            switch ($table) {
+                case "Assets":
+                    return route('hardware.show', $id ?? $item_id);
+                case "Users":
+                    return route('users.show', $id ?? $item_id);
+                case "Licenses":
+                    return route('licenses.show', $id ?? $item_id);
+                case "Accessories":
+                    return route('accessories.show', $id ?? $item_id);
+                case "Components":
+                    return route('components.show', $id ?? $item_id);
+                case "Consumables":
+                    return route('consumables.show', $id ?? $item_id);
+            }
        }

        // return to assignment target
        if ($redirect_option == 'target') {
-            return match ($checkout_to_type) {
-                'user'     => redirect()->route('users.show', $request->assigned_user ?? $checkedInFrom),
-                'location' => redirect()->route('locations.show', $request->assigned_location ?? $checkedInFrom),
-                'asset'    => redirect()->route('hardware.show', $request->assigned_asset ?? $checkedInFrom),
-            };
+            switch ($checkout_to_type) {
+                case 'user':
+                    return route('users.show', $request->assigned_user ?? $checkedInFrom);
+                case 'location':
+                    return route('locations.show', $request->assigned_location ?? $checkedInFrom);
+                case 'asset':
+                    return route('hardware.show', $request->assigned_asset ?? $checkedInFrom);
            }
-
-        // return to somewhere else
-        if ($redirect_option == 'other_redirect') {
-            return match ($other_redirect) {
-                'audit' => redirect()->route('assets.audit.due'),
-                'model' => redirect()->route('models.show', $request->model_id),
-            };
-
        }
-
        return redirect()->back()->with('error', trans('admin/hardware/message.checkout.error'));
    }

@@ -1626,11 +1556,6 @@ 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) {
@@ -1669,17 +1594,14 @@ 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,
-                                    $item->assigned_type ? str_replace('App\\Models\\', '', $item->assigned_type) : null,
+                                    str_replace('App\\Models\\', '', $item->assigned_type) ?? null,
                                    $item->company_id ?? null,
                                    $item->company->name ?? null,
 //                                    $item->defaultLoc->id ?? null,
@@ -1691,15 +1613,6 @@ class Helper
                                    $location_company ?? null,
                                ];

-                            $count++;
-
-                            // Bail early if this is not being run via artisan
-                            if ((!$artisan) && ($count > 0)) {
-                                return $mismatched;
-                            }
-
-
-
                        }
                    }
                }
--- a/app/Helpers/IconHelper.php
+++ b/app/Helpers/IconHelper.php
@@ -43,8 +43,6 @@ class IconHelper
                return 'fa-regular fa-envelope';
            case 'phone':
                return 'fa-solid fa-phone';
-            case 'mobile':
-                return 'fas fa-mobile-screen-button';
            case 'long-arrow-right':
                return 'fas fa-long-arrow-alt-right';
            case 'download':
@@ -153,7 +151,6 @@ class IconHelper
            case 'location':
                return 'fas fa-map-marker-alt';
            case 'superadmin':
-            case 'admin':
                return 'fas fa-crown';
            case 'print':
                return 'fa-solid fa-print';
--- a/app/Helpers/StorageHelper.php
+++ b/app/Helpers/StorageHelper.php
@@ -27,45 +27,6 @@ class StorageHelper
        }
    }

-    public static function getMediaType($file_with_path) {
-
-        // Get the file extension and determine the media type
-        if (Storage::exists($file_with_path)) {
-            $fileinfo = pathinfo($file_with_path);
-            $extension = strtolower($fileinfo['extension']);
-            switch ($extension) {
-                case 'avif':
-                case 'jpg':
-                case 'png':
-                case 'gif':
-                case 'svg':
-                case 'webp':
-                    return 'image';
-                case 'pdf':
-                    return 'pdf';
-                case 'mp3':
-                case 'wav':
-                case 'ogg':
-                    return 'audio';
-                case 'mp4':
-                case 'webm':
-                case 'mov':
-                    return 'video';
-                case 'doc':
-                case 'docx':
-                    return 'document';
-                case 'txt':
-                    return 'text';
-                case 'xls':
-                case 'xlsx':
-                case 'ods':
-                    return 'spreadsheet';
-                default:
-                    return $extension; // Default for unknown types
-            }
-        }
-        return null;
-    }

    /**
     * This determines the file types that should be allowed inline and checks their fileinfo extension
@@ -76,24 +37,17 @@ class StorageHelper
     * @param $file_with_path
     * @return bool
     */
-    public static function allowSafeInline($file_with_path)
-    {
+    public static function allowSafeInline($file_with_path) {

        $allowed_inline = [
-            'avif',
-            'gif',
-            'gif',
-            'jpg',
-            'mov',
-            'mp3',
-            'mp4',
-            'ogg',
            'pdf',
-            'png',
            'svg',
-            'wav',
-            'webm',
+            'jpg',
+            'gif',
+            'svg',
+            'avif',
            'webp',
+            'png',
        ];


@@ -105,24 +59,10 @@ class StorageHelper

    }

-    public static function getFiletype($file_with_path)
-    {
-
-        // The file exists and is allowed to be displayed inline
-        if (Storage::exists($file_with_path)) {
-            return pathinfo($file_with_path, PATHINFO_EXTENSION);
-        }
-
-        return null;
-
-    }
-
-
    /**
     * Decide whether to show the file inline or download it.
     */
-    public static function showOrDownloadFile($file, $filename)
-    {
+    public static function showOrDownloadFile($file, $filename) {

        $headers = [];

--- a/app/Http/Controllers/Accessories/AccessoriesController.php
+++ b/app/Http/Controllers/Accessories/AccessoriesController.php
@@ -77,30 +77,13 @@ class AccessoriesController extends Controller
        $accessory->supplier_id             = request('supplier_id');
        $accessory->notes                   = request('notes');

-        if ($request->has('use_cloned_image')) {
-            $cloned_model_img = Accessory::select('image')->find($request->input('clone_image_from_id'));
-            if ($cloned_model_img) {
-                $new_image_name = 'clone-'.date('U').'-'.$cloned_model_img->image;
-                $new_image = 'accessories/'.$new_image_name;
-                Storage::disk('public')->copy('accessories/'.$cloned_model_img->image, $new_image);
-                $accessory->image = $new_image_name;
-            }
-
-        } else {
        $accessory = $request->handleImages($accessory);
-        }

-        if($request->get('redirect_option') === 'back'){
-            session()->put(['redirect_option' => 'index']);
-        } else {
        session()->put(['redirect_option' => $request->get('redirect_option')]);
-        }
-
        // Was the accessory created?
        if ($accessory->save()) {
            // Redirect to the new accessory  page
-            return Helper::getRedirectOption($request, $accessory->id, 'Accessories')
-                ->with('success', trans('admin/accessories/message.create.success'));
+            return redirect()->to(Helper::getRedirectOption($request, $accessory->id, 'Accessories'))->with('success', trans('admin/accessories/message.create.success'));
        }

        return redirect()->back()->withInput()->withErrors($accessory->getErrors());
@@ -130,12 +113,11 @@ class AccessoriesController extends Controller

        $this->authorize('create', Accessory::class);
        $cloned = clone $accessory;
-        $accessory_to_clone = $accessory;
        $cloned->id = null;
        $cloned->deleted_at = '';
+        $cloned->location_id = null;

        return view('accessories/edit')
-            ->with('cloned_model', $accessory_to_clone)
            ->with('item', $cloned);
        
    }
@@ -185,8 +167,7 @@ class AccessoriesController extends Controller
            session()->put(['redirect_option' => $request->get('redirect_option')]);

            if ($accessory->save()) {
-                return Helper::getRedirectOption($request, $accessory->id, 'Accessories')
-                    ->with('success', trans('admin/accessories/message.update.success'));
+                return redirect()->to(Helper::getRedirectOption($request, $accessory->id, 'Accessories'))->with('success', trans('admin/accessories/message.update.success'));
            }
        } else {
            return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.does_not_exist'));
@@ -203,15 +184,15 @@ class AccessoriesController extends Controller
     */
    public function destroy($accessoryId) : RedirectResponse
    {
-        if (is_null($accessory = Accessory::withCount('checkouts as checkouts_count')->find($accessoryId))) {
+        if (is_null($accessory = Accessory::find($accessoryId))) {
            return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.not_found'));
        }

        $this->authorize($accessory);


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

        if ($accessory->image) {
@@ -239,10 +220,7 @@ class AccessoriesController extends Controller
     */
    public function show(Accessory $accessory) : View | RedirectResponse
    {
-        $accessory->loadCount('checkouts as checkouts_count');
-
-        $accessory->load(['adminuser' => fn($query) => $query->withTrashed()]);
-
+        $accessory = Accessory::withCount('checkouts as checkouts_count')->find($accessory->id);
        $this->authorize('view', $accessory);
        return view('accessories.view', compact('accessory'));
    }
--- a/app/Http/Controllers/Accessories/AccessoriesFilesController.php
+++ b/app/Http/Controllers/Accessories/AccessoriesFilesController.php
@@ -0,0 +1,132 @@
+<?php
+
+namespace App\Http\Controllers\Accessories;
+
+use App\Helpers\StorageHelper;
+use App\Http\Controllers\Controller;
+use App\Http\Requests\UploadFileRequest;
+use App\Models\Actionlog;
+use App\Models\Accessory;
+use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Facades\Log;
+use \Illuminate\Contracts\View\View;
+use \Illuminate\Http\RedirectResponse;
+use Illuminate\Support\Facades\Response;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
+use Symfony\Component\HttpFoundation\StreamedResponse;
+
+class AccessoriesFilesController extends Controller
+{
+    /**
+     * Validates and stores files associated with a accessory.
+     *
+     * @param UploadFileRequest $request
+     * @param int $accessoryId
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v1.0]
+     * @todo Switch to using the AssetFileRequest form request validator.
+     */
+    public function store(UploadFileRequest $request, $accessoryId = null) : RedirectResponse
+    {
+
+        if (config('app.lock_passwords')) {
+            return redirect()->route('accessories.show', ['accessory'=>$accessoryId])->with('error', trans('general.feature_disabled'));
+        }
+
+        $accessory = Accessory::find($accessoryId);
+
+        if (isset($accessory->id)) {
+            $this->authorize('accessories.files', $accessory);
+
+            if ($request->hasFile('file')) {
+                if (! Storage::exists('private_uploads/accessories')) {
+                    Storage::makeDirectory('private_uploads/accessories', 775);
+                }
+
+                foreach ($request->file('file') as $file) {
+
+                    $file_name = $request->handleFile('private_uploads/accessories/', 'accessory-'.$accessory->id, $file);
+                    //Log the upload to the log
+                    $accessory->logUpload($file_name, e($request->input('notes')));
+                }
+
+
+                return redirect()->route('accessories.show', $accessory->id)->withFragment('files')->with('success', trans('general.file_upload_success'));
+
+            }
+
+            return redirect()->route('accessories.show', $accessory->id)->withFragment('files')->with('error', trans('general.no_files_uploaded'));
+        }
+        // Prepare the error message
+        return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.does_not_exist'));
+
+    }
+
+    /**
+     * Deletes the selected accessory file.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v1.0]
+     * @param int $accessoryId
+     * @param int $fileId
+     */
+    public function destroy($accessoryId = null, $fileId = null) : RedirectResponse
+    {
+        if ($accessory = Accessory::find($accessoryId)) {
+            $this->authorize('update', $accessory);
+
+            if ($log = Actionlog::find($fileId)) {
+
+                if (Storage::exists('private_uploads/accessories/'.$log->filename)) {
+                    try {
+                        Storage::delete('private_uploads/accessories/' . $log->filename);
+                        $log->delete();
+                        return redirect()->back()->withFragment('files')->with('success', trans('admin/hardware/message.deletefile.success'));
+                    } catch (\Exception $e) {
+                        Log::debug($e);
+                        return redirect()->route('accessories.index')->with('error', trans('general.file_does_not_exist'));
+                    }
+                }
+
+            }
+            return redirect()->route('accessories.show', ['accessory' => $accessory])->withFragment('files')->with('error',  trans('general.log_record_not_found'));
+        }
+
+        return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.does_not_exist'));
+    }
+
+    /**
+     * Allows the selected file to be viewed.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v1.4]
+     * @param int $accessoryId
+     * @param int $fileId
+     */
+    public function show($accessoryId = null, $fileId = null) : View | RedirectResponse | Response | BinaryFileResponse | StreamedResponse
+    {
+
+
+        // the accessory is valid
+        if ($accessory = Accessory::find($accessoryId)) {
+            $this->authorize('view', $accessory);
+            $this->authorize('accessories.files', $accessory);
+
+            if ($log = Actionlog::whereNotNull('filename')->where('item_id', $accessory->id)->find($fileId)) {
+                $file = 'private_uploads/accessories/'.$log->filename;
+
+                try {
+                    return StorageHelper::showOrDownloadFile($file, $log->filename);
+                } catch (\Exception $e) {
+                    return redirect()->route('accessories.show', ['accessory' => $accessory])->with('error',  trans('general.file_not_found'));
+                }
+            }
+
+            return redirect()->route('accessories.show', ['accessory' => $accessory])->withFragment('files')->with('error',  trans('general.log_record_not_found'));
+
+        }
+
+        return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.does_not_exist'));
+
+    }
+}
--- a/app/Http/Controllers/Accessories/AccessoryCheckinController.php
+++ b/app/Http/Controllers/Accessories/AccessoryCheckinController.php
@@ -78,8 +78,7 @@ class AccessoryCheckinController extends Controller

            session()->put(['redirect_option' => $request->get('redirect_option')]);

-            return Helper::getRedirectOption($request, $accessory->id, 'Accessories')
-                ->with('success', trans('admin/accessories/message.checkin.success'));
+            return redirect()->to(Helper::getRedirectOption($request, $accessory->id, 'Accessories'))->with('success', trans('admin/accessories/message.checkin.success'));
        }
        // Redirect to the accessory management page with error
        return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.checkin.error'));
--- a/app/Http/Controllers/Accessories/AccessoryCheckoutController.php
+++ b/app/Http/Controllers/Accessories/AccessoryCheckoutController.php
@@ -97,7 +97,7 @@ class AccessoryCheckoutController extends Controller


        // Redirect to the new accessory page
-        return Helper::getRedirectOption($request, $accessory->id, 'Accessories')
+        return redirect()->to(Helper::getRedirectOption($request, $accessory->id, 'Accessories'))
            ->with('success', trans('admin/accessories/message.checkout.success'));
    }
 }
--- a/app/Http/Controllers/Account/AcceptanceController.php
+++ b/app/Http/Controllers/Account/AcceptanceController.php
@@ -7,7 +7,6 @@ use App\Events\CheckoutDeclined;
 use App\Events\ItemAccepted;
 use App\Events\ItemDeclined;
 use App\Http\Controllers\Controller;
-use App\Mail\CheckoutAcceptanceResponseMail;
 use App\Models\Actionlog;
 use App\Models\Asset;
 use App\Models\CheckoutAcceptance;
@@ -21,12 +20,9 @@ use App\Models\License;
 use App\Models\Component;
 use App\Models\Consumable;
 use App\Notifications\AcceptanceAssetAcceptedNotification;
-use App\Notifications\AcceptanceAssetAcceptedToUserNotification;
 use App\Notifications\AcceptanceAssetDeclinedNotification;
-use Exception;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Mail;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
 use App\Http\Controllers\SettingsController;
@@ -152,8 +148,6 @@ class AcceptanceController extends Controller
                }
            }

-
-            $assigned_user = User::find($acceptance->assigned_to_id);
            // this is horrible
            switch($acceptance->checkoutable_type){
                case 'App\Models\Asset':
@@ -163,30 +157,35 @@ class AcceptanceController extends Controller
                            return redirect()->back()->with('error', trans('admin/models/message.does_not_exist'));
                        }
                        $display_model = $asset_model->name;
+                        $assigned_to = User::find($acceptance->assigned_to_id)->present()->fullName;
                break;

                case 'App\Models\Accessory':
                        $pdf_view_route ='account.accept.accept-accessory-eula';
                        $accessory = Accessory::find($item->id);
                        $display_model = $accessory->name;
+                        $assigned_to = User::find($acceptance->assigned_to_id)->present()->fullName;
                break;

                case 'App\Models\LicenseSeat':
                        $pdf_view_route ='account.accept.accept-license-eula';
                        $license = License::find($item->license_id);
                        $display_model = $license->name;
+                        $assigned_to = User::find($acceptance->assigned_to_id)->present()->fullName;
                break;

                case 'App\Models\Component':
                        $pdf_view_route ='account.accept.accept-component-eula';
                        $component = Component::find($item->id);
                        $display_model = $component->name;
+                        $assigned_to = User::find($acceptance->assigned_to_id)->present()->fullName;
                break;

                case 'App\Models\Consumable':
                        $pdf_view_route ='account.accept.accept-consumable-eula';
                        $consumable = Consumable::find($item->id);
                        $display_model = $consumable->name;
+                        $assigned_to = User::find($acceptance->assigned_to_id)->present()->fullName;
                break;
            }
 //            if ($acceptance->checkoutable_type == 'App\Models\Asset') {
@@ -227,12 +226,11 @@ class AcceptanceController extends Controller
                'note' => $request->input('note'),
                'check_out_date' => Carbon::parse($acceptance->created_at)->format('Y-m-d'),
                'accepted_date' => Carbon::parse($acceptance->accepted_at)->format('Y-m-d'),
-                'assigned_to' => $assigned_user->present()->fullName,
+                'assigned_to' => $assigned_to,
                'company_name' => $branding_settings->site_name,
                'signature' => ($sig_filename) ? storage_path() . '/private_uploads/signatures/' . $sig_filename : null,
                'logo' => $path_logo,
                'date_settings' => $branding_settings->date_display_format,
-                'admin' => auth()->user()->present()?->fullName,
            ];

            if ($pdf_view_route!='') {
@@ -242,19 +240,6 @@ class AcceptanceController extends Controller
            }

            $acceptance->accept($sig_filename, $item->getEula(), $pdf_filename, $request->input('note'));
-
-            // Send the PDF to the signing user
-            if (($request->input('send_copy') == '1') && ($assigned_user->email !='')) {
-
-                // Add the attachment for the signing user into the $data array
-                $data['file'] = $pdf_filename;
-
-                try {
-                    $assigned_user->notify(new AcceptanceAssetAcceptedToUserNotification($data));
-                } catch (\Exception $e) {
-                    Log::warning($e);
-                }
-            }
            try {
                $acceptance->notify(new AcceptanceAssetAcceptedNotification($data));
            } catch (\Exception $e) {
@@ -348,29 +333,10 @@ class AcceptanceController extends Controller

            $acceptance->decline($sig_filename, $request->input('note'));
            $acceptance->notify(new AcceptanceAssetDeclinedNotification($data));
-            Log::debug('New event acceptance.');
            event(new CheckoutDeclined($acceptance));
            $return_msg = trans('admin/users/message.declined');
        }

-        if ($acceptance->alert_on_response_id) {
-            try {
-                $recipient = User::find($acceptance->alert_on_response_id);
-
-                if ($recipient) {
-                    Log::debug('Attempting to send email acceptance.');
-                    Mail::to($recipient)->send(new CheckoutAcceptanceResponseMail(
-                        $acceptance,
-                        $recipient,
-                        $request->input('asset_acceptance') === 'accepted',
-                    ));
-                    Log::debug('Send email notification sucess on checkout acceptance response.');
-                }
-            } catch (Exception $e) {
-                Log::error($e->getMessage());
-                Log::warning($e);
-            }
-        }

        return redirect()->to('account/accept')->with('success', $return_msg);

--- a/app/Http/Controllers/Api/AccessoriesController.php
+++ b/app/Http/Controllers/Api/AccessoriesController.php
@@ -249,11 +249,11 @@ class AccessoriesController extends Controller
    public function destroy($id)
    {
        $this->authorize('delete', Accessory::class);
-        $accessory = Accessory::withCount('checkouts as checkouts_count')->findOrFail($id);
+        $accessory = Accessory::findOrFail($id);
        $this->authorize($accessory);

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

        $accessory->delete();
--- a/app/Http/Controllers/Api/AssetFilesController.php
+++ b/app/Http/Controllers/Api/AssetFilesController.php
@@ -0,0 +1,200 @@
+<?php
+
+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;
+use App\Models\Asset;
+use App\Models\Actionlog;
+use App\Http\Requests\UploadFileRequest;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\Log;
+use Symfony\Component\HttpFoundation\StreamedResponse;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
+use Illuminate\Http\Request;
+
+
+/**
+ * This class controls file related actions related
+ * to assets for the Snipe-IT Asset Management application.
+ *
+ * Based on the Assets/AssetFilesController by A. Gianotto <snipe@snipe.net>
+ *
+ * @version    v1.0
+ * @author [T. Scarsbrook] [<snipe@scarzybrook.co.uk>]
+ */
+class AssetFilesController extends Controller
+{
+    /**
+     * Accepts a POST to upload a file to the server.
+     *
+     * @param \App\Http\Requests\UploadFileRequest $request
+     * @param int $assetId
+     * @since [v6.0]
+     * @author [T. Scarsbrook] [<snipe@scarzybrook.co.uk>]
+     */
+    public function store(UploadFileRequest $request, $assetId = 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);
+        }
+
+        // Make sure we are allowed to update this asset
+        $this->authorize('update', $asset);
+
+	    if ($request->hasFile('file')) {
+            // If the file storage directory doesn't exist; create it
+            if (! Storage::exists('private_uploads/assets')) {
+                Storage::makeDirectory('private_uploads/assets', 775);
+            }
+
+            // Loop over the attached files and add them to the asset
+            foreach ($request->file('file') as $file) {
+                $file_name = $request->handleFile('private_uploads/assets/','hardware-'.$asset->id, $file);
+                
+                $asset->logUpload($file_name, e($request->get('notes')));
+            }
+
+            // All done - report success
+            return response()->json(Helper::formatStandardApiResponse('success', $asset, trans('admin/hardware/message.upload.success')));
+        }
+
+        // We only reach here if no files were included in the POST, so tell the user this
+        return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/hardware/message.upload.nofiles')), 500);
+    }
+
+    /**
+     * List the files for an asset.
+     *
+     * @param  int $assetId
+     * @since [v6.0]
+     * @author [T. Scarsbrook] [<snipe@scarzybrook.co.uk>]
+     */
+    public function list(Asset $asset, Request $request) : JsonResponse | array
+    {
+
+        $this->authorize('view', $asset);
+
+        $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'));
+        }
+
+        // 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());
+
+    }
+
+    /**
+     * Check for permissions and display the file.
+     *
+     * @param  int $assetId
+     * @param  int $fileId
+     * @return \Illuminate\Http\JsonResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
+     * @since [v6.0]
+     * @author [T. Scarsbrook] [<snipe@scarzybrook.co.uk>]
+     */
+    public function show(Asset $asset, $fileId = null) : JsonResponse | StreamedResponse | Storage | StorageHelper | BinaryFileResponse
+    {
+
+        // the asset is valid
+        if (isset($asset->id)) {
+            $this->authorize('view', $asset);
+
+            // Check that the file being requested exists for the asset
+            if (! $log = Actionlog::whereNotNull('filename')->where('item_id', $asset->id)->find($fileId)) {
+                return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/hardware/message.download.no_match', ['id' => $fileId])), 404);
+            }
+
+	    // Form the full filename with path
+            $file = 'private_uploads/assets/'.$log->filename;
+            Log::debug('Checking for '.$file);
+
+            if ($log->action_type == 'audit') {
+                $file = 'private_uploads/audits/'.$log->filename;
+            }
+
+            // Check the file actually exists on the filesystem
+            if (! Storage::exists($file)) {
+                return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/hardware/message.download.does_not_exist', ['id' => $fileId])), 404);
+            }
+
+            if (request('inline') == 'true') {
+
+                $headers = [
+                    'Content-Disposition' => 'inline',
+                ];
+
+                return Storage::download($file, $log->filename, $headers);
+            }
+
+            return StorageHelper::downloader($file);
+        }
+
+        // Send back an error message
+        return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/hardware/message.download.error', ['id' => $fileId])), 500);
+    }
+
+    /**
+     * Delete the associated file
+     *
+     * @param  int $assetId
+     * @param  int $fileId
+     * @since [v6.0]
+     * @author [T. Scarsbrook] [<snipe@scarzybrook.co.uk>]
+     */
+    public function destroy(Asset $asset, $fileId = null) : JsonResponse
+    {
+
+        $rel_path = 'private_uploads/assets';
+
+        // the asset is valid
+        if (isset($asset->id)) {
+            $this->authorize('update', $asset);
+
+            // 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
+                $log->delete();
+
+                // All deleting done - notify the user of success
+                return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/hardware/message.deletefile.success')), 200);
+            }
+
+            // The file doesn't seem to really exist, so report an error
+            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/hardware/message.deletefile.error')), 500);
+        }
+
+        return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/hardware/message.deletefile.error')), 500);
+    }
+}
--- a/app/Http/Controllers/Api/AssetMaintenancesController.php
+++ b/app/Http/Controllers/Api/AssetMaintenancesController.php
@@ -4,11 +4,11 @@ namespace App\Http\Controllers\Api;

 use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
-use App\Http\Requests\ImageUploadRequest;
-use App\Http\Transformers\MaintenancesTransformer;
+use App\Http\Transformers\AssetMaintenancesTransformer;
 use App\Models\Asset;
-use App\Models\Maintenance;
+use App\Models\AssetMaintenance;
 use App\Models\Company;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Http\Request;
 use Illuminate\Http\JsonResponse;

@@ -18,13 +18,13 @@ use Illuminate\Http\JsonResponse;
 *
 * @version    v2.0
 */
-class MaintenancesController extends Controller
+class AssetMaintenancesController extends Controller
 {

    /**
     *  Generates the JSON response for asset maintenances listing view.
     *
-     * @see MaintenancesController::getIndex() method that generates view
+     * @see AssetMaintenancesController::getIndex() method that generates view
     * @author  Vincent Sposato <vincent.sposato@gmail.com>
     * @version v1.0
     * @since [v1.8]
@@ -33,7 +33,7 @@ class MaintenancesController extends Controller
    {
        $this->authorize('view', Asset::class);

-        $maintenances = Maintenance::select('maintenances.*')
+        $maintenances = AssetMaintenance::select('asset_maintenances.*')
            ->with('asset', 'asset.model', 'asset.location', 'asset.defaultLoc', 'supplier', 'asset.company',  'asset.assetstatus', 'adminuser');

        if ($request->filled('search')) {
@@ -45,11 +45,11 @@ class MaintenancesController extends Controller
        }

        if ($request->filled('supplier_id')) {
-            $maintenances->where('maintenances.supplier_id', '=', $request->input('supplier_id'));
+            $maintenances->where('asset_maintenances.supplier_id', '=', $request->input('supplier_id'));
        }

        if ($request->filled('created_by')) {
-            $maintenances->where('maintenances.created_by', '=', $request->input('created_by'));
+            $maintenances->where('asset_maintenances.created_by', '=', $request->input('created_by'));
        }

        if ($request->filled('asset_maintenance_type')) {
@@ -63,7 +63,7 @@ class MaintenancesController extends Controller

        $allowed_columns = [
                                'id',
-                                'name',
+                                'title',
                                'asset_maintenance_time',
                                'asset_maintenance_type',
                                'cost',
@@ -75,7 +75,6 @@ class MaintenancesController extends Controller
                                'serial',
                                'created_by',
                                'supplier',
-                                'location',
                                'is_warranty',
                                'status_label',
                            ];
@@ -99,9 +98,6 @@ class MaintenancesController extends Controller
            case 'serial':
                $maintenances = $maintenances->OrderByAssetSerial($order);
                break;
-            case 'location':
-                $maintenances = $maintenances->OrderLocationName($order);
-                break;
            case 'status_label':
                $maintenances = $maintenances->OrderStatusName($order);
                break;
@@ -112,7 +108,7 @@ class MaintenancesController extends Controller

        $total = $maintenances->count();
        $maintenances = $maintenances->skip($offset)->take($limit)->get();
-        return (new MaintenancesTransformer())->transformMaintenances($maintenances, $total);
+        return (new AssetMaintenancesTransformer())->transformAssetMaintenances($maintenances, $total);


    }
@@ -121,23 +117,22 @@ class MaintenancesController extends Controller
    /**
     *  Validates and stores the new asset maintenance
     *
-     * @see MaintenancesController::getCreate() method for the form
+     * @see AssetMaintenancesController::getCreate() method for the form
     * @author  Vincent Sposato <vincent.sposato@gmail.com>
     * @version v1.0
     * @since [v1.8]
     */
-    public function store(ImageUploadRequest $request) : JsonResponse | array
+    public function store(Request $request) : JsonResponse | array
    {
        $this->authorize('update', Asset::class);
-
        // create a new model instance
-        $maintenance = new Maintenance();
+        $maintenance = new AssetMaintenance();
        $maintenance->fill($request->all());
        $maintenance->created_by = auth()->id();
-        $maintenance = $request->handleImages($maintenance);
+
        // Was the asset maintenance created?
        if ($maintenance->save()) {
-            return response()->json(Helper::formatStandardApiResponse('success', $maintenance, trans('admin/maintenances/message.create.success')));
+            return response()->json(Helper::formatStandardApiResponse('success', $maintenance, trans('admin/asset_maintenances/message.create.success')));

        }

@@ -158,11 +153,11 @@ class MaintenancesController extends Controller
    {
        $this->authorize('update', Asset::class);

-        if ($maintenance = Maintenance::with('asset')->find($id)) {
+        if ($maintenance = AssetMaintenance::with('asset')->find($id)) {

            // Can this user manage this asset?
            if (! Company::isCurrentUserHasAccess($maintenance->asset)) {
-                return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.action_permission_denied', ['item_type' => trans('admin/maintenances/general.maintenance'), 'id' => $id, 'action' => trans('general.edit')])));
+                return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.action_permission_denied', ['item_type' => trans('admin/asset_maintenances/general.maintenance'), 'id' => $id, 'action' => trans('general.edit')])));
            }

            // The asset this miantenance is attached to is not valid or has been deleted
@@ -173,13 +168,13 @@ class MaintenancesController extends Controller
            $maintenance->fill($request->all());

            if ($maintenance->save()) {
-                return response()->json(Helper::formatStandardApiResponse('success', $maintenance, trans('admin/maintenances/message.edit.success')));
+                return response()->json(Helper::formatStandardApiResponse('success', $maintenance, trans('admin/asset_maintenances/message.edit.success')));
            }

            return response()->json(Helper::formatStandardApiResponse('error', null, $maintenance->getErrors()));
        }

-        return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.item_not_found', ['item_type' => trans('admin/maintenances/general.maintenance'), 'id' => $id])));
+        return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.item_not_found', ['item_type' => trans('admin/asset_maintenances/general.maintenance'), 'id' => $id])));

    }

@@ -187,20 +182,20 @@ class MaintenancesController extends Controller
     *  Delete an asset maintenance
     *
     * @author  A. Gianotto <snipe@snipe.net>
-     * @param int $maintenanceId
+     * @param int $assetMaintenanceId
     * @version v1.0
     * @since [v4.0]
     */
-    public function destroy($maintenanceId) : JsonResponse | array
+    public function destroy($assetMaintenanceId) : JsonResponse | array
    {
        $this->authorize('update', Asset::class);
        // Check if the asset maintenance exists

-        $maintenance = Maintenance::findOrFail($maintenanceId);
+        $assetMaintenance = AssetMaintenance::findOrFail($assetMaintenanceId);

-        $maintenance->delete();
+        $assetMaintenance->delete();

-        return response()->json(Helper::formatStandardApiResponse('success', $maintenance, trans('admin/maintenances/message.delete.success')));
+        return response()->json(Helper::formatStandardApiResponse('success', $assetMaintenance, trans('admin/asset_maintenances/message.delete.success')));


    }
@@ -209,19 +204,19 @@ class MaintenancesController extends Controller
     *  View an asset maintenance
     *
     * @author  A. Gianotto <snipe@snipe.net>
-     * @param int $maintenanceId
+     * @param int $assetMaintenanceId
     * @version v1.0
     * @since [v4.0]
     */
-    public function show($maintenanceId) : JsonResponse | array
+    public function show($assetMaintenanceId) : JsonResponse | array
    {
        $this->authorize('view', Asset::class);
-        $maintenance = Maintenance::findOrFail($maintenanceId);
-        if (! Company::isCurrentUserHasAccess($maintenance->asset)) {
+        $assetMaintenance = AssetMaintenance::findOrFail($assetMaintenanceId);
+        if (! Company::isCurrentUserHasAccess($assetMaintenance->asset)) {
            return response()->json(Helper::formatStandardApiResponse('error', null, 'You cannot view a maintenance for that asset'));
        }

-        return (new MaintenancesTransformer())->transformMaintenance($maintenance);
+        return (new AssetMaintenancesTransformer())->transformAssetMaintenance($assetMaintenance);

    }
 }
--- a/app/Http/Controllers/Api/AssetModelFilesController.php
+++ b/app/Http/Controllers/Api/AssetModelFilesController.php
@@ -0,0 +1,179 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use App\Helpers\StorageHelper;
+use Illuminate\Support\Facades\Storage;
+use App\Helpers\Helper;
+use App\Http\Controllers\Controller;
+use App\Models\AssetModel;
+use App\Models\Actionlog;
+use App\Http\Requests\UploadFileRequest;
+use App\Http\Transformers\AssetModelsTransformer;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\Log;
+use Symfony\Component\HttpFoundation\StreamedResponse;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
+
+
+/**
+ * This class controls file related actions related
+ * to assets for the Snipe-IT Asset Management application.
+ *
+ * Based on the Assets/AssetFilesController by A. Gianotto <snipe@snipe.net>
+ *
+ * @version    v1.0
+ * @author [T. Scarsbrook] [<snipe@scarzybrook.co.uk>]
+ */
+class AssetModelFilesController extends Controller
+{
+    /**
+     * Accepts a POST to upload a file to the server.
+     *
+     * @param \App\Http\Requests\UploadFileRequest $request
+     * @param int $assetModelId
+     * @since [v7.0.12]
+     * @author [r-xyz]
+     */
+    public function store(UploadFileRequest $request, $assetModelId = null) : JsonResponse
+    {
+        // Start by checking if the asset being acted upon exists
+        if (! $assetModel = AssetModel::find($assetModelId)) {
+            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/models/message.does_not_exist')), 404);
+        }
+
+        // Make sure we are allowed to update this asset
+        $this->authorize('update', $assetModel);
+
+            if ($request->hasFile('file')) {
+            // If the file storage directory doesn't exist; create it
+            if (! Storage::exists('private_uploads/assetmodels')) {
+                Storage::makeDirectory('private_uploads/assetmodels', 775);
+            }
+
+            // Loop over the attached files and add them to the asset
+            foreach ($request->file('file') as $file) {
+                $file_name = $request->handleFile('private_uploads/assetmodels/','model-'.$assetModel->id, $file);
+                
+                $assetModel->logUpload($file_name, e($request->get('notes')));
+            }
+
+            // All done - report success
+            return response()->json(Helper::formatStandardApiResponse('success', $assetModel, trans('admin/models/message.upload.success')));
+        }
+
+        // We only reach here if no files were included in the POST, so tell the user this
+        return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/models/message.upload.nofiles')), 500);
+    }
+
+    /**
+     * List the files for an asset.
+     *
+     * @param  int $assetmodel
+     * @since [v7.0.12]
+     * @author [r-xyz]
+     */
+    public function list($assetmodel_id) : JsonResponse | array
+    {
+            $assetmodel = AssetModel::with('uploads')->find($assetmodel_id);
+            $this->authorize('view', $assetmodel);
+            return (new AssetModelsTransformer)->transformAssetModelFiles($assetmodel, $assetmodel->uploads()->count());
+    }
+
+    /**
+     * Check for permissions and display the file.
+     *
+     * @param  int $assetModelId
+     * @param  int $fileId
+     * @return \Illuminate\Http\JsonResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
+     * @since [v7.0.12]
+     * @author [r-xyz]
+     */
+    public function show($assetModelId = null, $fileId = null) : JsonResponse | StreamedResponse | Storage | StorageHelper | BinaryFileResponse
+    {
+        // Start by checking if the asset being acted upon exists
+        if (! $assetModel = AssetModel::find($assetModelId)) {
+            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/models/message.does_not_exist')), 404);
+        }
+
+        // the asset is valid
+        if (isset($assetModel->id)) {
+            $this->authorize('view', $assetModel);
+
+            // Check that the file being requested exists for the asset
+            if (! $log = Actionlog::whereNotNull('filename')->where('item_id', $assetModel->id)->find($fileId)) {
+                return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/models/message.download.no_match', ['id' => $fileId])), 404);
+            }
+
+            // Form the full filename with path
+            $file = 'private_uploads/assetmodels/'.$log->filename;
+            Log::debug('Checking for '.$file);
+
+            if ($log->action_type == 'audit') {
+                $file = 'private_uploads/audits/'.$log->filename;
+            }
+
+            // Check the file actually exists on the filesystem
+            if (! Storage::exists($file)) {
+                return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/models/message.download.does_not_exist', ['id' => $fileId])), 404);
+            }
+
+            if (request('inline') == 'true') {
+
+                $headers = [
+                    'Content-Disposition' => 'inline',
+                ];
+
+                return Storage::download($file, $log->filename, $headers);
+            }
+
+            return StorageHelper::downloader($file);
+        }
+
+        // Send back an error message
+        return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/models/message.download.error', ['id' => $fileId])), 500);
+    }
+
+    /**
+     * Delete the associated file
+     *
+     * @param  int $assetModelId
+     * @param  int $fileId
+     * @since [v7.0.12]
+     * @author [r-xyz]
+     */
+    public function destroy($assetModelId = null, $fileId = null) : JsonResponse
+    {
+        // Start by checking if the asset being acted upon exists
+        if (! $assetModel = AssetModel::find($assetModelId)) {
+            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/models/message.does_not_exist')), 404);
+        }
+
+        $rel_path = 'private_uploads/assetmodels';
+
+        // the asset is valid
+        if (isset($assetModel->id)) {
+            $this->authorize('update', $assetModel);
+
+            // 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
+                $log->delete();
+
+                // All deleting done - notify the user of success
+                return response()->json(Helper::formatStandardApiResponse('success', null, trans('admin/models/message.deletefile.success')), 200);
+            }
+
+            // The file doesn't seem to really exist, so report an error
+            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/models/message.deletefile.error')), 500);
+        }
+
+        return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/models/message.deletefile.error')), 500);
+    }
+}
--- a/app/Http/Controllers/Api/AssetModelsController.php
+++ b/app/Http/Controllers/Api/AssetModelsController.php
@@ -85,12 +85,6 @@ class AssetModelsController extends Controller
            $assetmodels = $assetmodels->where('models.model_number', '=', $request->input('model_number'));
        }

-        if ($request->input('requestable') == 'true') {
-            $assetmodels = $assetmodels->where('models.requestable', '=', '1');
-        } elseif ($request->input('requestable') == 'false') {
-            $assetmodels = $assetmodels->where('models.requestable', '=', '0');
-        }        
-
        if ($request->filled('notes')) {
            $assetmodels = $assetmodels->where('models.notes', '=', $request->input('notes'));
        }
@@ -154,7 +148,7 @@ class AssetModelsController extends Controller
        $assetmodel = $request->handleImages($assetmodel);

        if ($assetmodel->save()) {
-            return response()->json(Helper::formatStandardApiResponse('success', (new AssetModelsTransformer)->transformAssetModel($assetmodel), trans('admin/models/message.create.success')));
+            return response()->json(Helper::formatStandardApiResponse('success', $assetmodel, trans('admin/models/message.create.success')));
        }
        return response()->json(Helper::formatStandardApiResponse('error', null, $assetmodel->getErrors()));

@@ -222,7 +216,7 @@ class AssetModelsController extends Controller


        if ($assetmodel->save()) {
-            return response()->json(Helper::formatStandardApiResponse('success', (new AssetModelsTransformer)->transformAssetModel($assetmodel), trans('admin/models/message.update.success')));
+            return response()->json(Helper::formatStandardApiResponse('success', $assetmodel, trans('admin/models/message.update.success')));
        }

        return response()->json(Helper::formatStandardApiResponse('error', null, $assetmodel->getErrors()));
--- a/app/Http/Controllers/Api/AssetsController.php
+++ b/app/Http/Controllers/Api/AssetsController.php
@@ -114,23 +114,17 @@ class AssetsController extends Controller
            'byod',
            'asset_eol_date',
            'requestable',
-            'jobtitle',
        ];

-        $all_custom_fields = CustomField::all(); //used as a 'cache' of custom fields throughout this page load
-
-        foreach ($all_custom_fields as $field) {
-            $allowed_columns[] = $field->db_column_name();
-        }
-
        $filter = [];

        if ($request->filled('filter')) {
            $filter = json_decode($request->input('filter'), true);
+        }

-            $filter = array_filter($filter, function ($key) use ($allowed_columns) {
-                return in_array($key, $allowed_columns);
-            }, ARRAY_FILTER_USE_KEY);
+        $all_custom_fields = CustomField::all(); //used as a 'cache' of custom fields throughout this page load
+        foreach ($all_custom_fields as $field) {
+            $allowed_columns[] = $field->db_column_name();
        }

        $assets = Asset::select('assets.*')
@@ -146,7 +140,6 @@ class AssetsController extends Controller
                'model.category',
                'model.manufacturer',
                'model.fieldset',
-                'model.depreciation',
                'supplier'
            ); // it might be tempting to add 'assetlog' here, but don't. It blows up update-heavy users.

@@ -307,14 +300,8 @@ class AssetsController extends Controller
        }

        if ($request->filled('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')) {
            $assets->InCategory($request->input('category_id'));
@@ -402,9 +389,6 @@ class AssetsController extends Controller
            case 'assigned_to':
                $assets->OrderAssigned($order);
                break;
-            case 'jobtitle':
-                $assets->OrderByJobTitle($order);
-                break;
            case 'created_by':
                $assets->OrderByCreatedByName($order);
                break;
@@ -584,12 +568,7 @@ class AssetsController extends Controller
            'assets.assigned_to',
            'assets.assigned_type',
            'assets.status_id',
-        ])->with('model', 'assetstatus', 'assignedTo')
-            ->NotArchived();
-
-        if ((Setting::getSettings()->full_multiple_companies_support=='1') &&  ($request->filled('companyId'))) {
-            $assets->where('assets.company_id', $request->input('companyId'));
-        }
+        ])->with('model', 'assetstatus', 'assignedTo')->NotArchived();

        if ($request->filled('assetStatusType') && $request->input('assetStatusType') === 'RTD') {
            $assets = $assets->RTD();
@@ -599,6 +578,7 @@ 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.
@@ -610,7 +590,7 @@ class AssetsController extends Controller
            $asset->use_text = $asset->present()->fullName;

            if (($asset->checkedOutToUser()) && ($asset->assigned)) {
-                $asset->use_text .= ' → ' . $asset->assigned->display_name;
+                $asset->use_text .= ' → ' . $asset->assigned->getFullNameAttribute();
            }


@@ -711,9 +691,7 @@ class AssetsController extends Controller

            return response()->json(Helper::formatStandardApiResponse('success', $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('success', (new AssetsTransformer)->transformAsset($asset), trans('admin/hardware/message.create.success')));
        }

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

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

            // Validate the rest of the data before we turn off the event dispatcher
            if ($asset->isInvalid()) {
-                return response()->json(Helper::formatStandardApiResponse('error', ['asset_tag' => $asset->asset_tag],  $asset->getErrors()));
+                return response()->json(Helper::formatStandardApiResponse('error', null,  $asset->getErrors()));
            }


--- 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', 'models as models_count');
+            ->withCount('accessories as accessories_count', 'consumables as consumables_count', 'components as components_count', 'licenses as licenses_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', 'models as models_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')->findOrFail($id);

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

        $companies = Company::withCount(['assets as assets_count'  => function ($query) {
            $query->AssetsForShow();
-        }])
-            ->with('adminuser')
-            ->withCount('licenses as licenses_count', 'accessories as accessories_count', 'consumables as consumables_count', 'components as components_count', 'users as users_count');
-
+        }])->withCount('licenses as licenses_count', 'accessories as accessories_count', 'consumables as consumables_count', 'components as components_count', 'users as users_count');

        if ($request->filled('search')) {
            $companies->TextSearch($request->input('search'));
@@ -122,7 +119,6 @@ class CompaniesController extends Controller
    {
        $this->authorize('view', Company::class);
        $company = Company::findOrFail($id);
-        $this->authorize('view', $company);
        return (new CompaniesTransformer)->transformCompany($company);

    }
@@ -140,7 +136,6 @@ class CompaniesController extends Controller
    {
        $this->authorize('update', Company::class);
        $company = Company::findOrFail($id);
-        $this->authorize('update', $company);
        $company->fill($request->all());
        $company = $request->handleImages($company);

@@ -193,7 +188,6 @@ class CompaniesController extends Controller
            'companies.image',
        ]);

-
        if ($request->filled('search')) {
            $companies = $companies->where('companies.name', 'LIKE', '%'.$request->get('search').'%');
        }
--- a/app/Http/Controllers/Api/ConsumablesController.php
+++ b/app/Http/Controllers/Api/ConsumablesController.php
@@ -228,16 +228,11 @@ class ConsumablesController extends Controller
        foreach ($consumable->consumableAssignments as $consumable_assignment) {
            $rows[] = [
                'avatar' => ($consumable_assignment->user) ? e($consumable_assignment->user->present()->gravatar) : '',
-                'user' => ($consumable_assignment->user) ? [
-                    'id' => (int) $consumable_assignment->user->id,
-                    'name'=> e($consumable_assignment->user->display_name),
-                ] : null,
+                'name' => ($consumable_assignment->user) ? $consumable_assignment->user->present()->nameUrl() : 'Deleted User',
                'created_at' => Helper::getFormattedDateObject($consumable_assignment->created_at, 'datetime'),
                'note' => ($consumable_assignment->note) ? e($consumable_assignment->note) : null,
-                'created_by' => ($consumable_assignment->adminuser) ? [
-                    'id' => (int) $consumable_assignment->adminuser->id,
-                    'name'=> e($consumable_assignment->adminuser->display_name),
-                ] : null,
+                'admin' => ($consumable_assignment->adminuser) ? $consumable_assignment->adminuser->present()->nameUrl() : null, // legacy, so we don't change the shape of the response
+                'created_by' => ($consumable_assignment->adminuser) ? $consumable_assignment->adminuser->present()->nameUrl() : null,
            ];
        }

--- 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 = json_encode(config('permissions'));
+        $permissions = config('permissions');
        $groupPermissions = Helper::selectedPermissionsArray($permissions, $permissions);

        $group->name = $request->input('name');
--- a/app/Http/Controllers/Api/ImportController.php
+++ b/app/Http/Controllers/Api/ImportController.php
@@ -195,7 +195,7 @@ class ImportController extends Controller
        // Run a backup immediately before processing
        if ($request->get('run-backup')) {
            Log::debug('Backup manually requested via importer');
-            Artisan::call('snipeit:backup', ['--filename' => 'pre-import-backup-'.date('Y-m-d-H-i-s')]);
+            Artisan::call('snipeit:backup', ['--filename' => 'pre-import-backup-'.date('Y-m-d-H:i:s')]);
        } else {
            Log::debug('NO BACKUP requested via importer');
        }
@@ -234,15 +234,6 @@ class ImportController extends Controller
            case 'location':
                $redirectTo = 'locations.index';
                break;
-            case 'supplier':
-                $redirectTo = 'suppliers.index';
-                break;
-            case 'manufacturer':
-                $redirectTo = 'manufacturers.index';
-                break;
-            case 'category':
-                $redirectTo = 'categories.index';
-                break;
        }

        if ($errors) { //Failure
--- a/app/Http/Controllers/Api/LicenseSeatsController.php
+++ b/app/Http/Controllers/Api/LicenseSeatsController.php
@@ -29,21 +29,12 @@ class LicenseSeatsController extends Controller
            $seats = LicenseSeat::with('license', 'user', 'asset', 'user.department')
                ->where('license_seats.license_id', $licenseId);

-            if ($request->input('status') == 'available') {
-                $seats->whereNull('license_seats.assigned_to');
-            }
-
-            if ($request->input('status') == 'assigned') {
-                $seats->ByAssigned();
-            }
-
-
            $order = $request->input('order') === 'asc' ? 'asc' : 'desc';

            if ($request->input('sort') == 'department') {
                $seats->OrderDepartments($order);
            } else {
-                $seats->orderBy('updated_at', $order);
+                $seats->orderBy('id', $order);
            }

            $total = $seats->count();
--- a/app/Http/Controllers/Api/LocationsController.php
+++ b/app/Http/Controllers/Api/LocationsController.php
@@ -87,8 +87,7 @@ class LocationsController extends Controller
            ->withCount('accessories as accessories_count')
            ->withCount('rtd_assets as rtd_assets_count')
            ->withCount('children as children_count')
-            ->withCount('users as users_count')
-            ->with('adminuser');
+            ->withCount('users as users_count');

        // Only scope locations if the setting is enabled
        if (Setting::getSettings()->scope_locations_fmcs) {
@@ -219,7 +218,6 @@ class LocationsController extends Controller
                'locations.updated_at',
                'locations.image',
                'locations.currency',
-                'locations.company_id',
                'locations.notes',
            ])
            ->withCount('assignedAssets as assigned_assets_count')
--- a/app/Http/Controllers/Api/NotesController.php
+++ b/app/Http/Controllers/Api/NotesController.php
@@ -1,95 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Api;
-
-use App\Helpers\Helper;
-use App\Http\Controllers\Controller;
-use App\Models\Actionlog;
-use App\Models\Asset;
-use Illuminate\Database\Eloquent\ModelNotFoundException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Log;
-
-/**
- * This class controls all API actions related to notes for
- * the Snipe-IT Asset Management application.
- */
-class NotesController extends Controller
-{
-    /**
-     * Retrieve a list of manual notes (action logs) for a given asset.
-     *
-     * Checks authorization to view assets, attempts to find the asset by ID,
-     * and fetches related action log entries of type 'note added', including
-     * user information for each note. Returns a JSON response with the notes or errors.
-     *
-     * @param  \Illuminate\Http\Request  $request  The incoming HTTP request.
-     * @param  Asset  $asset  The ID of the asset whose notes to retrieve.
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function index(Asset $asset): JsonResponse
-    {
-        $this->authorize('view', $asset);
-
-        // Get the manual notes for the asset
-        $notes = ActionLog::with('user:id,username')
-            ->where('item_type', Asset::class)
-            ->where('item_id', $asset->id)
-            ->where('action_type', 'note added')
-            ->orderBy('created_at', 'desc')
-            ->get(['id', 'created_at', 'note', 'created_by', 'item_id', 'item_type', 'action_type', 'target_id', 'target_type']);
-
-        $notesArray = $notes->map(function ($note) {
-            return [
-                'id' => $note->id,
-                'created_at' => $note->created_at,
-                'note' => $note->note,
-                'created_by' => $note->created_by,
-                'username' => $note->user?->username, // adding the username
-                'item_id' => $note->item_id,
-                'item_type' => $note->item_type,
-                'action_type' => $note->action_type,
-            ];
-        });
-
-        // Return a success response
-        return response()->json(Helper::formatStandardApiResponse('success', ['notes' => $notesArray, 'asset_id' => $asset->id]));
-    }
-    
-    /**
-     * Store a manual note on a specified asset and log the action.
-     *
-     * Checks authorization for updating assets, validates the presence of the 'note',
-     * attempts to find the asset by ID, and creates a new ActionLog entry if successful.
-     * Returns JSON responses indicating success or failure with appropriate HTTP status codes.
-     *
-     * @param  \Illuminate\Http\Request  $request  The incoming HTTP request containing the 'note'.
-     * @param  Asset  $asset  The ID of the asset to attach the note to.
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function store(Request $request, Asset $asset): JsonResponse
-    {
-        $this->authorize('update', $asset);
-
-        if ($request->input('note', '') == '') {
-            return response()->json(Helper::formatStandardApiResponse('error', null, trans('validation.required', ['attribute' => 'note'])), 422);
-        }
-
-        // Create the note
-        $logaction = new ActionLog();
-        $logaction->item_type = get_class($asset);
-        $logaction->created_by = Auth::id();
-        $logaction->item_id = $asset->id;
-        $logaction->note = $request->input('note', '');
-
-        if ($logaction->logaction('note added')) {
-            // Return a success response
-            return response()->json(Helper::formatStandardApiResponse('success', ['note' => $logaction->note, 'item_id' => $asset->id], trans('general.note_added')));
-        }
-
-        // Return an error response if something went wrong
-        return response()->json(Helper::formatStandardApiResponse('error', null, 'Something went wrong'), 500);
-    }
-}
--- a/app/Http/Controllers/Api/ProfileController.php
+++ b/app/Http/Controllers/Api/ProfileController.php
@@ -4,19 +4,15 @@ namespace App\Http\Controllers\Api;

 use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
-use App\Http\Transformers\ProfileTransformer;
 use App\Models\CheckoutRequest;
-use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Response;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Storage;
 use Laravel\Passport\TokenRepository;
 use Illuminate\Contracts\Validation\Factory as ValidationFactory;
 use Illuminate\Support\Facades\Gate;
 use App\Models\CustomField;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Http\JsonResponse;
-use Symfony\Component\HttpFoundation\BinaryFileResponse;

 class ProfileController extends Controller
 {
@@ -171,22 +167,6 @@ class ProfileController extends Controller

    }

-    /**
-     * Display the EULAs accepted by the user.
-     *
-     *  @param \App\Http\Transformers\ActionlogsTransformer $transformer
-     *  @return \Illuminate\Http\JsonResponse
-     *@since [v8.1.16]
-     * @author [Godfrey Martinez] [<gmartinez@grokability.com>]
-     */
-    public function eulas(ProfileTransformer $transformer)
-    {
-        // Only return this user's EULAs
-        $eulas = auth()->user()->eulas;
-        return response()->json(
-            $transformer->transformFiles($eulas, $eulas->count())
-        );
-    }


 }
--- a/app/Http/Controllers/Api/ReportsController.php
+++ b/app/Http/Controllers/Api/ReportsController.php
@@ -5,8 +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 App\Models\Location;
+use App\Models\User;
 use Illuminate\Http\Request;
 use Illuminate\Http\JsonResponse;

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

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

-
        if ($request->filled('search')) {
            $actionlogs = $actionlogs->TextSearch(e($request->input('search')));
        }

-        if (($request->filled('target_type')) && ($request->filled('target_id'))) {
-            $actionlogs = $actionlogs->where('target_id', '=', $request->input('target_id'))
-                ->where('target_type', '=', 'App\\Models\\'.ucwords($request->input('target_type')));
+
+        // If we want allll the logs
+        if (($request->filled('id')) && ($request->filled('type'))) {
+            $actionlogs = $actionlogs->ByTargetOrItem($request->input('id'), $request->input('type'));
        }

+        // We've passed a target
+        if (($request->filled('target_type')) && ($request->filled('target_id'))) {
+            $actionlogs = $actionlogs->where('target_id', '=', $request->input('target_id'))
+                ->where('target_type', '=', 'App\\Models\\' . ucwords($request->input('target_type')));
+        }
+
+        // We've passed an item
        if (($request->filled('item_type')) && ($request->filled('item_id'))) {
-            $actionlogs = $actionlogs->where(function($query) use ($request)
-            {
-                $query->where('item_id', '=', $request->input('item_id'))
-                ->where('item_type', '=', 'App\\Models\\'.ucwords($request->input('item_type')))
-                ->orWhere(function($query) use ($request)
-                {
-                    $query->where('target_id', '=', $request->input('item_id'))
-                    ->where('target_type', '=', 'App\\Models\\'.ucwords($request->input('item_type')));
-                });
-            });
+            $actionlogs = $actionlogs->where('item_id', '=', $request->input('item_id'))
+                ->where('item_type', '=', 'App\\Models\\'.ucwords($request->input('item_type')));
        }

        if ($request->filled('action_type')) {
--- a/app/Http/Controllers/Api/SettingsController.php
+++ b/app/Http/Controllers/Api/SettingsController.php
@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Api;

 use App\Helpers\Helper;
+use App\Helpers\StorageHelper;
 use App\Http\Transformers\DatatablesTransformer;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
@@ -50,22 +51,10 @@ class SettingsController extends Controller
                })->slice(0, 10)->map(function ($item) use ($settings) {
                    return (object) [
                        'username'        => $item[$settings['ldap_username_field']][0] ?? null,
-                        'display_name'    => $item[$settings['ldap_display_name']][0] ?? null,
                        'employee_number' => $item[$settings['ldap_emp_num']][0] ?? null,
                        'lastname'        => $item[$settings['ldap_lname_field']][0] ?? null,
                        'firstname'       => $item[$settings['ldap_fname_field']][0] ?? null,
                        'email'           => $item[$settings['ldap_email']][0] ?? null,
-                        'phone'           => $item[$settings['ldap_phone_field']][0] ?? null,
-                        'mobile'          => $item[$settings['ldap_mobile']][0] ?? null,
-                        'jobtitle'        => $item[$settings['ldap_jobtitle']][0] ?? null,
-                        'department'      => $item[$settings['ldap_department']][0] ?? null,
-                        'manager'         => $item[$settings['ldap_manager']][0] ?? null,
-                        'address'         => $item[$settings['ldap_address']][0] ?? null,
-                        'city'            => $item[$settings['ldap_city']][0] ?? null,
-                        'state'           => $item[$settings['ldap_state']][0] ?? null,
-                        'zip'             => $item[$settings['ldap_zip']][0] ?? null,
-                        'country'         => $item[$settings['ldap_country']][0] ?? null,
-                        'location'        => $item[$settings['ldap_location']][0] ?? null,
                    ];
                });
                if ($users->count() > 0) {
@@ -89,7 +78,7 @@ class SettingsController extends Controller
            }
        } catch (\Exception $e) {
            Log::debug('Connection failed but we cannot debug it any further on our end.');
-            return response()->json(['message' => $e->getMessage()], 400);
+            return response()->json(['message' => $e->getMessage()], 500);
        }


@@ -161,11 +150,8 @@ class SettingsController extends Controller
        if (!config('app.lock_passwords')) {
            try {
                Notification::send(Setting::first(), new MailTest());
-                Log::debug('Attempting to sending to '.config('mail.reply_to.address'));
                return response()->json(['message' => 'Mail sent to '.config('mail.reply_to.address')], 200);
            } catch (\Exception $e) {
-                Log::error('Mail sent error using '.config('mail.reply_to.address') .': '. $e->getMessage());
-                Log::debug($e);
                return response()->json(['message' => $e->getMessage()], 500);
            }
        }
--- a/app/Http/Controllers/Api/SuppliersController.php
+++ b/app/Http/Controllers/Api/SuppliersController.php
@@ -24,15 +24,10 @@ class SuppliersController extends Controller
    public function index(Request $request): array
    {
        $this->authorize('view', Supplier::class);
-        $allowed_columns = [
-            'id',
+        $allowed_columns = ['
+            id',
            'name',
            'address',
-            'address2',
-            'city',
-            'state',
-            'country',
-            'zip',
            'phone',
            'contact',
            'fax',
@@ -44,24 +39,21 @@ class SuppliersController extends Controller
            'components_count',
            'consumables_count',
            'url',
-            'notes',
        ];
        
        $suppliers = Supplier::select(
-                ['id', 'name', 'address', 'address2', 'city', 'state', 'country', 'fax', 'phone', 'email', 'contact', 'created_at', 'created_by', 'updated_at', 'deleted_at', 'image', 'notes', 'url', 'zip'])
+                ['id', 'name', 'address', 'address2', 'city', 'state', 'country', 'fax', 'phone', 'email', 'contact', 'created_at', 'updated_at', 'deleted_at', 'image', 'notes', 'url'])
                    ->withCount('assets as assets_count')
                    ->withCount('licenses as licenses_count')
                    ->withCount('accessories as accessories_count')
                    ->withCount('components as components_count')
-                    ->withCount('consumables as consumables_count')
-                    ->with('adminuser');
+                    ->withCount('consumables as consumables_count');


        if ($request->filled('search')) {
-            $suppliers->TextSearch($request->input('search'));
+            $suppliers = $suppliers->TextSearch($request->input('search'));
        }

-
        if ($request->filled('name')) {
            $suppliers->where('name', '=', $request->input('name'));
        }
@@ -108,15 +100,7 @@ class SuppliersController extends Controller

        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
        $sort = in_array($request->input('sort'), $allowed_columns) ? $request->input('sort') : 'created_at';
-
-        switch ($request->input('sort')) {
-            case 'created_by':
-                $suppliers->OrderByCreatedByName($order);
-                break;
-            default:
        $suppliers->orderBy($sort, $order);
-                break;
-        }

        $total = $suppliers->count();
        $suppliers = $suppliers->skip($offset)->take($limit)->get();
@@ -194,7 +178,7 @@ class SuppliersController extends Controller
    public function destroy($id) : JsonResponse
    {
        $this->authorize('delete', Supplier::class);
-        $supplier = Supplier::with('maintenances', 'assets', 'licenses')->withCount('maintenances as maintenances_count', 'assets as assets_count', 'licenses as licenses_count')->findOrFail($id);
+        $supplier = Supplier::with('asset_maintenances', 'assets', 'licenses')->withCount('asset_maintenances as asset_maintenances_count', 'assets as assets_count', 'licenses as licenses_count')->findOrFail($id);
        $this->authorize('delete', $supplier);


@@ -202,8 +186,8 @@ class SuppliersController extends Controller
            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/suppliers/message.delete.assoc_assets', ['asset_count' => (int) $supplier->assets_count])));
        }

-        if ($supplier->maintenances_count > 0) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/suppliers/message.delete.assoc_maintenances', ['maintenances_count' => $supplier->maintenances_count])));
+        if ($supplier->asset_maintenances_count > 0) {
+            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/suppliers/message.delete.assoc_maintenances', ['asset_maintenances_count' => $supplier->asset_maintenances_count])));
        }

        if ($supplier->licenses_count > 0) {
--- a/app/Http/Controllers/Api/UploadedFilesController.php
+++ b/app/Http/Controllers/Api/UploadedFilesController.php
@@ -1,220 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\Api;
-
-use App\Helpers\Helper;
-use App\Helpers\StorageHelper;
-use App\Http\Controllers\Controller;
-use App\Http\Requests\UploadFileRequest;
-use App\Http\Transformers\UploadedFilesTransformer;
-use App\Models\Actionlog;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Storage;
-use Symfony\Component\HttpFoundation\BinaryFileResponse;
-use Symfony\Component\HttpFoundation\StreamedResponse;
-
-
-class UploadedFilesController extends Controller
-{
-
-
-    /**
-     * List files for an object
-     *
-     * @param  \App\Http\Requests\UploadFileRequest $request
-     * @param  string                               $object_type the type of object to upload the file to
-     * @param  int                                  $id          the ID of the object to list files for
-     * @since  [v8.1.17]
-     * @author [A. Gianotto <snipe@snipe.net>]
-     */
-    public function index(Request $request, $object_type, $id) : JsonResponse | array
-    {
-
-        // Check the permissions to make sure the user can view the object
-        $object = self::$map_object_type[$object_type]::find($id);
-        $this->authorize('view', $object);
-
-        if (!$object) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.file_upload_status.invalid_object')));
-        }
-
-        // Columns allowed for sorting
-        $allowed_columns =
-            [
-                'id',
-                'filename',
-                'action_type',
-                'action_date',
-                'note',
-                'created_at',
-            ];
-
-
-        $uploads = Actionlog::select('action_logs.*')
-            ->whereNotNull('filename')
-            ->where('item_type', self::$map_object_type[$object_type])
-            ->where('item_id', $object->id)
-            ->where('action_type', '=', 'uploaded')
-            ->with('adminuser');
-
-        $offset = ($request->input('offset') > $uploads->count()) ? $uploads->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';
-
-        // Text search on action_logs fields
-        // We could use the normal Actionlogs text scope, but it's a very heavy query since it's searching across all relations
-        // and we generally won't need that here
-        if ($request->filled('search')) {
-
-            $uploads->where(
-                function ($query) use ($request) {
-                    $query->where('filename', 'LIKE', '%' . $request->input('search') . '%')
-                        ->orWhere('note', 'LIKE', '%' . $request->input('search') . '%');
-                }
-            );
-        }
-
-        $total = $uploads->count();
-        $uploads = $uploads->skip($offset)->take($limit)->orderBy($sort, $order)->get();
-
-        return (new UploadedFilesTransformer())->transformFiles($uploads, $total);
-    }
-
-
-    /**
-     * Accepts a POST to upload a file to the server.
-     *
-     * @param  \App\Http\Requests\UploadFileRequest $request
-     * @param  string                               $object_type the type of object to upload the file to
-     * @param  int                                  $id          the ID of the object to store so we can check permisisons
-     * @since  [v8.1.17]
-     * @author [A. Gianotto <snipe@snipe.net>]
-     */
-    public function store(UploadFileRequest $request, $object_type, $id) : JsonResponse
-    {
-
-        // Check the permissions to make sure the user can view the object
-        $object = self::$map_object_type[$object_type]::find($id);
-        $this->authorize('view', $object);
-
-        if (!$object) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.file_upload_status.invalid_object')));
-        }
-
-        // If the file storage directory doesn't exist, create it
-        if (! Storage::exists(self::$map_storage_path[$object_type])) {
-            Storage::makeDirectory(self::$map_storage_path[$object_type], 775);
-        }
-
-
-        if ($request->hasFile('file')) {
-            // Loop over the attached files and add them to the object
-            foreach ($request->file('file') as $file) {
-                $file_name = $request->handleFile(self::$map_storage_path[$object_type], self::$map_file_prefix[$object_type].'-'.$object->id, $file);
-                $files[] = $file_name;
-                $object->logUpload($file_name, $request->get('notes'));
-            }
-
-            $files = Actionlog::select('action_logs.*')->where('action_type', '=', 'uploaded')
-                ->where('item_type', '=', self::$map_object_type[$object_type])
-                ->where('item_id', '=', $id)->whereIn('filename', $files)
-                ->get();
-
-            return response()->json(Helper::formatStandardApiResponse('success', (new UploadedFilesTransformer())->transformFiles($files, count($files)), trans_choice('general.file_upload_status.upload.success',  count($files))));
-        }
-
-        // No files were submitted
-        return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.file_upload_status.nofiles')));
-    }
-
-
-
-    /**
-     * Check for permissions and display the file.
-     *
-     * @param  \App\Http\Requests\UploadFileRequest $request
-     * @param  string                               $object_type the type of object to upload the file to
-     * @param  int                                  $id          the ID of the object to delete from so we can check permisisons
-     * @param  $file_id     the ID of the file to delete from the action_logs table
-     * @since  [v8.1.17]
-     * @author [A. Gianotto <snipe@snipe.net>]
-     */
-    public function show($object_type, $id, $file_id) : JsonResponse | StreamedResponse | Storage | StorageHelper | BinaryFileResponse
-    {
-        // Check the permissions to make sure the user can view the object
-        $object = self::$map_object_type[$object_type]::find($id);
-        $this->authorize('view', $object);
-
-        if (!$object) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.file_upload_status.invalid_object')));
-        }
-
-
-        // Check that the file being requested exists for the object
-        if (! $log = Actionlog::whereNotNull('filename')->where('item_type', self::$map_object_type[$object_type])->where('item_id', $object->id)->find($file_id)
-        ) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.file_upload_status.invalid_id')), 200);
-        }
-
-
-        if (! Storage::exists(self::$map_storage_path[$object_type].'/'.$log->filename)) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.file_upload_status.file_not_found'), 200));
-        }
-
-        if (request('inline') == 'true') {
-            $headers = [
-                'Content-Disposition' => 'inline',
-            ];
-            return Storage::download(self::$map_storage_path[$object_type].'/'.$log->filename, $log->filename, $headers);
-        }
-
-        return StorageHelper::downloader(self::$map_storage_path[$object_type].'/'.$log->filename);
-
-    }
-
-    /**
-     * Delete the associated file
-     *
-     * @param  \App\Http\Requests\UploadFileRequest $request
-     * @param  string                               $object_type the type of object to upload the file to
-     * @param  int                                  $id          the ID of the object to delete from so we can check permisisons
-     * @param  $file_id     the ID of the file to delete from the action_logs table
-     * @since  [v8.1.17]
-     * @author [A. Gianotto <snipe@snipe.net>]
-     */
-    public function destroy($object_type, $id, $file_id) : JsonResponse
-    {
-
-        // Check the permissions to make sure the user can view the object
-        $object = self::$map_object_type[$object_type]::find($id);
-        $this->authorize('update', self::$map_object_type[$object_type]);
-
-        if (!$object) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.file_upload_status.invalid_object')));
-        }
-
-
-        // Check for the file
-        $log = Actionlog::find($file_id)->where('item_type', self::$map_object_type[$object_type])
-            ->where('item_id', $object->id)->first();
-
-        if ($log) {
-            // Check the file actually exists, and delete it
-            if (Storage::exists(self::$map_storage_path[$object_type].'/'.$log->filename)) {
-                Storage::delete(self::$map_storage_path[$object_type].'/'.$log->filename);
-            }
-            // Delete the record of the file
-            if ($log->delete()) {
-                return response()->json(Helper::formatStandardApiResponse('success', null, trans_choice('general.file_upload_status.delete.success', 1)), 200);
-            }
-
-
-        }
-
-        // The file doesn't seem to really exist, so report an error
-        return response()->json(Helper::formatStandardApiResponse('error', null, trans_choice('general.file_upload_status.delete.error', 1)), 500);
-
-    }
-}
--- a/app/Http/Controllers/Api/UsersController.php
+++ b/app/Http/Controllers/Api/UsersController.php
@@ -6,7 +6,6 @@ use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\SaveUserRequest;
 use App\Http\Transformers\AccessoriesTransformer;
-use App\Http\Transformers\ActionlogsTransformer;
 use App\Http\Transformers\AssetsTransformer;
 use App\Http\Transformers\ConsumablesTransformer;
 use App\Http\Transformers\LicensesTransformer;
@@ -20,11 +19,9 @@ use App\Models\Consumable;
 use App\Models\License;
 use App\Models\User;
 use App\Notifications\CurrentInventory;
-use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Support\Facades\Log;
@@ -64,14 +61,12 @@ class UsersController extends Controller
            'users.jobtitle',
            'users.last_login',
            'users.last_name',
-            'users.display_name',
            'users.locale',
            'users.location_id',
            'users.manager_id',
            'users.notes',
            'users.permissions',
            'users.phone',
-            'users.mobile',
            'users.state',
            'users.two_factor_enrolled',
            'users.two_factor_optin',
@@ -85,12 +80,7 @@ class UsersController extends Controller
            'users.autoassign_licenses',
            'users.website',

-        ])->with('manager')
-            ->with('groups')
-            ->with('userloc')
-            ->with('company')
-            ->with('department')
-            ->with('createdBy')
+        ])->with('manager', 'groups', 'userloc', 'company', 'department', 'assets', 'licenses', 'accessories', 'consumables', 'createdBy', 'managesUsers', 'managedLocations')
            ->withCount([
                'assets as assets_count' => function(Builder $query) {
                    $query->withoutTrashed();
@@ -111,26 +101,10 @@ class UsersController extends Controller
            $users = $users->where('users.activated', '=', $request->input('activated'));
        }

-        if ($request->input('admins') == 'true') {
-            $users = $users->OnlyAdminsAndSuperAdmins();
-        }
-
-        if ($request->input('superadmins') == 'true') {
-            $users = $users->OnlySuperAdmins();
-        }
-
        if ($request->filled('company_id')) {
            $users = $users->where('users.company_id', '=', $request->input('company_id'));
        }

-        if ($request->filled('phone')) {
-            $users = $users->where('users.phone', '=', $request->input('phone'));
-        }
-
-        if ($request->filled('mobile')) {
-            $users = $users->where('users.mobile', '=', $request->input('mobile'));
-        }
-
        if ($request->filled('location_id')) {
            $users = $users->where('users.location_id', '=', $request->input('location_id'));
        }
@@ -155,10 +129,6 @@ class UsersController extends Controller
            $users = $users->where('users.last_name', '=', $request->input('last_name'));
        }

-        if ($request->filled('display_name')) {
-            $users = $users->where('users.display_name', '=', $request->input('display_name'));
-        }
-
        if ($request->filled('employee_num')) {
            $users = $users->where('users.employee_num', '=', $request->input('employee_num'));
        }
@@ -236,11 +206,11 @@ class UsersController extends Controller
        }

        if ($request->filled('manages_users_count')) {
-            $users->has('managesUsers', '=', $request->input('manages_users_count'));
+            $users->has('manages_users_count', '=', $request->input('manages_users_count'));
        }

        if ($request->filled('manages_locations_count')) {
-            $users->has('managedLocations', '=', $request->input('manages_locations_count'));
+            $users->has('manages_locations_count', '=', $request->input('manages_locations_count'));
        }

        if ($request->filled('autoassign_licenses')) {
@@ -289,7 +259,6 @@ class UsersController extends Controller
                    [
                        'last_name',
                        'first_name',
-                        'display_name',
                        'email',
                        'jobtitle',
                        'username',
@@ -308,7 +277,6 @@ class UsersController extends Controller
                        'manages_users_count',
                        'manages_locations_count',
                        'phone',
-                        'mobile',
                        'address',
                        'city',
                        'state',
@@ -361,7 +329,6 @@ class UsersController extends Controller
                'users.employee_num',
                'users.first_name',
                'users.last_name',
-                'users.display_name',
                'users.gravatar',
                'users.avatar',
                'users.email',
@@ -372,17 +339,20 @@ class UsersController extends Controller
            $users = $users->where(function ($query) use ($request) {
                $query->SimpleNameSearch($request->get('search'))
                    ->orWhere('username', 'LIKE', '%'.$request->get('search').'%')
-                    ->orWhere('display_name', 'LIKE', '%'.$request->get('search').'%')
                    ->orWhere('email', 'LIKE', '%'.$request->get('search').'%')
                    ->orWhere('employee_num', 'LIKE', '%'.$request->get('search').'%');
            });
        }

-        $users = $users->orderBy('display_name', 'asc')->orderBy('last_name', 'asc')->orderBy('first_name', 'asc');
+        $users = $users->orderBy('last_name', 'asc')->orderBy('first_name', 'asc');
        $users = $users->paginate(50);

        foreach ($users as $user) {
-            $name_str = $user->display_name;
+            $name_str = '';
+            if ($user->last_name != '') {
+                $name_str .= $user->last_name.', ';
+            }
+            $name_str .= $user->first_name;

            if ($user->username != '') {
                $name_str .= ' ('.$user->username.')';
@@ -504,31 +474,10 @@ class UsersController extends Controller
                return response()->json(Helper::formatStandardApiResponse('error', null, 'You cannot be your own manager'));
            }

-            // check for permissions related fields and pull them out if the current user cannot edit them
-            if (auth()->user()->can('canEditAuthFields', $user) && auth()->user()->can('editableOnDemo')) {
-
            if ($request->filled('password')) {
                $user->password = bcrypt($request->input('password'));
            }

-                if ($request->filled('username')) {
-                    $user->username = $request->input('username');
-                }
-
-                if ($request->filled('display_name')) {
-                    $user->display_name = $request->input('display_name');
-                }
-
-                if ($request->filled('email')) {
-                    $user->email = $request->input('email');
-                }
-
-                if ($request->filled('activated')) {
-                    $user->activated = $request->input('activated');
-                }
-
-            }
-
            // We need to use has()  instead of filled()
            // here because we need to overwrite permissions
            // if someone needs to null them out
@@ -727,6 +676,7 @@ class UsersController extends Controller
        $this->authorize('view', License::class);
        
        if ($user = User::where('id', $id)->withTrashed()->first()) {
+            $this->authorize('update', $user);
            $licenses = $user->licenses()->get();
            return (new LicensesTransformer())->transformLicenses($licenses, $licenses->count());
        }
@@ -786,25 +736,6 @@ class UsersController extends Controller
        return (new UsersTransformer)->transformUser($request->user());
    }

-    /**
-     * Display the EULAs accepted by the user.
-     *
-     *  @param \App\Models\User $user
-     *  @param \App\Http\Transformers\ActionlogsTransformer $transformer
-     *  @return \Illuminate\Http\JsonResponse
-     *@since [v8.1.16]
-     * @author [Godfrey Martinez] [<gmartinez@grokability.com>]
-     */
-    public function eulas(User $user, ActionlogsTransformer $transformer)
-    {
-        $this->authorize('view', User::class);
-
-        $eulas = $user->eulas;
-        return response()->json(
-            $transformer->transformActionlogs($eulas, $eulas->count())
-        );
-    }
-
    /**
     * Restore a soft-deleted user.
     *
@@ -841,37 +772,4 @@ class UsersController extends Controller
        return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/users/message.user_not_found')), 200);

    }
-
-
-    /**
-     * Run the LDAP sync command to import users from LDAP via API.
-     *
-     * @author A. Gianotto <snipe@snipe.net>
-     * @since 8.2.2
-     *
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function syncLdapUsers(Request $request)
-    {
-        $this->authorize('update', User::class);
-        // Call Artisan LDAP import command.
-
-        Artisan::call('snipeit:ldap-sync', ['--location_id' => $request->input('location_id'), '--json_summary' => true]);
-
-        // Collect and parse JSON summary.
-        $ldap_results_json = Artisan::output();
-        $ldap_results = json_decode($ldap_results_json, true);
-
-        if (!$ldap_results) {
-            return response()->json(Helper::formatStandardApiResponse('error', null,trans('general.no_results')), 200);
-        }
-
-        // Direct user to appropriate status page.
-        if ($ldap_results['error']) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, $ldap_results['error_message']), 200);
-        }
-
-        return response()->json(Helper::formatStandardApiResponse('success', null, $ldap_results['summary']), 200);
-
-    }
 }
--- a/app/Http/Controllers/AssetMaintenancesController.php
+++ b/app/Http/Controllers/AssetMaintenancesController.php
@@ -0,0 +1,272 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Models\Asset;
+use App\Models\AssetMaintenance;
+use App\Models\Company;
+use Illuminate\Support\Facades\Auth;
+use Carbon\Carbon;
+use Illuminate\Http\Request;
+use \Illuminate\Contracts\View\View;
+use \Illuminate\Http\RedirectResponse;
+
+/**
+ * This controller handles all actions related to Asset Maintenance for
+ * the Snipe-IT Asset Management application.
+ *
+ * @version    v2.0
+ */
+class AssetMaintenancesController extends Controller
+{
+    /**
+    * Checks for permissions for this action.
+    *
+    * @todo This should be replaced with middleware and/or policies
+    * @author  Vincent Sposato <vincent.sposato@gmail.com>
+    * @version v1.0
+    * @since [v1.8]
+    */
+    private static function getInsufficientPermissionsRedirect(): RedirectResponse
+    {
+        return redirect()->route('maintenances.index')
+          ->with('error', trans('general.insufficient_permissions'));
+    }
+
+    /**
+    *  Returns a view that invokes the ajax tables which actually contains
+    * the content for the asset maintenances listing, which is generated in getDatatable.
+    *
+    * @todo This should be replaced with middleware and/or policies
+    * @see AssetMaintenancesController::getDatatable() method that generates the JSON response
+    * @author  Vincent Sposato <vincent.sposato@gmail.com>
+    * @version v1.0
+    * @since [v1.8]
+    */
+    public function index() : View
+    {
+        $this->authorize('view', Asset::class);
+        return view('asset_maintenances/index');
+    }
+
+    /**
+     *  Returns a form view to create a new asset maintenance.
+     *
+     * @see AssetMaintenancesController::postCreate() method that stores the data
+     * @author  Vincent Sposato <vincent.sposato@gmail.com>
+     * @version v1.0
+     * @since [v1.8]
+     * @return mixed
+     */
+    public function create() : View
+    {
+        $this->authorize('update', Asset::class);
+        $asset = null;
+
+        if ($asset = Asset::find(request('asset_id'))) {
+            // We have to set this so that the correct property is set in the select2 ajax dropdown
+            $asset->asset_id = $asset->id;
+        }
+
+        // Prepare Asset Maintenance Type List
+        $assetMaintenanceType = [
+                                    '' => 'Select an asset maintenance type',
+                                ] + AssetMaintenance::getImprovementOptions();
+        // Mark the selected asset, if it came in
+
+        return view('asset_maintenances/edit')
+                   ->with('asset', $asset)
+                   ->with('assetMaintenanceType', $assetMaintenanceType)
+                   ->with('item', new AssetMaintenance);
+    }
+
+    /**
+    *  Validates and stores the new asset maintenance
+    *
+    * @see AssetMaintenancesController::getCreate() method for the form
+    * @author  Vincent Sposato <vincent.sposato@gmail.com>
+    * @version v1.0
+    * @since [v1.8]
+    */
+    public function store(Request $request) : RedirectResponse
+    {
+        $this->authorize('update', Asset::class);
+        // create a new model instance
+        $assetMaintenance = new AssetMaintenance();
+        $assetMaintenance->supplier_id = $request->input('supplier_id');
+        $assetMaintenance->is_warranty = $request->input('is_warranty');
+        $assetMaintenance->cost = $request->input('cost');
+        $assetMaintenance->notes = $request->input('notes');
+        $asset = Asset::find($request->input('asset_id'));
+
+        if ((! Company::isCurrentUserHasAccess($asset)) && ($asset != null)) {
+            return static::getInsufficientPermissionsRedirect();
+        }
+
+        // Save the asset maintenance data
+        $assetMaintenance->asset_id = $request->input('asset_id');
+        $assetMaintenance->asset_maintenance_type = $request->input('asset_maintenance_type');
+        $assetMaintenance->title = $request->input('title');
+        $assetMaintenance->start_date = $request->input('start_date');
+        $assetMaintenance->completion_date = $request->input('completion_date');
+        $assetMaintenance->created_by = auth()->id();
+
+        if (($assetMaintenance->completion_date !== null)
+            && ($assetMaintenance->start_date !== '')
+            && ($assetMaintenance->start_date !== '0000-00-00')
+        ) {
+            $startDate = Carbon::parse($assetMaintenance->start_date);
+            $completionDate = Carbon::parse($assetMaintenance->completion_date);
+            $assetMaintenance->asset_maintenance_time = (int) $completionDate->diffInDays($startDate, true);
+        }
+
+        // Was the asset maintenance created?
+        if ($assetMaintenance->save()) {
+            // Redirect to the new asset maintenance page
+            return redirect()->route('maintenances.index')
+                           ->with('success', trans('admin/asset_maintenances/message.create.success'));
+        }
+
+        return redirect()->back()->withInput()->withErrors($assetMaintenance->getErrors());
+    }
+
+    /**
+    *  Returns a form view to edit a selected asset maintenance.
+    *
+    * @see AssetMaintenancesController::postEdit() method that stores the data
+    * @author  Vincent Sposato <vincent.sposato@gmail.com>
+    * @param int $assetMaintenanceId
+    * @version v1.0
+    * @since [v1.8]
+    */
+    public function edit(AssetMaintenance $maintenance) : View | RedirectResponse
+    {
+        $this->authorize('update', Asset::class);
+        if ((!$maintenance->asset) || ($maintenance->asset->deleted_at!='')) {
+            return redirect()->route('maintenances.index')->with('error', 'asset does not exist');
+        } elseif (! Company::isCurrentUserHasAccess($maintenance->asset)) {
+            return static::getInsufficientPermissionsRedirect();
+        }
+
+        // Prepare Improvement Type List
+        $assetMaintenanceType = ['' => 'Select an improvement type'] + AssetMaintenance::getImprovementOptions();
+
+        return view('asset_maintenances/edit')
+                   ->with('selectedAsset', null)
+                   ->with('assetMaintenanceType', $assetMaintenanceType)
+                   ->with('item', $maintenance);
+    }
+
+    /**
+     *  Validates and stores an update to an asset maintenance
+     *
+     * @see AssetMaintenancesController::postEdit() method that stores the data
+     * @author  Vincent Sposato <vincent.sposato@gmail.com>
+     * @param Request $request
+     * @param int $assetMaintenanceId
+     * @version v1.0
+     * @since [v1.8]
+     */
+    public function update(Request $request, AssetMaintenance $maintenance) : View | RedirectResponse
+    {
+        $this->authorize('update', Asset::class);
+
+       if ((!$maintenance->asset) || ($maintenance->asset->deleted_at!='')) {
+                return redirect()->route('maintenances.index')->with('error', 'asset does not exist');
+        } elseif (! Company::isCurrentUserHasAccess($maintenance->asset)) {
+            return static::getInsufficientPermissionsRedirect();
+        }
+
+        $maintenance->supplier_id = $request->input('supplier_id');
+        $maintenance->is_warranty = $request->input('is_warranty');
+        $maintenance->cost =  $request->input('cost');
+        $maintenance->notes = $request->input('notes');
+
+        $asset = Asset::find(request('asset_id'));
+
+        if (! Company::isCurrentUserHasAccess($asset)) {
+            return static::getInsufficientPermissionsRedirect();
+        }
+
+        // Save the asset maintenance data
+        $maintenance->asset_id = $request->input('asset_id');
+        $maintenance->asset_maintenance_type = $request->input('asset_maintenance_type');
+        $maintenance->title = $request->input('title');
+        $maintenance->start_date = $request->input('start_date');
+        $maintenance->completion_date = $request->input('completion_date');
+
+        if (($maintenance->completion_date == null)
+        ) {
+            if (($maintenance->asset_maintenance_time !== 0)
+              || (! is_null($maintenance->asset_maintenance_time))
+            ) {
+                $maintenance->asset_maintenance_time = null;
+            }
+        }
+
+        if (($maintenance->completion_date !== null)
+          && ($maintenance->start_date !== '')
+          && ($maintenance->start_date !== '0000-00-00')
+        ) {
+            $startDate = Carbon::parse($maintenance->start_date);
+            $completionDate = Carbon::parse($maintenance->completion_date);
+            $maintenance->asset_maintenance_time = (int) $completionDate->diffInDays($startDate, true);
+        }
+
+      // Was the asset maintenance created?
+        if ($maintenance->save()) {
+
+            // Redirect to the new asset maintenance page
+            return redirect()->route('maintenances.index')
+                            ->with('success', trans('admin/asset_maintenances/message.edit.success'));
+        }
+
+        return redirect()->back()->withInput()->withErrors($maintenance->getErrors());
+    }
+
+    /**
+    *  Delete an asset maintenance
+    *
+    * @author  Vincent Sposato <vincent.sposato@gmail.com>
+    * @param int $assetMaintenanceId
+    * @version v1.0
+    * @since [v1.8]
+    */
+    public function destroy($assetMaintenanceId) : RedirectResponse
+    {
+        $this->authorize('update', Asset::class);
+        // Check if the asset maintenance exists
+        if (is_null($assetMaintenance = AssetMaintenance::find($assetMaintenanceId))) {
+            // Redirect to the asset maintenance management page
+            return redirect()->route('maintenances.index')
+                           ->with('error', trans('admin/asset_maintenances/message.not_found'));
+        } elseif (! Company::isCurrentUserHasAccess($assetMaintenance->asset)) {
+            return static::getInsufficientPermissionsRedirect();
+        }
+
+        // Delete the asset maintenance
+        $assetMaintenance->delete();
+
+        // Redirect to the asset_maintenance management page
+        return redirect()->route('maintenances.index')
+                       ->with('success', trans('admin/asset_maintenances/message.delete.success'));
+    }
+
+    /**
+    *  View an asset maintenance
+    *
+    * @author  Vincent Sposato <vincent.sposato@gmail.com>
+    * @param int $assetMaintenanceId
+    * @version v1.0
+    * @since [v1.8]
+    */
+    public function show(AssetMaintenance $maintenance) : View | RedirectResponse
+    {
+        $this->authorize('view', Asset::class);
+        if (! Company::isCurrentUserHasAccess($maintenance->asset)) {
+            return static::getInsufficientPermissionsRedirect();
+        }
+
+        return view('asset_maintenances/view')->with('assetMaintenance', $maintenance);
+    }
+}
--- a/app/Http/Controllers/AssetModelsController.php
+++ b/app/Http/Controllers/AssetModelsController.php
@@ -87,20 +87,7 @@ class AssetModelsController extends Controller
            $model->fieldset_id = $request->input('fieldset_id');
        }

-        if ($request->has('use_cloned_image')) {
-            $cloned_model_img = AssetModel::select('image')->find($request->input('clone_image_from_id'));
-            if ($cloned_model_img) {
-                $new_image_name = 'clone-'.date('U').'-'.$cloned_model_img->image;
-                $new_image = 'models/'.$new_image_name;
-                Storage::disk('public')->copy('models/'.$cloned_model_img->image, $new_image);
-                $model->image = $new_image_name;
-            }
-
-        } else {
        $model = $request->handleImages($model);
-        }
-
-

        if ($model->save()) {
            if ($this->shouldAddDefaultValues($request->input())) {
@@ -284,7 +271,7 @@ class AssetModelsController extends Controller
            ->with('depreciation_list', Helper::depreciationList())
            ->with('item', $model)
            ->with('model_id', $model->id)
-            ->with('cloned_model', $cloned_model);
+            ->with('clone_model', $cloned_model);
    }


--- a/app/Http/Controllers/AssetModelsFilesController.php
+++ b/app/Http/Controllers/AssetModelsFilesController.php
@@ -0,0 +1,115 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Helpers\StorageHelper;
+use App\Http\Requests\UploadFileRequest;
+use App\Models\Actionlog;
+use App\Models\AssetModel;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Response;
+use Illuminate\Support\Facades\Storage;
+use \Symfony\Component\HttpFoundation\StreamedResponse;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
+
+class AssetModelsFilesController 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, $modelId = null) : RedirectResponse
+    {
+        if (! $model = AssetModel::find($modelId)) {
+            return redirect()->route('models.index')->with('error', trans('admin/hardware/message.does_not_exist'));
+        }
+
+        $this->authorize('update', $model);
+
+        if ($request->hasFile('file')) {
+            if (! Storage::exists('private_uploads/assetmodels')) {
+                Storage::makeDirectory('private_uploads/assetmodels', 775);
+            }
+
+            foreach ($request->file('file') as $file) {
+
+                $file_name = $request->handleFile('private_uploads/assetmodels/','model-'.$model->id,$file);
+
+                $model->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(AssetModel $model, $fileId = null) : StreamedResponse | Response | RedirectResponse | BinaryFileResponse
+    {
+
+            $this->authorize('view', $model);
+
+            if (! $log = Actionlog::find($fileId)) {
+                return response('No matching record for that model/file', 500)
+                    ->header('Content-Type', 'text/plain');
+            }
+
+            $file = 'private_uploads/assetmodels/'.$log->filename;
+
+            if (! Storage::exists($file)) {
+                return response('File '.$file.' not found on server', 404)
+                    ->header('Content-Type', 'text/plain');
+            }
+
+            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(AssetModel $model, $fileId = null) : RedirectResponse
+    {
+        $rel_path = 'private_uploads/assetmodels';
+        $this->authorize('update', $model);
+        $log = Actionlog::find($fileId);
+        if ($log) {
+            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/Assets/AssetCheckinController.php
+++ b/app/Http/Controllers/Assets/AssetCheckinController.php
@@ -14,7 +14,6 @@ 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,14 +40,6 @@ class AssetCheckinController extends Controller
        if (!$asset->model) {
            return redirect()->route('hardware.show', $asset->id)->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());
-        }
-
        $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')]),
@@ -96,6 +87,7 @@ class AssetCheckinController extends Controller
        });

        $asset->expected_checkin = null;
+        $asset->last_checkin = now();
        $asset->assignedTo()->disassociate($asset);
        $asset->accepted = null;
        $asset->name = $request->get('name');
@@ -122,14 +114,11 @@ class AssetCheckinController extends Controller

        $originalValues = $asset->getRawOriginal();

-        // Handle last checkin date
        $checkin_at = date('Y-m-d H:i:s');
        if (($request->filled('checkin_at')) && ($request->get('checkin_at') != date('Y-m-d'))) {
            $originalValues['action_date'] = $checkin_at;
            $checkin_at = $request->get('checkin_at');
-
        }
-        $asset->last_checkin = $checkin_at;

        $asset->licenseseats->each(function (LicenseSeat $seat) {
            $seat->update(['assigned_to' => null]);
@@ -153,8 +142,7 @@ class AssetCheckinController extends Controller
        if ($asset->save()) {

            event(new CheckoutableCheckedIn($asset, $target, auth()->user(), $request->input('note'), $checkin_at, $originalValues));
-            return Helper::getRedirectOption($request, $asset->id, 'Assets')
-                ->with('success', trans('admin/hardware/message.checkin.success'));
+            return redirect()->to(Helper::getRedirectOption($request, $asset->id, 'Assets'))->with('success', trans('admin/hardware/message.checkin.success'));
        }
        // Redirect to the asset management page with error
        return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.checkin.error').$asset->getErrors());
--- a/app/Http/Controllers/Assets/AssetCheckoutController.php
+++ b/app/Http/Controllers/Assets/AssetCheckoutController.php
@@ -12,7 +12,6 @@ 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
 {
@@ -37,14 +36,6 @@ 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())
@@ -123,7 +114,7 @@ class AssetCheckoutController extends Controller
            session()->put(['redirect_option' => $request->get('redirect_option'), 'checkout_to_type' => $request->get('checkout_to_type')]);

            if ($asset->checkOut($target, $admin, $checkout_at, $expected_checkin, $request->get('note'), $request->get('name'))) {
-                return Helper::getRedirectOption($request, $asset->id, 'Assets')
+                return redirect()->to(Helper::getRedirectOption($request, $asset->id, 'Assets'))
                    ->with('success', trans('admin/hardware/message.checkout.success'));
            }
            // Redirect to the asset management page with error
--- a/app/Http/Controllers/Assets/AssetFilesController.php
+++ b/app/Http/Controllers/Assets/AssetFilesController.php
@@ -0,0 +1,108 @@
+<?php
+
+namespace App\Http\Controllers\Assets;
+
+use App\Helpers\StorageHelper;
+use App\Http\Controllers\Controller;
+use App\Http\Requests\UploadFileRequest;
+use App\Models\Actionlog;
+use App\Models\Asset;
+use \Illuminate\Http\Response;
+use Illuminate\Support\Facades\Storage;
+use \Illuminate\Contracts\View\View;
+use \Illuminate\Http\RedirectResponse;
+use Symfony\Component\HttpFoundation\StreamedResponse;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
+
+class AssetFilesController extends Controller
+{
+    /**
+     * Upload a file to the server.
+     *
+     * @param UploadFileRequest $request
+     * @param int $assetId
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
+     *@since [v1.0]
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     */
+    public function store(UploadFileRequest $request, Asset $asset) : RedirectResponse
+    {
+
+        $this->authorize('update', $asset);
+
+        if ($request->hasFile('file')) {
+            if (! Storage::exists('private_uploads/assets')) {
+                Storage::makeDirectory('private_uploads/assets', 775);
+            }
+
+            foreach ($request->file('file') as $file) {
+                $file_name = $request->handleFile('private_uploads/assets/','hardware-'.$asset->id, $file);
+                
+                $asset->logUpload($file_name, $request->get('notes'));
+            }
+
+            return redirect()->back()->withFragment('files')->with('success', trans('admin/hardware/message.upload.success'));
+        }
+
+        return redirect()->back()->with('error', trans('admin/hardware/message.upload.nofiles'));
+    }
+
+    /**
+     * Check for permissions and display the file.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @param  int $assetId
+     * @param  int $fileId
+     * @since [v1.0]
+     */
+    public function show(Asset $asset, $fileId = null) : View | RedirectResponse | Response | StreamedResponse | BinaryFileResponse
+    {
+
+        $this->authorize('view', $asset);
+
+        if ($log = Actionlog::whereNotNull('filename')->where('item_id', $asset->id)->find($fileId)) {
+            $file = 'private_uploads/assets/'.$log->filename;
+
+            if ($log->action_type == 'audit') {
+                $file = 'private_uploads/audits/'.$log->filename;
+            }
+
+            try {
+                 return StorageHelper::showOrDownloadFile($file, $log->filename);
+            } catch (\Exception $e) {
+                return redirect()->route('hardware.show', $asset)->with('error', trans('general.file_not_found'));
+            }
+
+        }
+
+        return redirect()->route('hardware.show', $asset)->with('error', trans('general.log_record_not_found'));
+
+
+    }
+
+    /**
+     * Delete the associated file
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @param  int $assetId
+     * @param  int $fileId
+     * @since [v1.0]
+     */
+    public function destroy(Asset $asset, $fileId = null) : RedirectResponse
+    {
+        $this->authorize('update', $asset);
+        $rel_path = 'private_uploads/assets';
+
+        if ($log = Actionlog::find($fileId)) {
+            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()->route('hardware.show', $asset)->with('error', trans('general.log_record_not_found'));
+    }
+
+}
--- a/app/Http/Controllers/Assets/AssetsController.php
+++ b/app/Http/Controllers/Assets/AssetsController.php
@@ -149,7 +149,7 @@ class AssetsController extends Controller
            $asset->byod                    = request('byod', 0);

            if (! empty($settings->audit_interval)) {
-                $asset->next_audit_date = Carbon::now()->addMonths((int) $settings->audit_interval)->toDateString();
+                $asset->next_audit_date = Carbon::now()->addMonths($settings->audit_interval)->toDateString();
            }

            // Set location_id to rtd_location_id ONLY if the asset isn't being checked out
@@ -157,16 +157,8 @@ class AssetsController extends Controller
                $asset->location_id = $request->input('rtd_location_id', null);
            }

-            if ($request->has('use_cloned_image')) {
-                $cloned_model_img = Asset::select('image')->find($request->input('clone_image_from_id'));
-                if ($cloned_model_img) {
-                    $new_image_name = 'clone-'.date('U').'-'.$cloned_model_img->image;
-                    $new_image = 'assets/'.$new_image_name;
-                    Storage::disk('public')->copy('assets/'.$cloned_model_img->image, $new_image);
-                    $asset->image = $new_image_name;
-                }
-
-            } else {
+            // Create the image (if one was chosen.)
+            if ($request->has('image')) {
                $asset = $request->handleImages($asset);
            }

@@ -196,31 +188,14 @@ class AssetsController extends Controller

            // Validate the asset before saving
            if ($asset->isValid() && $asset->save()) {
-                $target = null;
-                $location = null;
-
-                if ($userId = request('assigned_user')) {
-                    $target = User::find($userId);
-
-                    if (!$target) {
-                        return redirect()->back()->withInput()->with('error', trans('admin/hardware/message.create.target_not_found.user'));
-                    }
+                if (request('assigned_user')) {
+                    $target = User::find(request('assigned_user'));
                    $location = $target->location_id;
-
-                } elseif ($assetId = request('assigned_asset')) {
-                    $target = Asset::find($assetId);
-
-                    if (!$target) {
-                        return redirect()->back()->withInput()->with('error', trans('admin/hardware/message.create.target_not_found.asset'));
-                    }
+                } elseif (request('assigned_asset')) {
+                    $target = Asset::find(request('assigned_asset'));
                    $location = $target->location_id;
-
-                } elseif ($locationId = request('assigned_location')) {
-                    $target = Location::find($locationId);
-
-                    if (!$target) {
-                        return redirect()->back()->withInput()->with('error', trans('admin/hardware/message.create.target_not_found.location'));
-                    }
+                } elseif (request('assigned_location')) {
+                    $target = Location::find(request('assigned_location'));
                    $location = $target->id;
                }

@@ -234,32 +209,25 @@ class AssetsController extends Controller
                $failures[] = join(",", $asset->getErrors()->all());
            }
        }
-        if($request->get('redirect_option') === 'back'){
-            session()->put(['redirect_option' => 'index']);
-        } else {
-            session()->put(['redirect_option' => $request->get('redirect_option')]);
-        }
-
-        session()->put(['checkout_to_type' => $request->get('checkout_to_type'),
-                       'other_redirect' =>  'model' ]);

+        session()->put(['redirect_option' => $request->get('redirect_option'), 'checkout_to_type' => $request->get('checkout_to_type')]);


        if ($successes) {
            if ($failures) {
                //some succeeded, some failed
-                return Helper::getRedirectOption($request, $asset->id, 'Assets') //FIXME - not tested
+                return redirect()->to(Helper::getRedirectOption($request, $asset->id, 'Assets')) //FIXME - not tested
                ->with('success-unescaped', trans_choice('admin/hardware/message.create.multi_success_linked', $successes, ['links' => join(", ", $successes)]))
                    ->with('warning', trans_choice('admin/hardware/message.create.partial_failure', $failures, ['failures' => join("; ", $failures)]));
            } else {
                if (count($successes) == 1) {
                    //the most common case, keeping it so we don't have to make every use of that translation string be trans_choice'ed
                    //and re-translated
-                    return Helper::getRedirectOption($request, $asset->id, 'Assets')
+                    return redirect()->to(Helper::getRedirectOption($request, $asset->id, 'Assets'))
                        ->with('success-unescaped', trans('admin/hardware/message.create.success_linked', ['link' => route('hardware.show', $asset), 'id', 'tag' => e($asset->asset_tag)]));
                } else {
                    //multi-success
-                    return Helper::getRedirectOption($request, $asset->id, 'Assets')
+                    return redirect()->to(Helper::getRedirectOption($request, $asset->id, 'Assets'))
                        ->with('success-unescaped', trans_choice('admin/hardware/message.create.multi_success_linked', $successes, ['links' => join(", ", $successes)]));
                }
            }
@@ -280,7 +248,6 @@ class AssetsController extends Controller
    public function edit(Asset $asset) : View | RedirectResponse
    {
        $this->authorize($asset);
-        session()->put('back_url', url()->previous());
        return view('hardware/edit')
            ->with('item', $asset)
            ->with('statuslabel_list', Helper::statusLabelList())
@@ -424,9 +391,6 @@ class AssetsController extends Controller
        $model = AssetModel::find($request->get('model_id'));
        if (($model) && ($model->fieldset)) {
            foreach ($model->fieldset->fields as $field) {
-                if ($field->element == 'checkbox' && !$request->has($field->db_column)) {
-                    $asset->{$field->db_column} = null;
-                }
                if ($request->has($field->db_column)) {
                    if ($field->field_encrypted == '1') {
                        if (Gate::allows('assets.view.encrypted_custom_fields')) {
@@ -446,15 +410,11 @@ class AssetsController extends Controller
                }
            }
        }
-        session()->put([
-            'redirect_option' => $request->get('redirect_option'),
-            'checkout_to_type' => $request->get('checkout_to_type'),
-            'other_redirect' => $request->get('redirect_option') === 'other_redirect' ? 'model' : null,
-        ]);

+        session()->put(['redirect_option' => $request->get('redirect_option'), 'checkout_to_type' => $request->get('checkout_to_type')]);

        if ($asset->save()) {
-            return Helper::getRedirectOption($request, $asset->id, 'Assets')
+            return redirect()->to(Helper::getRedirectOption($request, $asset->id, 'Assets'))
                ->with('success', trans('admin/hardware/message.update.success'));
        }

@@ -486,7 +446,7 @@ class AssetsController extends Controller
            event(new CheckoutableCheckedIn($asset, $target, auth()->user(), 'Checkin on delete', $checkin_at, $originalValues));
            DB::table('assets')
                ->where('id', $asset->id)
-                ->update(['assigned_to' => null, 'assigned_type' => null]);
+                ->update(['assigned_to' => null]);
        }


@@ -498,7 +458,6 @@ class AssetsController extends Controller
            }
        }

-
        $asset->delete();

        return redirect()->route('hardware.index')->with('success', trans('admin/hardware/message.delete.success'));
@@ -560,7 +519,7 @@ class AssetsController extends Controller
    {
        $settings = Setting::getSettings();

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

            if ($asset) {
                $size = Helper::barcodeDimensions($settings->label2_2d_type);
@@ -659,9 +618,8 @@ class AssetsController extends Controller
     */
    public function getClone(Asset $asset)
    {
-        $this->authorize('create', Asset::class);
+        $this->authorize('create', $asset);
        $cloned = clone $asset;
-        $cloned_model = $asset;
        $cloned->id = null;
        $cloned->asset_tag = '';
        $cloned->serial = '';
@@ -671,7 +629,6 @@ class AssetsController extends Controller
        return view('hardware/edit')
            ->with('statuslabel_list', Helper::statusLabelList())
            ->with('statuslabel_types', Helper::statusTypeList())
-            ->with('cloned_model', $cloned_model)
            ->with('item', $cloned);
    }

@@ -797,7 +754,7 @@ class AssetsController extends Controller
                            'item_id' => $asset->id,
                            'item_type' => Asset::class,
                            'created_by' =>  auth()->id(),
-                            'note' => 'Checkout imported by '.auth()->user()->display_name.' from history importer',
+                            'note' => 'Checkout imported by '.auth()->user()->present()->fullName().' from history importer',
                            'target_id' => $item[$asset_tag][$batch_counter]['user_id'],
                            'target_type' => User::class,
                            'created_at' =>  $item[$asset_tag][$batch_counter]['checkout_date'],
@@ -825,7 +782,7 @@ class AssetsController extends Controller
                                'item_id' => $item[$asset_tag][$batch_counter]['asset_id'],
                                'item_type' => Asset::class,
                                'created_by' => auth()->id(),
-                                'note' => 'Checkin imported by '.auth()->user()->display_name.' from history importer',
+                                'note' => 'Checkin imported by '.auth()->user()->present()->fullName().' from history importer',
                                'target_id' => null,
                                'created_at' => $checkin_date,
                                'action_type' => 'checkin',
@@ -920,20 +877,11 @@ class AssetsController extends Controller
    }


-    public function audit(Asset $asset): View | RedirectResponse
+    public function audit(Asset $asset)
    {
-        $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( (int) $settings->audit_interval)->toDateString();
+        $this->authorize('audit', Asset::class);
+        $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');
    }

@@ -942,10 +890,6 @@ 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');
@@ -980,8 +924,8 @@ class AssetsController extends Controller
            }
        }

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

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

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

        return redirect()->back()->withInput()->withErrors($asset->getErrors());
--- a/app/Http/Controllers/Assets/BulkAssetsController.php
+++ b/app/Http/Controllers/Assets/BulkAssetsController.php
@@ -52,26 +52,11 @@ class BulkAssetsController extends Controller
        }

        $asset_ids = $request->input('ids');
-
        if ($request->input('bulk_actions') === 'checkout') {
-            $status_check =$this->hasUndeployableStatus($asset_ids);
-            if($status_check && $status_check['status'] === true){
-
-                $asset_tags = implode(', ', array_column($status_check['tags'], 'asset_tag'));
-                $asset_ids = $status_check['asset_ids'];
-
-                session()->flash('warning', trans('admin/hardware/message.undeployable', ['asset_tags' => $asset_tags]));
-            }
-
            $request->session()->flashInput(['selected_assets' => $asset_ids]);
            return redirect()->route('hardware.bulkcheckout.show');
        }

-        if ($request->input('bulk_actions') === 'maintenance') {
-            $request->session()->flashInput(['selected_assets' => $asset_ids]);
-            return redirect()->route('maintenances.create');
-        }
-
        // Figure out where we need to send the user after the update is complete, and store that in the session
        $bulk_back_url = request()->headers->get('referer');
        session(['bulk_back_url' => $bulk_back_url]);
@@ -112,47 +97,11 @@ class BulkAssetsController extends Controller
        // This handles all of the pivot sorting below (versus the assets.* fields in the allowed_columns array)
        $column_sort = in_array($sort_override, $allowed_columns) ? $sort_override : 'assets.id';

-        $query = Asset::with('assignedTo', 'location', 'model')
+        $assets = Asset::with('assignedTo', 'location', 'model')
                ->whereIn('assets.id', $asset_ids)
                ->withTrashed();

-
-        switch ($sort_override) {
-            case 'model':
-                $query->OrderModels($order);
-                break;
-            case 'model_number':
-                $query->OrderModelNumber($order);
-                break;
-            case 'category':
-                $query->OrderCategory($order);
-                break;
-            case 'manufacturer':
-                $query->OrderManufacturer($order);
-                break;
-            case 'company':
-                $query->OrderCompany($order);
-                break;
-            case 'location':
-                $query->OrderLocation($order);
-                break;
-            case 'rtd_location':
-                $query->OrderRtdLocation($order);
-                break;
-            case 'status_label':
-                $query->OrderStatus($order);
-                break;
-            case 'supplier':
-                $query->OrderSupplier($order);
-                break;
-            case 'assigned_to':
-                $query->OrderAssigned($order);
-                break;
-            default:
-                $query->orderBy($column_sort, $order);
-                break;
-        }
-        $assets = $query->get();
+        $assets = $assets->get();

        if ($assets->isEmpty()) {
            Log::debug('No assets were found for the provided IDs', ['ids' => $asset_ids]);
@@ -161,7 +110,6 @@ class BulkAssetsController extends Controller

        $models = $assets->unique('model_id');
        $modelNames = [];
-
        foreach($models as $model) {
            $modelNames[] = $model->model->name;
        }
@@ -197,6 +145,7 @@ class BulkAssetsController extends Controller

                case 'edit':
                    $this->authorize('update', Asset::class);
+
                    return view('hardware/bulk')
                        ->with('assets', $asset_ids)
                        ->with('statuslabel_list', Helper::statusLabelList())
@@ -205,7 +154,40 @@ class BulkAssetsController extends Controller
            }
        }

-
+        switch ($sort_override) {
+            case 'model':
+                $assets->OrderModels($order);
+                break;
+            case 'model_number':
+                $assets->OrderModelNumber($order);
+                break;
+            case 'category':
+                $assets->OrderCategory($order);
+                break;
+            case 'manufacturer':
+                $assets->OrderManufacturer($order);
+                break;
+            case 'company':
+                $assets->OrderCompany($order);
+                break;
+            case 'location':
+                $assets->OrderLocation($order);
+            case 'rtd_location':
+                $assets->OrderRtdLocation($order);
+                break;
+            case 'status_label':
+                $assets->OrderStatus($order);
+                break;
+            case 'supplier':
+                $assets->OrderSupplier($order);
+                break;
+            case 'assigned_to':
+                $assets->OrderAssigned($order);
+                break;
+            default:
+                $assets->orderBy($column_sort, $order);
+                break;
+        }

        return redirect()->back()->with('error', 'No action selected');
    }
@@ -224,25 +206,13 @@ class BulkAssetsController extends Controller
        $error_array = array();

        // Get the back url from the session and then destroy the session
+        $bulk_back_url = route('hardware.index');

-        $bulk_back_url = $request->session()->pull('bulk_back_url', url()->previous());
-
-       $custom_field_columns = CustomField::all()->pluck('db_column')->toArray();
-
-        // find custom field input attributes that start with 'null_'
-        $null_custom_fields_inputs = array_filter($request->all(), function ($key) {
-            // filter out all keys that start with 'null_'
-            return (strpos($key, 'null_') === 0);
-        }, ARRAY_FILTER_USE_KEY);;
-        // remove 'null' from the keys
-        $custom_fields_to_null = [];
-        foreach ($null_custom_fields_inputs as $key => $value) {
-            $custom_fields_to_null[str_replace('null', '', $key)] = $value;
+        if ($request->session()->has('bulk_back_url')) {
+            $bulk_back_url = $request->session()->pull('bulk_back_url');
        }

-
-
-
+       $custom_field_columns = CustomField::all()->pluck('db_column')->toArray();

     
        if (! $request->filled('ids') || count($request->input('ids')) == 0) {
@@ -281,9 +251,7 @@ class BulkAssetsController extends Controller
            || ($request->filled('null_expected_checkin_date'))
            || ($request->filled('null_next_audit_date'))
            || ($request->filled('null_asset_eol_date'))
-            || ($request->filled('null_notes'))
            || ($request->anyFilled($custom_field_columns))
-            || ($request->anyFilled(array_keys($null_custom_fields_inputs)))

        ) {
            // Let's loop through those assets and build an update array
@@ -306,14 +274,10 @@ class BulkAssetsController extends Controller
                    ->conditionallyAddItem('supplier_id')
                    ->conditionallyAddItem('warranty_months')
                    ->conditionallyAddItem('next_audit_date')
-                    ->conditionallyAddItem('asset_eol_date')
-                    ->conditionallyAddItem('notes');
+                    ->conditionallyAddItem('asset_eol_date');
                    foreach ($custom_field_columns as $key => $custom_field_column) {
                        $this->conditionallyAddItem($custom_field_column); 
                   }
-                foreach ($custom_fields_to_null as $key => $custom_field_to_null) {
-                    $this->conditionallyAddItem($key);
-                }

                if (!($asset->eol_explicit)) {
 					if ($request->filled('model_id')) {
@@ -364,10 +328,6 @@ class BulkAssetsController extends Controller
                    }
                }

-                if ($request->input('null_notes')=='1') {
-                    $this->update_array['notes'] = null;
-                }
-


                if ($request->filled('purchase_cost')) {
@@ -408,12 +368,10 @@ class BulkAssetsController extends Controller
                    // This could probably be added to a form request.
                    // If the asset isn't assigned, we don't care what the status is.
                    // Otherwise we need to make sure the status type is still a deployable one.
-
-                    $unassigned = $asset->assigned_to == '';
-                    $deployable = $updated_status->deployable == '1' && $asset->assetstatus?->deployable == '1';
-                    $pending =  $updated_status->pending === 1;
-
-                    if ($unassigned || $deployable || $pending) {
+                    if (
+                        ($asset->assigned_to == '')
+                        || ($updated_status->deployable == '1') && ($asset->assetstatus?->deployable == '1')
+                    ) {
                        $this->update_array['status_id'] = $updated_status->id;
                    }

@@ -465,7 +423,6 @@ class BulkAssetsController extends Controller
                }

                /**
-                 *
                 * Start all the custom fields shenanigans
                 */

@@ -473,15 +430,6 @@ class BulkAssetsController extends Controller
                if ($asset->model->fieldset) {
                    foreach ($asset->model->fieldset->fields as $field) {

-                        // null custom fields
-                        if ($custom_fields_to_null) {
-                            foreach ($custom_fields_to_null as $key => $custom_field_to_null) {
-                                if ($field->db_column == $key) {
-                                    $this->update_array[$field->db_column] = null;
-                                }
-                            }
-                        }
-
                        if ((array_key_exists($field->db_column, $this->update_array)) && ($field->field_encrypted == '1')) {
                            if (Gate::allows('admin')) {
                                $decrypted_old = Helper::gracefulDecrypt($field, $asset->{$field->db_column});
@@ -540,13 +488,7 @@ class BulkAssetsController extends Controller
            } // end asset foreach

            if ($has_errors > 0) {
-                session()->put('bulkedit_ids', $request->input('ids'));
-                session()->put('bulk_asset_errors',$error_array);
-
-                return redirect()
-                    ->route('hardware.index')
-                    ->with('bulk_asset_errors', $error_array)
-                    ->withInput();
+                return redirect($bulk_back_url)->with('bulk_asset_errors', $error_array);
            }

            return redirect($bulk_back_url)->with('success', trans('admin/hardware/message.update.success'));
@@ -620,10 +562,7 @@ class BulkAssetsController extends Controller
    public function showCheckout() : View
    {
        $this->authorize('checkout', Asset::class);
-
-        $do_not_change = ['' => trans('general.do_not_change')];
-        $status_label_list = $do_not_change + Helper::deployableStatusLabelList();
-        return view('hardware/bulk-checkout')->with('statusLabel_list', $status_label_list);
+        return view('hardware/bulk-checkout');
    }

    /**
@@ -655,13 +594,13 @@ class BulkAssetsController extends Controller
            }
            $checkout_at = date('Y-m-d H:i:s');
            if (($request->filled('checkout_at')) && ($request->get('checkout_at') != date('Y-m-d'))) {
-                $checkout_at = $request->get('checkout_at');
+                $checkout_at = e($request->get('checkout_at'));
            }

            $expected_checkin = '';

            if ($request->filled('expected_checkin')) {
-                $expected_checkin = $request->get('expected_checkin');
+                $expected_checkin = e($request->get('expected_checkin'));
            }

            $errors = [];
@@ -669,11 +608,6 @@ class BulkAssetsController extends Controller
                foreach ($assets as $asset) {
                    $this->authorize('checkout', $asset);

-                    // See if there is a status label passed
-                    if ($request->filled('status_id')) {
-                        $asset->status_id = $request->get('status_id');
-                    }
-
                    $checkout_success = $asset->checkOut($target, $admin, $checkout_at, $expected_checkin, e($request->get('note')), $asset->name, null);

                    //TODO - I think this logic is duplicated in the checkOut method?
@@ -717,54 +651,4 @@ class BulkAssetsController extends Controller
            return redirect()->route('hardware.index')->with('success', trans('admin/hardware/message.restore.success'));
        }
    }
-    public function hasUndeployableStatus (array $asset_ids)
-    {
-        $undeployable = Asset::whereIn('id', $asset_ids)
-            ->undeployable()
-            ->get();
-
-        $undeployableTags = $undeployable->map(function ($asset) {
-            return [
-                'id' => $asset->id,
-                'asset_tag' => $asset->asset_tag,
-            ];
-        })->toArray();
-
-        $undeployableIds = array_column($undeployableTags, 'id');
-        $filtered_ids = array_diff($asset_ids, $undeployableIds);
-
-         if($undeployable->isNotEmpty()) {
-             return ['status' => true, 'tags' => $undeployableTags, 'asset_ids' => $filtered_ids];
-         }
-        return false;
-    }
-
-    public function bulkEditForm(): View|RedirectResponse
-    {
-        $this->authorize('update', Asset::class);
-
-        $asset_ids = session()->pull('bulkedit_ids', []);
-
-        if (empty($asset_ids)) {
-            return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.update.no_assets_selected'));
-        }
-
-        $assets = Asset::with('model')->withTrashed()->whereIn('id', $asset_ids)->get();
-
-        if ($assets->isEmpty()) {
-            return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.update.assets_do_not_exist_or_are_invalid'));
-        }
-
-        $models = $assets->unique('model_id');
-        $modelNames = [];
-        foreach ($models as $model) {
-            $modelNames[] = $model->model->name;
-        }
-
-        return view('hardware/bulk')
-            ->with('assets', $asset_ids)
-            ->with('statuslabel_list', Helper::statusLabelList())
-            ->with('models', $models->pluck(['model']))
-            ->with('modelNames', $modelNames);
-    }
 }
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -484,7 +484,6 @@ 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
@@ -68,7 +68,6 @@ class CategoriesController extends Controller
        $category->eula_text = $request->input('eula_text');
        $category->use_default_eula = $request->input('use_default_eula', '0');
        $category->require_acceptance = $request->input('require_acceptance', '0');
-        $category->alert_on_response = $request->input('alert_on_response', '0');
        $category->checkin_email = $request->input('checkin_email', '0');
        $category->notes = $request->input('notes');
        $category->created_by = auth()->id();
@@ -122,7 +121,6 @@ class CategoriesController extends Controller
        $category->eula_text = $request->input('eula_text');
        $category->use_default_eula = $request->input('use_default_eula', '0');
        $category->require_acceptance = $request->input('require_acceptance', '0');
-        $category->alert_on_response = $request->input('alert_on_response', '0');
        $category->checkin_email = $request->input('checkin_email', '0');
        $category->notes = $request->input('notes');

@@ -147,7 +145,7 @@ class CategoriesController extends Controller
    {
        $this->authorize('delete', Category::class);
        // Check if the category exists
-        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))) {
+        if (is_null($category = Category::findOrFail($categoryId))) {
            return redirect()->route('categories.index')->with('error', trans('admin/categories/message.not_found'));
        }

@@ -157,6 +155,7 @@ 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/CompaniesController.php
+++ b/app/Http/Controllers/CompaniesController.php
@@ -123,13 +123,11 @@ final class CompaniesController extends Controller
     */
    public function destroy($companyId) : RedirectResponse
    {
-
        if (is_null($company = Company::find($companyId))) {
            return redirect()->route('companies.index')
                ->with('error', trans('admin/companies/message.not_found'));
        }

-
        $this->authorize('delete', $company);
        if (! $company->isDeletable()) {
            return redirect()->route('companies.index')
--- a/app/Http/Controllers/Components/ComponentCheckinController.php
+++ b/app/Http/Controllers/Components/ComponentCheckinController.php
@@ -100,8 +100,8 @@ class ComponentCheckinController extends Controller

            session()->put(['redirect_option' => $request->get('redirect_option')]);

-            return Helper::getRedirectOption($request, $component->id, 'Components')
-                ->with('success', trans('admin/components/message.checkin.success'));
+            return redirect()->to(Helper::getRedirectOption($request, $component->id, 'Components'))->with('success',
+                trans('admin/components/message.checkin.success'));
        }

        return redirect()->route('components.index')->with('error', trans('admin/components/message.does_not_exist'));
--- a/app/Http/Controllers/Components/ComponentCheckoutController.php
+++ b/app/Http/Controllers/Components/ComponentCheckoutController.php
@@ -120,7 +120,6 @@ class ComponentCheckoutController extends Controller

        session()->put(['redirect_option' => $request->get('redirect_option'), 'checkout_to_type' => $request->get('checkout_to_type')]);

-        return Helper::getRedirectOption($request, $component->id, 'Components')
-            ->with('success', trans('admin/components/message.checkout.success'));
+        return redirect()->to(Helper::getRedirectOption($request, $component->id, 'Components'))->with('success', trans('admin/components/message.checkout.success'));
    }
 }
--- a/app/Http/Controllers/Components/ComponentsController.php
+++ b/app/Http/Controllers/Components/ComponentsController.php
@@ -88,16 +88,10 @@ class ComponentsController extends Controller

        $component = $request->handleImages($component);

-        if($request->get('redirect_option') === 'back'){
-            session()->put(['redirect_option' => 'index']);
-        } else {
        session()->put(['redirect_option' => $request->get('redirect_option')]);
-        }
-

        if ($component->save()) {
-            return Helper::getRedirectOption($request, $component->id, 'Components')
-                ->with('success', trans('admin/components/message.create.success'));
+            return redirect()->to(Helper::getRedirectOption($request, $component->id, 'Components'))->with('success', trans('admin/components/message.create.success'));
        }

        return redirect()->back()->withInput()->withErrors($component->getErrors());
@@ -117,7 +111,6 @@ class ComponentsController extends Controller
    {

            $this->authorize('update', $component);
-            session()->put('back_url', url()->previous());
            return view('components/edit')
                ->with('item', $component)
                ->with('category_type', 'component');
@@ -171,8 +164,7 @@ class ComponentsController extends Controller
        session()->put(['redirect_option' => $request->get('redirect_option')]);

        if ($component->save()) {
-            return Helper::getRedirectOption($request, $component->id, 'Components')
-                ->with('success', trans('admin/components/message.update.success'));
+            return redirect()->to(Helper::getRedirectOption($request, $component->id, 'Components'))->with('success', trans('admin/components/message.update.success'));
        }

        return redirect()->back()->withInput()->withErrors($component->getErrors());
--- a/app/Http/Controllers/Components/ComponentsFilesController.php
+++ b/app/Http/Controllers/Components/ComponentsFilesController.php
@@ -0,0 +1,138 @@
+<?php
+
+namespace App\Http\Controllers\Components;
+
+use App\Helpers\StorageHelper;
+use App\Http\Controllers\Controller;
+use App\Http\Requests\UploadFileRequest;
+use App\Models\Actionlog;
+use App\Models\Component;
+use Illuminate\Support\Facades\Response;
+use Illuminate\Support\Facades\Storage;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Illuminate\Support\Facades\Log;
+
+class ComponentsFilesController extends Controller
+{
+    /**
+     * Validates and stores files associated with a component.
+     *
+     * @param UploadFileRequest $request
+     * @param int $componentId
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
+     *@author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v1.0]
+     * @todo Switch to using the AssetFileRequest form request validator.
+     */
+    public function store(UploadFileRequest $request, $componentId = null)
+    {
+
+        if (config('app.lock_passwords')) {
+            return redirect()->route('components.show', ['component'=>$componentId])->with('error', trans('general.feature_disabled'));
+        }
+
+        $component = Component::find($componentId);
+
+        if (isset($component->id)) {
+            $this->authorize('update', $component);
+
+            if ($request->hasFile('file')) {
+                if (! Storage::exists('private_uploads/components')) {
+                    Storage::makeDirectory('private_uploads/components', 775);
+                }
+
+                foreach ($request->file('file') as $file) {
+                    $file_name = $request->handleFile('private_uploads/components/','component-'.$component->id, $file);
+
+                    //Log the upload to the log
+                    $component->logUpload($file_name, e($request->input('notes')));
+                }
+
+
+                return redirect()->route('components.show', $component->id)->withFragment('files')->with('success', trans('general.file_upload_success'));
+
+            }
+
+            return redirect()->route('components.show', $component->id)->with('error', trans('general.no_files_uploaded'));
+        }
+        // Prepare the error message
+        return redirect()->route('components.index')
+            ->with('error', trans('general.file_does_not_exist'));
+    }
+
+    /**
+     * Deletes the selected component file.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v1.0]
+     * @param int $componentId
+     * @param int $fileId
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
+     */
+    public function destroy($componentId = null, $fileId = null)
+    {
+        $component = Component::find($componentId);
+
+        // the asset is valid
+        if (isset($component->id)) {
+            $this->authorize('update', $component);
+            $log = Actionlog::find($fileId);
+
+            // Remove the file if one exists
+            if (Storage::exists('components/'.$log->filename)) {
+                try {
+                    Storage::delete('components/'.$log->filename);
+                } catch (\Exception $e) {
+                    Log::debug($e);
+                }
+            }
+
+            $log->delete();
+
+            return redirect()->back()->withFragment('files')
+                ->with('success', trans('admin/hardware/message.deletefile.success'));
+        }
+
+        // Redirect to the licence management page
+        return redirect()->route('components.index')->with('error', trans('general.file_does_not_exist'));
+    }
+
+    /**
+     * Allows the selected file to be viewed.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v1.4]
+     * @param int $componentId
+     * @param int $fileId
+     * @return \Symfony\Component\HttpFoundation\Response
+     * @throws \Illuminate\Auth\Access\AuthorizationException
+     */
+    public function show($componentId = null, $fileId = null)
+    {
+        Log::debug('Private filesystem is: '.config('filesystems.default'));
+
+
+        // the component is valid
+        if ($component = Component::find($componentId)) {
+            $this->authorize('view', $component);
+            $this->authorize('components.files', $component);
+
+            if ($log = Actionlog::whereNotNull('filename')->where('item_id', $component->id)->find($fileId)) {
+
+                $file = 'private_uploads/components/'.$log->filename;
+
+                try {
+                    return StorageHelper::showOrDownloadFile($file, $log->filename);
+                } catch (\Exception $e) {
+                    return redirect()->route('components.show', ['component' => $component])->with('error',  trans('general.file_not_found'));
+                }
+            }
+            return redirect()->route('components.show', ['component' => $component])->with('error',  trans('general.log_record_not_found'));
+
+        }
+
+        return redirect()->route('components.index')->with('error', trans('general.file_does_not_exist', ['id' => $fileId]));
+    }
+}
--- a/app/Http/Controllers/Consumables/ConsumableCheckoutController.php
+++ b/app/Http/Controllers/Consumables/ConsumableCheckoutController.php
@@ -111,7 +111,6 @@ class ConsumableCheckoutController extends Controller


        // Redirect to the new consumable page
-        return Helper::getRedirectOption($request, $consumable->id, 'Consumables')
-            ->with('success', trans('admin/consumables/message.checkout.success'));
+        return redirect()->to(Helper::getRedirectOption($request, $consumable->id, 'Consumables'))->with('success', trans('admin/consumables/message.checkout.success'));
    }
 }
--- a/app/Http/Controllers/Consumables/ConsumablesController.php
+++ b/app/Http/Controllers/Consumables/ConsumablesController.php
@@ -7,7 +7,7 @@ use App\Http\Controllers\Controller;
 use App\Http\Requests\ImageUploadRequest;
 use App\Models\Company;
 use App\Models\Consumable;
-use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Http\RedirectResponse;
 use \Illuminate\Contracts\View\View;
@@ -85,29 +85,12 @@ class ConsumablesController extends Controller
        $consumable->notes                  = $request->input('notes');


-        if ($request->has('use_cloned_image')) {
-            $cloned_model_img = Consumable::select('image')->find($request->input('clone_image_from_id'));
-            if ($cloned_model_img) {
-                $new_image_name = 'clone-'.date('U').'-'.$cloned_model_img->image;
-                $new_image = 'consumables/'.$new_image_name;
-                Storage::disk('public')->copy('consumables/'.$cloned_model_img->image, $new_image);
-                $consumable->image = $new_image_name;
-            }
-
-        } else {
        $consumable = $request->handleImages($consumable);
-        }

-        if($request->get('redirect_option') === 'back'){
-            session()->put(['redirect_option' => 'index']);
-        } else {
        session()->put(['redirect_option' => $request->get('redirect_option')]);
-        }
-

        if ($consumable->save()) {
-            return Helper::getRedirectOption($request, $consumable->id, 'Consumables')
-                ->with('success', trans('admin/consumables/message.create.success'));
+            return redirect()->to(Helper::getRedirectOption($request, $consumable->id, 'Consumables'))->with('success', trans('admin/consumables/message.create.success'));
        }

        return redirect()->back()->withInput()->withErrors($consumable->getErrors());
@@ -124,7 +107,6 @@ class ConsumablesController extends Controller
    public function edit(Consumable $consumable) : View | RedirectResponse
    {
            $this->authorize($consumable);
-            session()->put('back_url', url()->previous());
            return view('consumables/edit')
                ->with('item', $consumable)
                ->with('category_type', 'consumable');
@@ -178,8 +160,7 @@ class ConsumablesController extends Controller
        session()->put(['redirect_option' => $request->get('redirect_option')]);

        if ($consumable->save()) {
-            return Helper::getRedirectOption($request, $consumable->id, 'Consumables')
-                ->with('success', trans('admin/consumables/message.update.success'));
+            return redirect()->to(Helper::getRedirectOption($request, $consumable->id, 'Consumables'))->with('success', trans('admin/consumables/message.update.success'));
        }

        return redirect()->back()->withInput()->withErrors($consumable->getErrors());
@@ -229,10 +210,9 @@ class ConsumablesController extends Controller
        $consumable_to_close = $consumable;
        $consumable = clone $consumable_to_close;
        $consumable->id = null;
+        $consumable->image = null;
        $consumable->created_by = null;

-        return view('consumables/edit')
-            ->with('cloned_model', $consumable_to_close)
-            ->with('item', $consumable);
+        return view('consumables/edit')->with('item', $consumable);
    }
 }
--- a/app/Http/Controllers/Consumables/ConsumablesFilesController.php
+++ b/app/Http/Controllers/Consumables/ConsumablesFilesController.php
@@ -0,0 +1,134 @@
+<?php
+
+namespace App\Http\Controllers\Consumables;
+
+use App\Helpers\StorageHelper;
+use App\Http\Controllers\Controller;
+use App\Http\Requests\UploadFileRequest;
+use App\Models\Actionlog;
+use App\Models\Consumable;
+use Illuminate\Support\Facades\Response;
+use Illuminate\Support\Facades\Storage;
+use Symfony\Consumable\HttpFoundation\JsonResponse;
+use Illuminate\Support\Facades\Log;
+class ConsumablesFilesController extends Controller
+{
+    /**
+     * Validates and stores files associated with a consumable.
+     *
+     * @param UploadFileRequest $request
+     * @param int $consumableId
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
+     *@author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v1.0]
+     * @todo Switch to using the AssetFileRequest form request validator.
+     */
+    public function store(UploadFileRequest $request, $consumableId = null)
+    {
+        if (config('app.lock_passwords')) {
+            return redirect()->route('consumables.show', ['consumable'=>$consumableId])->with('error', trans('general.feature_disabled'));
+        }
+
+        $consumable = Consumable::find($consumableId);
+
+        if (isset($consumable->id)) {
+            $this->authorize('update', $consumable);
+
+            if ($request->hasFile('file')) {
+                if (! Storage::exists('private_uploads/consumables')) {
+                    Storage::makeDirectory('private_uploads/consumables', 775);
+                }
+
+                foreach ($request->file('file') as $file) {
+                    $file_name = $request->handleFile('private_uploads/consumables/','consumable-'.$consumable->id, $file);
+
+                    //Log the upload to the log
+                    $consumable->logUpload($file_name, e($request->input('notes')));
+                }
+
+
+                return redirect()->route('consumables.show', $consumable->id)->withFragment('files')->with('success', trans('general.file_upload_success'));
+
+            }
+
+            return redirect()->route('consumables.show', $consumable->id)->with('error', trans('general.no_files_uploaded'));
+        }
+        // Prepare the error message
+        return redirect()->route('consumables.index')
+            ->with('error', trans('general.file_does_not_exist'));
+    }
+
+    /**
+     * Deletes the selected consumable file.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v1.0]
+     * @param int $consumableId
+     * @param int $fileId
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
+     */
+    public function destroy($consumableId = null, $fileId = null)
+    {
+        $consumable = Consumable::find($consumableId);
+
+        // the asset is valid
+        if (isset($consumable->id)) {
+            $this->authorize('update', $consumable);
+            $log = Actionlog::find($fileId);
+
+            // Remove the file if one exists
+            if (Storage::exists('consumables/'.$log->filename)) {
+                try {
+                    Storage::delete('consumables/'.$log->filename);
+                } catch (\Exception $e) {
+                    Log::debug($e);
+                }
+            }
+
+            $log->delete();
+
+            return redirect()->back()->withFragment('files')
+                ->with('success', trans('admin/hardware/message.deletefile.success'));
+        }
+
+        // Redirect to the licence management page
+        return redirect()->route('consumables.index')->with('error', trans('general.file_does_not_exist'));
+    }
+
+    /**
+     * Allows the selected file to be viewed.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v1.4]
+     * @param int $consumableId
+     * @param int $fileId
+     * @throws \Illuminate\Auth\Access\AuthorizationException
+     */
+    public function show($consumableId = null, $fileId = null)
+    {
+        $consumable = Consumable::find($consumableId);
+
+        // the consumable is valid
+        if (isset($consumable->id)) {
+            $this->authorize('view', $consumable);
+            $this->authorize('consumables.files', $consumable);
+
+            if ($log = Actionlog::whereNotNull('filename')->where('item_id', $consumable->id)->find($fileId)) {
+                $file = 'private_uploads/consumables/'.$log->filename;
+
+                try {
+                    return StorageHelper::showOrDownloadFile($file, $log->filename);
+                } catch (\Exception $e) {
+                    return redirect()->route('consumables.show', ['consumable' => $consumable])->with('error',  trans('general.file_not_found'));
+                }
+            }
+            // The log record doesn't exist somehow
+            return redirect()->route('consumables.show', ['consumable' => $consumable])->with('error',  trans('general.log_record_not_found'));
+
+        }
+
+        return redirect()->route('consumables.index')->with('error', trans('general.file_does_not_exist', ['id' => $fileId]));
+    }
+}
--- a/app/Http/Controllers/Controller.php
+++ b/app/Http/Controllers/Controller.php
@@ -22,15 +22,6 @@

 namespace App\Http\Controllers;

-use App\Models\Accessory;
-use App\Models\Asset;
-use App\Models\AssetModel;
-use App\Models\Component;
-use App\Models\Consumable;
-use App\Models\License;
-use App\Models\Location;
-use App\Models\Maintenance;
-use App\Models\User;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Foundation\Bus\DispatchesJobs;
@@ -41,45 +32,6 @@ abstract class Controller extends BaseController
 {
    use AuthorizesRequests, DispatchesJobs, ValidatesRequests;

-    static $map_object_type = [
-        'accessories' => Accessory::class,
-        'maintenances' => Maintenance::class,
-        'assets' => Asset::class,
-        'components' => Component::class,
-        'consumables' => Consumable::class,
-        'hardware' => Asset::class,
-        'licenses' => License::class,
-        'locations' => Location::class,
-        'models' => AssetModel::class,
-        'users' => User::class,
-    ];
-
-    static $map_storage_path = [
-        'accessories' => 'private_uploads/accessories/',
-        'maintenances' => 'private_uploads/maintenances/',
-        'assets' => 'private_uploads/assets/',
-        'components' => 'private_uploads/components/',
-        'consumables' => 'private_uploads/consumables/',
-        'hardware' => 'private_uploads/assets/',
-        'licenses' => 'private_uploads/licenses/',
-        'locations' => 'private_uploads/locations/',
-        'models' => 'private_uploads/models/',
-        'users' => 'private_uploads/users/',
-    ];
-
-    static $map_file_prefix= [
-        'accessories' => 'accessory',
-        'maintenances' => 'maintenance',
-        'assets' => 'asset',
-        'components' => 'component',
-        'consumables' => 'consumable',
-        'hardware' => 'asset',
-        'licenses' => 'license',
-        'locations' => 'location',
-        'models' => 'model',
-        'users' => 'user',
-    ];
-
    public function __construct()
    {
        view()->share('signedIn', Auth::check());
--- 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->input("show_in_email", 0);
-        $display_in_user_view = $request->input("display_in_user_view", 0);
+        $show_in_email = $request->get("show_in_email", 0);
+        $display_in_user_view = $request->get("display_in_user_view", 0);

        // Override the display settings if the field is encrypted
-        if ($request->input("field_encrypted") == '1') {
+        if ($request->get("field_encrypted") == '1') {
            $show_in_email = '0';
            $display_in_user_view = '0';
        }

        $field = new CustomField([
-            "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),
+            "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),
            "show_in_email" => $show_in_email,
-            "is_unique" => $request->input("is_unique", 0),
+            "is_unique" => $request->get("is_unique", 0),
            "display_in_user_view" => $display_in_user_view,
-            "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),
+            "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),
            "created_by" => auth()->id()
        ]);

@@ -144,9 +144,10 @@ class CustomFieldsController extends Controller
     */
    public function deleteFieldFromFieldset($field_id, $fieldset_id) : RedirectResponse
    {
-        $this->authorize('update', CustomField::class);
        $field = CustomField::find($field_id);

+        $this->authorize('update', $field);
+
        // Check that the field exists - this is mostly related to the demo, where we 
        // rewrite the data every x minutes, so it's possible someone might be disassociating 
        // a field from a fieldset just as we're wiping the database
@@ -156,12 +157,11 @@ class CustomFieldsController extends Controller
            return redirect()->route('fieldsets.show', ['fieldset' => $fieldset_id])
                ->with('success', trans('admin/custom_fields/message.field.delete.success'));
            } else {
-                return redirect()->back()->with('error', trans('admin/custom_fields/message.field.delete.error'))
-                    ->withInput();
+                return redirect()->back()->withErrors(['message' => "Field is in use and cannot be deleted."]);
            }
        }

-        return redirect()->back()->with('error', trans('admin/custom_fields/message.field.delete.error'));
+        return redirect()->back()->withErrors(['message' => "Error deleting field from fieldset"]);

       
    }
@@ -172,18 +172,22 @@ class CustomFieldsController extends Controller
     * @author [Brady Wetherington] [<uberbrady@gmail.com>]
     * @since [v1.8]
     */
-    public function destroy(CustomField $field) : RedirectResponse
+    public function destroy($field_id) : RedirectResponse
    {
-        $this->authorize('delete', CustomField::class);
+        if ($field = CustomField::find($field_id)) {
+            $this->authorize('delete', $field);

            if (($field->fieldset) && ($field->fieldset->count() > 0)) {
-            return redirect()->back()->with('error', trans('admin/custom_fields/message.field.delete.in_use'));
+                return redirect()->back()->withErrors(['message' => 'Field is in-use']);
            }
            $field->delete();
            return redirect()->route("fields.index")
                ->with("success", trans('admin/custom_fields/message.field.delete.success'));
        }

+        return redirect()->back()->withErrors(['message' => 'Field does not exist']);
+    }
+

    /**
     * Return a view to edit a custom field
@@ -194,7 +198,7 @@ class CustomFieldsController extends Controller
     */
    public function edit(Request $request, CustomField $field) : View | RedirectResponse
    {
-        $this->authorize('update', CustomField::class);
+        $this->authorize('update', $field);
        $fieldsets = CustomFieldset::get();
        $customFormat = '';
        if ((stripos($field->format, 'regex') === 0) && ($field->format !== CustomField::PREDEFINED_FORMATS['MAC'])) {
@@ -224,7 +228,7 @@ class CustomFieldsController extends Controller
     */
    public function update(CustomFieldRequest $request, CustomField $field) : RedirectResponse
    {
-        $this->authorize('update', CustomField::class);
+        $this->authorize('update', $field);
        $show_in_email = $request->get("show_in_email", 0);
        $display_in_user_view = $request->get("display_in_user_view", 0);

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

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

        if ($field->element == 'checkbox' || $field->element == 'radio'){
@@ -261,6 +265,7 @@ class CustomFieldsController extends Controller

        if ($field->save()) {

+
            // Sync fields with fieldsets
            $fieldset_array = $request->input('associate_fieldsets');
            if ($request->has('associate_fieldsets') && (is_array($fieldset_array))) {
--- a/app/Http/Controllers/Licenses/LicenseCheckinController.php
+++ b/app/Http/Controllers/Licenses/LicenseCheckinController.php
@@ -86,10 +86,8 @@ class LicenseCheckinController extends Controller
        }

        if($licenseSeat->assigned_to != null){
-            $return_to = User::withTrashed()->find($licenseSeat->assigned_to);
-            if ($return_to) {
+            $return_to = User::find($licenseSeat->assigned_to);
            session()->put('checkedInFrom', $return_to->id);
-            }
        } else {
            $return_to = Asset::find($licenseSeat->asset_id);
        }
@@ -100,17 +98,14 @@ class LicenseCheckinController extends Controller
        $licenseSeat->notes = $request->input('notes');

        session()->put(['redirect_option' => $request->get('redirect_option')]);
-        if ($request->get('redirect_option') === 'target'){
-            session()->put(['checkout_to_type' => 'user']);
-        }
+

        // Was the asset updated?
        if ($licenseSeat->save()) {
            event(new CheckoutableCheckedIn($licenseSeat, $return_to, auth()->user(), $request->input('notes')));


-            return Helper::getRedirectOption($request, $license->id, 'Licenses')
-                ->with('success', trans('admin/licenses/message.checkin.success'));
+            return redirect()->to(Helper::getRedirectOption($request, $license->id, 'Licenses'))->with('success', trans('admin/licenses/message.checkin.success'));
        }

        // Redirect to the license page with error
--- a/app/Http/Controllers/Licenses/LicenseCheckoutController.php
+++ b/app/Http/Controllers/Licenses/LicenseCheckoutController.php
@@ -89,8 +89,7 @@ class LicenseCheckoutController extends Controller


        if ($checkoutTarget) {
-            return Helper::getRedirectOption($request, $license->id, 'Licenses')
-                ->with('success', trans('admin/licenses/message.checkout.success'));
+            return redirect()->to(Helper::getRedirectOption($request, $license->id, 'Licenses'))->with('success', trans('admin/licenses/message.checkout.success'));
        }


--- a/app/Http/Controllers/Licenses/LicenseFilesController.php
+++ b/app/Http/Controllers/Licenses/LicenseFilesController.php
@@ -0,0 +1,132 @@
+<?php
+
+namespace App\Http\Controllers\Licenses;
+
+use App\Helpers\StorageHelper;
+use App\Http\Controllers\Controller;
+use App\Http\Requests\UploadFileRequest;
+use App\Models\Actionlog;
+use App\Models\License;
+use Illuminate\Support\Facades\Storage;
+use Illuminate\Support\Facades\Log;
+
+class LicenseFilesController extends Controller
+{
+    /**
+     * Validates and stores files associated with a license.
+     *
+     * @param UploadFileRequest $request
+     * @param int $licenseId
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v1.0]
+     * @todo Switch to using the AssetFileRequest form request validator.
+     */
+    public function store(UploadFileRequest $request, $licenseId = null)
+    {
+        $license = License::find($licenseId);
+
+        if (isset($license->id)) {
+            $this->authorize('update', $license);
+
+            if ($request->hasFile('file')) {
+                if (! Storage::exists('private_uploads/licenses')) {
+                    Storage::makeDirectory('private_uploads/licenses', 775);
+                }
+
+                foreach ($request->file('file') as $file) {
+                    $file_name = $request->handleFile('private_uploads/licenses/','license-'.$license->id, $file);
+
+                    //Log the upload to the log
+                    $license->logUpload($file_name, e($request->input('notes')));
+                }
+
+
+                    return redirect()->route('licenses.show', $license->id)->with('success', trans('admin/licenses/message.upload.success'));
+
+            }
+
+            return redirect()->route('licenses.show', $license->id)->with('error', trans('admin/licenses/message.upload.nofiles'));
+        }
+        // Prepare the error message
+        return redirect()->route('licenses.index')
+            ->with('error', trans('admin/licenses/message.does_not_exist'));
+    }
+
+    /**
+     * Deletes the selected license file.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v1.0]
+     * @param int $licenseId
+     * @param int $fileId
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
+     */
+    public function destroy($licenseId = null, $fileId = null)
+    {
+        if ($license = License::find($licenseId)) {
+
+            $this->authorize('update', $license);
+
+            if ($log = Actionlog::find($fileId)) {
+
+                // Remove the file if one exists
+                if (Storage::exists('licenses/'.$log->filename)) {
+                    try {
+                        Storage::delete('licenses/'.$log->filename);
+                    } catch (\Exception $e) {
+                        Log::debug($e);
+                    }
+                }
+                
+                $log->delete();
+
+                return redirect()->back()
+                    ->with('success', trans('admin/hardware/message.deletefile.success'));
+            }
+
+            return redirect()->route('licenses.index')->with('error', trans('general.log_does_not_exist'));
+        }
+
+        return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.does_not_exist'));
+    }
+
+    /**
+     * Allows the selected file to be viewed.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v1.4]
+     * @param int $licenseId
+     * @param int $fileId
+     * @return \Symfony\Component\HttpFoundation\Response
+     * @throws \Illuminate\Auth\Access\AuthorizationException
+     */
+    public function show($licenseId = null, $fileId = null, $download = true)
+    {
+        $license = License::find($licenseId);
+
+        // the license is valid
+        if (isset($license->id)) {
+            $this->authorize('view', $license);
+            $this->authorize('licenses.files', $license);
+
+            if ($log = Actionlog::whereNotNull('filename')->where('item_id', $license->id)->find($fileId)) {
+                $file = 'private_uploads/licenses/'.$log->filename;
+
+                try {
+                    return StorageHelper::showOrDownloadFile($file, $log->filename);
+                } catch (\Exception $e) {
+                    return redirect()->route('licenses.show', ['licenses' => $license])->with('error',  trans('general.file_not_found'));
+                }
+            }
+
+            // The log record doesn't exist somehow
+            return redirect()->route('licenses.show', ['licenses' => $license])->with('error',  trans('general.log_record_not_found'));
+
+        }
+
+        return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.does_not_exist', ['id' => $fileId]));
+    }
+}
--- a/app/Http/Controllers/Licenses/LicensesController.php
+++ b/app/Http/Controllers/Licenses/LicensesController.php
@@ -102,15 +102,10 @@ class LicensesController extends Controller
        $license->created_by           = auth()->id();
        $license->min_amt           = $request->input('min_amt');

-        if($request->get('redirect_option') === 'back'){
-            session()->put(['redirect_option' => 'index']);
-        } else {
        session()->put(['redirect_option' => $request->get('redirect_option')]);
-        }

        if ($license->save()) {
-            return Helper::getRedirectOption($request, $license->id, 'Licenses')
-                ->with('success', trans('admin/licenses/message.create.success'));
+            return redirect()->to(Helper::getRedirectOption($request, $license->id, 'Licenses'))->with('success', trans('admin/licenses/message.create.success'));
        }

        return redirect()->back()->withInput()->withErrors($license->getErrors());
@@ -130,7 +125,7 @@ class LicensesController extends Controller
    {

        $this->authorize('update', $license);
-        session()->put('back_url', url()->previous());
+
        $maintained_list = [
            '' => 'Maintained',
            '1' => 'Yes',
@@ -186,8 +181,7 @@ class LicensesController extends Controller
        session()->put(['redirect_option' => $request->get('redirect_option')]);

        if ($license->save()) {
-            return Helper::getRedirectOption($request, $license->id, 'Licenses')
-                ->with('success', trans('admin/licenses/message.update.success'));
+            return redirect()->to(Helper::getRedirectOption($request, $license->id, 'Licenses'))->with('success', trans('admin/licenses/message.update.success'));
        }
        // If we can't adjust the number of seats, the error is flashed to the session by the event handler in License.php
        return redirect()->back()->withInput()->withErrors($license->getErrors());
@@ -308,16 +302,13 @@ class LicensesController extends Controller
        $response = new StreamedResponse(function () {
            // Open output stream
            $handle = fopen('php://output', 'w');
-            $licenses = License::with('company',
+            $licenses= License::with('company',
                          'manufacturer',
                          'category',
                          'supplier',
                          'adminuser',
-                          'assignedusers');
-            if (request()->filled('category_id')) {
-                $licenses = $licenses->where('category_id', request()->input('category_id'));
-            }
-            $licenses = $licenses->orderBy('created_at', 'DESC');
+                          'assignedusers')
+                          ->orderBy('created_at', 'DESC');
            Company::scopeCompanyables($licenses)
                ->chunk(500, function ($licenses) use ($handle) {
                    $headers = [
@@ -364,7 +355,7 @@ class LicensesController extends Controller
                            $license->order_number,
                            $license->free_seat_count,
                            $license->seats,
-                            ($license->adminuser ? $license->adminuser->display_name : trans('admin/reports/general.deleted_user')),
+                            ($license->adminuser ? $license->adminuser->present()->fullName() : trans('admin/reports/general.deleted_user')),
                            $license->depreciation ? $license->depreciation->name: '',
                            $license->updated_at,
                            $license->deleted_at,
--- a/app/Http/Controllers/LocationsController.php
+++ b/app/Http/Controllers/LocationsController.php
@@ -96,18 +96,7 @@ class LocationsController extends Controller
            $location->company_id = $request->input('company_id');
        }

-        if ($request->has('use_cloned_image')) {
-            $cloned_model_img = Location::select('image')->find($request->input('clone_image_from_id'));
-            if ($cloned_model_img) {
-                $new_image_name = 'clone-'.date('U').'-'.$cloned_model_img->image;
-                $new_image = 'locations/'.$new_image_name;
-                Storage::disk('public')->copy('locations/'.$cloned_model_img->image, $new_image);
-                $location->image = $new_image_name;
-            }
-
-        } else {
        $location = $request->handleImages($location);
-        }

        if ($location->save()) {
            return redirect()->route('locations.index')->with('success', trans('admin/locations/message.create.success'));
@@ -286,9 +275,9 @@ class LocationsController extends Controller

        // unset these values
        $location->id = null;
+        $location->image = null;

        return view('locations/edit')
-            ->with('cloned_model', $location_to_clone)
            ->with('item', $location);
    }

--- a/app/Http/Controllers/MaintenancesController.php
+++ b/app/Http/Controllers/MaintenancesController.php
@@ -1,216 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use App\Http\Requests\ImageUploadRequest;
-use App\Models\Asset;
-use App\Models\Maintenance;
-use App\Models\Company;
-use Illuminate\Support\Facades\Auth;
-use Carbon\Carbon;
-use Illuminate\Http\Request;
-use \Illuminate\Contracts\View\View;
-use \Illuminate\Http\RedirectResponse;
-
-/**
- * This controller handles all actions related to Asset Maintenance for
- * the Snipe-IT Asset Management application.
- *
- * @version    v2.0
- */
-class MaintenancesController extends Controller
-{
-
-    /**
-    *  Returns a view that invokes the ajax tables which actually contains
-    * the content for the asset maintenances listing.
-    */
-    public function index() : View
-    {
-        $this->authorize('view', Asset::class);
-        return view('maintenances.index');
-    }
-
-    /**
-     *  Returns a form view to create a new asset maintenance.
-     *
-     * @see MaintenancesController::postCreate() method that stores the data
-     * @author  Vincent Sposato <vincent.sposato@gmail.com>
-     * @version v1.0
-     * @since [v1.8]
-     * @return mixed
-     */
-    public function create() : View
-    {
-        $this->authorize('update', Asset::class);
-        $asset = null;
-
-        if ($asset = Asset::find(request('asset_id'))) {
-            // We have to set this so that the correct property is set in the select2 ajax dropdown
-            $asset->asset_id = $asset->id;
-        }
-        
-        return view('maintenances/edit')
-                   ->with('maintenanceType', Maintenance::getImprovementOptions())
-                   ->with('asset', $asset)
-                   ->with('item', new Maintenance);
-    }
-
-    /**
-    *  Validates and stores the new asset maintenance
-    *
-    * @see MaintenancesController::getCreate() method for the form
-    * @author  Vincent Sposato <vincent.sposato@gmail.com>
-    * @version v1.0
-    * @since [v1.8]
-    */
-    public function store(ImageUploadRequest $request) : RedirectResponse
-    {
-        $this->authorize('update', Asset::class);
-
-        $assets = Asset::whereIn('id', $request->input('selected_assets'))->get();
-
-        // Loop through the selected assets
-        foreach ($assets as $asset) {
-
-            $maintenance = new Maintenance();
-            $maintenance->supplier_id = $request->input('supplier_id');
-            $maintenance->is_warranty = $request->input('is_warranty');
-            $maintenance->cost = $request->input('cost');
-            $maintenance->notes = $request->input('notes');
-
-            // Save the asset maintenance data
-            $maintenance->asset_id = $asset->id;
-            $maintenance->asset_maintenance_type = $request->input('asset_maintenance_type');
-            $maintenance->name = $request->input('name');
-            $maintenance->start_date = $request->input('start_date');
-            $maintenance->completion_date = $request->input('completion_date');
-            $maintenance->created_by = auth()->id();
-
-            if (($maintenance->completion_date !== null)
-                && ($maintenance->start_date !== '')
-                && ($maintenance->start_date !== '0000-00-00')
-            ) {
-                $startDate = Carbon::parse($maintenance->start_date);
-                $completionDate = Carbon::parse($maintenance->completion_date);
-                $maintenance->asset_maintenance_time = (int) $completionDate->diffInDays($startDate, true);
-            }
-
-            $maintenance = $request->handleImages($maintenance);
-
-            // Was the asset maintenance created?
-            if (!$maintenance->save()) {
-                return redirect()->back()->withInput()->withErrors($maintenance->getErrors());
-            }
-        }
-
-        return redirect()->route('maintenances.index')
-            ->with('success', trans('admin/maintenances/message.create.success'));
-
-    }
-
-    /**
-    *  Returns a form view to edit a selected asset maintenance.
-    *
-    * @see MaintenancesController::postEdit() method that stores the data
-    * @author  Vincent Sposato <vincent.sposato@gmail.com>
-    * @version v1.0
-    * @since [v1.8]
-    */
-    public function edit(Maintenance $maintenance) : View | RedirectResponse
-    {
-        $this->authorize('update', Asset::class);
-        $this->authorize('update', $maintenance->asset);
-
-        return view('maintenances/edit')
-            ->with('selected_assets', $maintenance->asset->pluck('id')->toArray())
-            ->with('asset_ids', request()->input('asset_ids', []))
-            ->with('maintenanceType', Maintenance::getImprovementOptions())
-            ->with('item', $maintenance);
-    }
-
-    /**
-     *  Validates and stores an update to an asset maintenance
-     *
-     * @see MaintenancesController::postEdit() method that stores the data
-     * @author  Vincent Sposato <vincent.sposato@gmail.com>
-     * @param Request $request
-     * @param int $maintenanceId
-     * @version v1.0
-     * @since [v1.8]
-     */
-    public function update(ImageUploadRequest $request, Maintenance $maintenance) : View | RedirectResponse
-    {
-        $this->authorize('update', Asset::class);
-        $this->authorize('update', $maintenance->asset);
-
-        $maintenance->supplier_id = $request->input('supplier_id');
-        $maintenance->is_warranty = $request->input('is_warranty', 0);
-        $maintenance->cost =  $request->input('cost');
-        $maintenance->notes = $request->input('notes');
-        $maintenance->asset_maintenance_type = $request->input('asset_maintenance_type');
-        $maintenance->name = $request->input('name');
-        $maintenance->start_date = $request->input('start_date');
-        $maintenance->completion_date = $request->input('completion_date');
-
-
-        // Todo - put this in a getter/setter?
-        if (($maintenance->completion_date == null))
-        {
-            if (($maintenance->asset_maintenance_time !== 0)
-              || (! is_null($maintenance->asset_maintenance_time))
-            ) {
-                $maintenance->asset_maintenance_time = null;
-            }
-        }
-
-        if (($maintenance->completion_date !== null)
-          && ($maintenance->start_date !== '')
-          && ($maintenance->start_date !== '0000-00-00')
-        ) {
-            $startDate = Carbon::parse($maintenance->start_date);
-            $completionDate = Carbon::parse($maintenance->completion_date);
-            $maintenance->asset_maintenance_time = (int) $completionDate->diffInDays($startDate, true);
-        }
-        $maintenance = $request->handleImages($maintenance);
-
-        if ($maintenance->save()) {
-            return redirect()->route('maintenances.index')
-                            ->with('success', trans('admin/maintenances/message.edit.success'));
-        }
-
-        return redirect()->back()->withInput()->withErrors($maintenance->getErrors());
-    }
-
-    /**
-    *  Delete an asset maintenance
-    *
-    * @author  Vincent Sposato <vincent.sposato@gmail.com>
-    * @param int $maintenanceId
-    * @version v1.0
-    * @since [v1.8]
-    */
-    public function destroy(Maintenance $maintenance) : RedirectResponse
-    {
-        $this->authorize('update', Asset::class);
-        $this->authorize('update', $maintenance->asset);
-        // Delete the asset maintenance
-        $maintenance->delete();
-        // Redirect to the asset_maintenance management page
-        return redirect()->route('maintenances.index')
-                       ->with('success', trans('admin/maintenances/message.delete.success'));
-    }
-
-    /**
-    *  View an asset maintenance
-    *
-    * @author  Vincent Sposato <vincent.sposato@gmail.com>
-    * @param int $maintenanceId
-    * @version v1.0
-    * @since [v1.8]
-    */
-    public function show(Maintenance $maintenance) : View | RedirectResponse
-    {
-        return view('maintenances.view')->with('maintenance', $maintenance);
-    }
-}
--- a/app/Http/Controllers/ManufacturersController.php
+++ b/app/Http/Controllers/ManufacturersController.php
@@ -6,7 +6,6 @@ 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;
@@ -32,30 +31,7 @@ class ManufacturersController extends Controller
    public function index() : View
    {
        $this->authorize('index', Manufacturer::class);
-        $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' => 'Database\\Seeders\\ManufacturerSeeder', '--force' => true]);
-            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]));
+        return view('manufacturers/index');
    }

    /**
--- a/app/Http/Controllers/ProfileController.php
+++ b/app/Http/Controllers/ProfileController.php
@@ -3,21 +3,15 @@
 namespace App\Http\Controllers;

 use App\Http\Requests\ImageUploadRequest;
-use App\Http\Transformers\ProfileTransformer;
-use App\Models\Actionlog;
 use App\Models\Setting;
 use App\Models\User;
 use App\Notifications\CurrentInventory;
-use Illuminate\Http\Response;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Http\RedirectResponse;
 use \Illuminate\Contracts\View\View;
-use Illuminate\Support\Facades\Storage;
-use Symfony\Component\HttpFoundation\BinaryFileResponse;
-
 /**
 * This controller handles all actions related to User Profiles for
 * the Snipe-IT Asset Management application.
@@ -226,7 +220,7 @@ class ProfileController extends Controller

        if (!$user = User::find(auth()->id())) {
            return redirect()->back()
-                ->with('error', trans('admin/users/message.user_not_found', ['id' => auth()->id()]));
+                ->with('error', trans('admin/users/message.user_not_found', ['id' => $id]));
        }
        if (empty($user->email)) {
            return redirect()->back()->with('error', trans('admin/users/message.user_has_no_email'));
@@ -240,28 +234,4 @@ class ProfileController extends Controller

        return redirect()->back()->with('success', trans('admin/users/general.user_notified'));
    }
-
-
-
-    public function getStoredEula($filename) : Response | BinaryFileResponse | RedirectResponse
-    {
-
-        $logentry = Actionlog::where('filename', $filename)->first();
-
-        // Make sure the user has permission to view this file
-        if (auth()->id() != $logentry->target_id) {
-            return redirect()->route('account')->with('error', trans('general.generic_model_not_found', ['model' => 'file']));
-        }
-
-        if (config('filesystems.default') == 's3_private') {
-            return redirect()->away(Storage::disk('s3_private')->temporaryUrl('private_uploads/eula-pdfs/'.$filename, now()->addMinutes(5)));
-        }
-
-        if (Storage::exists('private_uploads/eula-pdfs/'.$filename)) {
-            return response()->download(config('app.private_uploads').'/eula-pdfs/'.$filename);
-        }
-
-        return redirect()->back()->with('error',  trans('general.file_does_not_exist'));
-
-    }
 }
--- a/app/Http/Controllers/ReportsController.php
+++ b/app/Http/Controllers/ReportsController.php
@@ -9,7 +9,7 @@ use App\Models\Actionlog;
 use App\Models\Asset;
 use App\Models\AssetModel;
 use App\Models\Category;
-use App\Models\Maintenance;
+use App\Models\AssetMaintenance;
 use App\Models\CheckoutAcceptance;
 use App\Models\Company;
 use App\Models\CustomField;
@@ -17,11 +17,13 @@ use App\Models\Depreciation;
 use App\Models\License;
 use App\Models\ReportTemplate;
 use App\Models\Setting;
+use App\Notifications\CheckoutAssetNotification;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Illuminate\Support\Facades\Mail;
+use Illuminate\Support\Facades\Notification;
 use \Illuminate\Contracts\View\View;
 use League\Csv\Reader;
 use Symfony\Component\HttpFoundation\StreamedResponse;
@@ -182,7 +184,7 @@ class ReportsController extends Controller
                $currency = e(Setting::getSettings()->default_currency);
            }

-            $row[] = Helper::getFormattedDateObject($asset->purchase_date, 'date', false);
+            $row[] = $asset->purchase_date;
            $row[] = $currency.Helper::formatCurrencyOutput($asset->purchase_cost);
            $row[] = $currency.Helper::formatCurrencyOutput($asset->getDepreciatedValue());
            $row[] = $currency.Helper::formatCurrencyOutput(($asset->purchase_cost - $asset->getDepreciatedValue()));
@@ -275,7 +277,7 @@ class ReportsController extends Controller

                    if ($actionlog->target) {
                            if ($actionlog->targetType() == 'user') {
-                                $target_name = $actionlog->target->display_name;
+                                $target_name = $actionlog->target->getFullNameAttribute();
                        } else {
                            $target_name = $actionlog->target->getDisplayNameAttribute();
                        }
@@ -289,7 +291,7 @@ class ReportsController extends Controller

                    $row = [
                        $actionlog->created_at,
-                        ($actionlog->adminuser) ? e($actionlog->adminuser->display_name) : '',
+                        ($actionlog->adminuser) ? e($actionlog->adminuser->getFullNameAttribute()) : '',
                        $actionlog->present()->actionType(),
                        e($actionlog->itemType()),
                        ($actionlog->itemType() == 'user') ? $actionlog->filename : $item_name,
@@ -483,7 +485,7 @@ class ReportsController extends Controller
                $header[] = trans('admin/hardware/table.purchase_date');
            }

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

@@ -735,11 +737,6 @@ 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();
            }
@@ -856,7 +853,7 @@ class ReportsController extends Controller
                    }

                    if ($request->filled('assigned_to')) {
-                        $row[] = ($asset->checkedOutToUser() && $asset->assigned) ?? $asset->assigned->display_name;
+                        $row[] = ($asset->checkedOutToUser() && $asset->assigned) ? $asset->assigned->getFullNameAttribute() : ($asset->assigned ? $asset->assigned->display_name : '');
                        $row[] = ($asset->checkedOutToUser() && $asset->assigned) ? 'user' : $asset->assignedType();
                    }

@@ -1036,11 +1033,11 @@ class ReportsController extends Controller
     * @author  Vincent Sposato <vincent.sposato@gmail.com>
     * @version v1.0
     */
-    public function getMaintenancesReport() : View
+    public function getAssetMaintenancesReport() : View
    {
        $this->authorize('reports.view');

-        return view('reports.maintenances');
+        return view('reports.asset_maintenances');
    }

    /**
@@ -1049,11 +1046,11 @@ class ReportsController extends Controller
     * @author  Vincent Sposato <vincent.sposato@gmail.com>
     * @version v1.0
     */
-    public function exportMaintenancesReport() : Response
+    public function exportAssetMaintenancesReport() : Response
    {
        $this->authorize('reports.view');
        // Grab all the improvements
-        $Maintenances = Maintenance::with('asset', 'supplier')
+        $assetMaintenances = AssetMaintenance::with('asset', 'supplier')
                                             ->orderBy('created_at', 'DESC')
                                             ->get();

@@ -1061,36 +1058,36 @@ class ReportsController extends Controller

        $header = [
            trans('admin/hardware/table.asset_tag'),
-            trans('admin/maintenances/table.asset_name'),
+            trans('admin/asset_maintenances/table.asset_name'),
            trans('general.supplier'),
-            trans('admin/maintenances/form.asset_maintenance_type'),
-            trans('admin/maintenances/form.title'),
-            trans('admin/maintenances/form.start_date'),
-            trans('admin/maintenances/form.completion_date'),
-            trans('admin/maintenances/form.asset_maintenance_time'),
-            trans('admin/maintenances/form.cost'),
+            trans('admin/asset_maintenances/form.asset_maintenance_type'),
+            trans('admin/asset_maintenances/form.title'),
+            trans('admin/asset_maintenances/form.start_date'),
+            trans('admin/asset_maintenances/form.completion_date'),
+            trans('admin/asset_maintenances/form.asset_maintenance_time'),
+            trans('admin/asset_maintenances/form.cost'),
        ];

        $header = array_map('trim', $header);
        $rows[] = implode(',', $header);

-        foreach ($Maintenances as $maintenance) {
+        foreach ($assetMaintenances as $assetMaintenance) {
            $row = [];
-            $row[] = str_replace(',', '', e($maintenance->asset->asset_tag));
-            $row[] = str_replace(',', '', e($maintenance->asset->name));
-            $row[] = str_replace(',', '', e($maintenance->supplier->name));
-            $row[] = e($maintenance->improvement_type);
-            $row[] = e($maintenance->name);
-            $row[] = e($maintenance->start_date);
-            $row[] = e($maintenance->completion_date);
-            if (is_null($maintenance->asset_maintenance_time)) {
+            $row[] = str_replace(',', '', e($assetMaintenance->asset->asset_tag));
+            $row[] = str_replace(',', '', e($assetMaintenance->asset->name));
+            $row[] = str_replace(',', '', e($assetMaintenance->supplier->name));
+            $row[] = e($assetMaintenance->improvement_type);
+            $row[] = e($assetMaintenance->title);
+            $row[] = e($assetMaintenance->start_date);
+            $row[] = e($assetMaintenance->completion_date);
+            if (is_null($assetMaintenance->asset_maintenance_time)) {
                $improvementTime = (int) Carbon::now()
-                    ->diffInDays(Carbon::parse($maintenance->start_date), true);
+                    ->diffInDays(Carbon::parse($assetMaintenance->start_date), true);
            } else {
-                $improvementTime = (int) $maintenance->asset_maintenance_time;
+                $improvementTime = (int) $assetMaintenance->asset_maintenance_time;
            }
            $row[]  = $improvementTime;
-            $row[]  = trans('general.currency') . Helper::formatCurrencyOutput($maintenance->cost);
+            $row[]  = trans('general.currency') . Helper::formatCurrencyOutput($assetMaintenance->cost);
            $rows[] = implode(',', $row);
        }

--- a/app/Http/Controllers/SettingsController.php
+++ b/app/Http/Controllers/SettingsController.php
@@ -14,7 +14,6 @@ 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;
@@ -291,6 +290,7 @@ class SettingsController extends Controller
    public function getSettings() : View
    {
        $setting = Setting::getSettings();
+
        return view('settings/general', compact('setting'));
    }

@@ -352,7 +352,6 @@ class SettingsController extends Controller
        $setting->dash_chart_type = $request->input('dash_chart_type');
        $setting->profile_edit = $request->input('profile_edit', 0);
        $setting->require_checkinout_notes = $request->input('require_checkinout_notes', 0);
-        $setting->manager_view_enabled = $request->input('manager_view_enabled', 0);


        if ($request->input('per_page') != '') {
@@ -651,7 +650,6 @@ class SettingsController extends Controller

        $setting->alert_email = $alert_email;
        $setting->admin_cc_email = $admin_cc_email;
-        $setting->admin_cc_always = $request->validated('admin_cc_always');
        $setting->alerts_enabled = $request->input('alerts_enabled', '0');
        $setting->alert_interval = $request->input('alert_interval');
        $setting->alert_threshold = $request->input('alert_threshold');
@@ -774,7 +772,6 @@ 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');
@@ -873,7 +870,6 @@ class SettingsController extends Controller
            $setting->ldap_default_group = $request->input('ldap_default_group');
            $setting->ldap_filter = $request->input('ldap_filter');
            $setting->ldap_username_field = $request->input('ldap_username_field');
-            $setting->ldap_display_name = $request->input('ldap_display_name');
            $setting->ldap_lname_field = $request->input('ldap_lname_field');
            $setting->ldap_fname_field = $request->input('ldap_fname_field');
            $setting->ldap_auth_filter_query = $request->input('ldap_auth_filter_query');
@@ -890,12 +886,7 @@ class SettingsController extends Controller
            $setting->ldap_pw_sync = $request->input('ldap_pw_sync', '0');
            $setting->custom_forgot_pass_url = $request->input('custom_forgot_pass_url');
            $setting->ldap_phone_field = $request->input('ldap_phone');
-            $setting->ldap_mobile = $request->input('ldap_mobile');
            $setting->ldap_jobtitle = $request->input('ldap_jobtitle');
-            $setting->ldap_address = $request->input('ldap_address');
-            $setting->ldap_city = $request->input('ldap_city');
-            $setting->ldap_state = $request->input('ldap_state');
-            $setting->ldap_zip = $request->input('ldap_zip');
            $setting->ldap_country = $request->input('ldap_country');
            $setting->ldap_location = $request->input('ldap_location');
            $setting->ldap_dept = $request->input('ldap_dept');
@@ -1090,7 +1081,6 @@ class SettingsController extends Controller

        if (! config('app.lock_passwords')) {
            if (Storage::exists($path.'/'.$filename)) {
-                Log::warning('User '.auth()->user()->username.' is attempting to download backup file: '.$filename);
                return StorageHelper::downloader($path.'/'.$filename);
            } else {
                // Redirect to the backup page
@@ -1118,7 +1108,6 @@ class SettingsController extends Controller
                if (Storage::exists($path . '/' . $filename)) {

                    try {
-                        Log::warning('User '.auth()->user()->username.' is attempting to delete backup file: '.$filename);
                        Storage::delete($path . '/' . $filename);
                        return redirect()->route('settings.backups.index')->with('success', trans('admin/settings/message.backup.file_deleted'));
                    } catch (\Exception $e) {
@@ -1198,7 +1187,7 @@ class SettingsController extends Controller
                    '--force' => true,
                ]);

-                Log::warning('User '.auth()->user()->username.' is attempting to restore from: '. storage_path($path).'/'.$filename);
+                Log::debug('Attempting to restore from: '. storage_path($path).'/'.$filename);

                $restore_params = [
                    '--force' => true,
@@ -1347,11 +1336,9 @@ class SettingsController extends Controller
                'name'  => config('mail.from.name'),
                'email' => config('mail.from.address'),
            ])->notify(new MailTest());
-            Log::debug('Attempting to send mail to '.config('mail.from.address'));
+
            return response()->json(Helper::formatStandardApiResponse('success', null, trans('mail_sent.mail_sent')));
        } catch (\Exception $e) {
-            Log::error('Mail sent from '.config('mail.from.address') .' with errors '. $e->getMessage());
-            Log::debug($e);
            return response()->json(Helper::formatStandardApiResponse('success', null, $e->getMessage()));
        }
    }
--- a/app/Http/Controllers/SuppliersController.php
+++ b/app/Http/Controllers/SuppliersController.php
@@ -4,6 +4,7 @@ namespace App\Http\Controllers;

 use App\Http\Requests\ImageUploadRequest;
 use App\Models\Supplier;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Http\RedirectResponse;
 use \Illuminate\Contracts\View\View;

@@ -121,7 +122,7 @@ class SuppliersController extends Controller
    public function destroy($supplierId) : RedirectResponse
    {
        $this->authorize('delete', Supplier::class);
-        if (is_null($supplier = Supplier::with('maintenances', 'assets', 'licenses')->withCount('maintenances as maintenances_count', 'assets as assets_count', 'licenses as licenses_count')->find($supplierId))) {
+        if (is_null($supplier = Supplier::with('asset_maintenances', 'assets', 'licenses')->withCount('asset_maintenances as asset_maintenances_count', 'assets as assets_count', 'licenses as licenses_count')->find($supplierId))) {
            return redirect()->route('suppliers.index')->with('error', trans('admin/suppliers/message.not_found'));
        }

@@ -129,8 +130,8 @@ class SuppliersController extends Controller
            return redirect()->route('suppliers.index')->with('error', trans('admin/suppliers/message.delete.assoc_assets', ['asset_count' => (int) $supplier->assets_count]));
        }

-        if ($supplier->maintenances_count > 0) {
-            return redirect()->route('suppliers.index')->with('error', trans('admin/suppliers/message.delete.assoc_maintenances', ['maintenances_count' => $supplier->maintenances_count]));
+        if ($supplier->asset_maintenances_count > 0) {
+            return redirect()->route('suppliers.index')->with('error', trans('admin/suppliers/message.delete.assoc_maintenances', ['asset_maintenances_count' => $supplier->asset_maintenances_count]));
        }

        if ($supplier->licenses_count > 0) {
--- a/app/Http/Controllers/UploadedFilesController.php
+++ b/app/Http/Controllers/UploadedFilesController.php
@@ -1,162 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use App\Helpers\StorageHelper;
-use App\Http\Requests\UploadFileRequest;
-use App\Models\Actionlog;
-use Illuminate\Http\RedirectResponse;
-use Illuminate\Support\Facades\Storage;
-use Symfony\Component\HttpFoundation\BinaryFileResponse;
-use Symfony\Component\HttpFoundation\StreamedResponse;
-
-/**
- * This controller provide the health route  for
- * the Snipe-IT Asset Management application.
- *
- * @version   v1.0
- *
- * @return \Illuminate\Http\JsonResponse
-
- */
-class UploadedFilesController extends Controller
-{
-
-
-    /**
-     * Accepts a POST to upload a file to the server.
-     *
-     * @param  \App\Http\Requests\UploadFileRequest $request
-     * @param  string                               $object_type the type of object to upload the file to
-     * @param  int                                  $id          the ID of the object to store so we can check permisisons
-     * @since  [v8.2.2]
-     * @author [A. Gianotto <snipe@snipe.net>]
-     */
-    public function store(UploadFileRequest $request, $object_type, $id) : RedirectResponse
-    {
-
-        // Check the permissions to make sure the user can view the object
-        $object = self::$map_object_type[$object_type]::find($id);
-        $this->authorize('update', $object);
-
-        if (!$object) {
-            return redirect()->back()->withFragment('files')->with('error',trans('general.file_upload_status.invalid_object'));
-        }
-
-        // If the file storage directory doesn't exist, create it
-        if (! Storage::exists(self::$map_storage_path[$object_type])) {
-            Storage::makeDirectory(self::$map_storage_path[$object_type], 775);
-        }
-
-
-        if ($request->hasFile('file')) {
-            // Loop over the attached files and add them to the object
-            foreach ($request->file('file') as $file) {
-                $file_name = $request->handleFile(self::$map_storage_path[$object_type], self::$map_file_prefix[$object_type].'-'.$object->id, $file);
-                $files[] = $file_name;
-                $object->logUpload($file_name, $request->get('notes'));
-            }
-
-            $files = Actionlog::select('action_logs.*')->where('action_type', '=', 'uploaded')
-                ->where('item_type', '=', self::$map_object_type[$object_type])
-                ->where('item_id', '=', $id)->whereIn('filename', $files)
-                ->get();
-
-            return redirect()->back()->withFragment('files')->with('success', trans_choice('general.file_upload_status.upload.success',  count($files)));
-        }
-
-        // No files were submitted
-        return redirect()->back()->withFragment('files')->with('error', trans('general.file_upload_status.nofiles'));
-    }
-
-
-
-    /**
-     * Check for permissions and display the file.
-     * This isn't currently used, but is here for future use.
-     *
-     * @param  \App\Http\Requests\UploadFileRequest $request
-     * @param  string                               $object_type the type of object to upload the file to
-     * @param  int                                  $id          the ID of the object to delete from so we can check permisisons
-     * @param  $file_id     the ID of the file to show from the action_logs table
-     * @since  [v8.2.2]
-     * @author [A. Gianotto <snipe@snipe.net>]
-     */
-    public function show($object_type, $id, $file_id) : RedirectResponse | StreamedResponse | Storage | StorageHelper | BinaryFileResponse
-    {
-        // Check the permissions to make sure the user can view the object
-        $object = self::$map_object_type[$object_type]::find($id);
-        $this->authorize('view', $object);
-
-        if (!$object) {
-            return redirect()->back()->withFragment('files')->with('error',trans('general.file_upload_status.invalid_object'));
-        }
-
-
-        // Check that the file being requested exists for the object
-        if (! $log = Actionlog::whereNotNull('filename')->where('item_type', self::$map_object_type[$object_type])->where('item_id', $object->id)->find($file_id))
-        {
-            return redirect()->back()->withFragment('files')->with('error', trans('general.file_upload_status.invalid_id'));
-        }
-
-
-        if (! Storage::exists(self::$map_storage_path[$object_type].'/'.$log->filename))
-        {
-            return redirect()->back()->withFragment('files')->with('error', trans('general.file_upload_status.file_not_found'));
-        }
-
-        if (request('inline') == 'true') {
-            $headers = [
-                'Content-Disposition' => 'inline',
-            ];
-            return Storage::download(self::$map_storage_path[$object_type].'/'.$log->filename, $log->filename, $headers);
-        }
-
-        return StorageHelper::downloader(self::$map_storage_path[$object_type].'/'.$log->filename);
-
-    }
-
-    /**
-     * Delete the associated file
-     *
-     * @param  \App\Http\Requests\UploadFileRequest $request
-     * @param  string                               $object_type the type of object to upload the file to
-     * @param  int                                  $id          the ID of the object to delete from so we can check permisisons
-     * @param  $file_id     the ID of the file to delete from the action_logs table
-     * @since  [v8.2.2]
-     * @author [A. Gianotto <snipe@snipe.net>]
-     */
-    public function destroy($object_type, $id, $file_id) : RedirectResponse
-    {
-
-        // Check the permissions to make sure the user can view the object
-        $object = self::$map_object_type[$object_type]::find($id);
-        $this->authorize('update', self::$map_object_type[$object_type]);
-
-        if (!$object) {
-            return redirect()->back()->withFragment('files')->with('error',trans('general.file_upload_status.invalid_object'));
-        }
-
-
-        // Check for the file
-        $log = Actionlog::find($file_id)->where('item_type', self::$map_object_type[$object_type])
-            ->where('item_id', $object->id)->first();
-
-        if ($log) {
-            // Check the file actually exists, and delete it
-            if (Storage::exists(self::$map_storage_path[$object_type].'/'.$log->filename)) {
-                Storage::delete(self::$map_storage_path[$object_type].'/'.$log->filename);
-            }
-            // Delete the record of the file
-            if ($log->delete()) {
-                return redirect()->back()->withFragment('files')->with('success', trans_choice('general.file_upload_status.delete.success', 1));
-            }
-
-        }
-
-        // The file doesn't seem to really exist, so report an error
-        return redirect()->back()->withFragment('files')->with('success', trans_choice('general.file_upload_status.delete.error', 1));
-
-    }
-
-}
--- a/app/Http/Controllers/Users/BulkUsersController.php
+++ b/app/Http/Controllers/Users/BulkUsersController.php
@@ -298,6 +298,7 @@ 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')),
@@ -365,6 +366,20 @@ 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/UserFilesController.php
+++ b/app/Http/Controllers/Users/UserFilesController.php
@@ -0,0 +1,138 @@
+<?php
+
+namespace App\Http\Controllers\Users;
+
+use App\Helpers\StorageHelper;
+use App\Http\Controllers\Controller;
+use App\Http\Requests\UploadFileRequest;
+use App\Models\Actionlog;
+use App\Models\User;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Illuminate\Support\Facades\Storage;
+
+class UserFilesController extends Controller
+{
+    /**
+     * Return JSON response with a list of user details for the getIndex() view.
+     *
+     * @param UploadFileRequest $request
+     * @param int $userId
+     * @return string JSON
+     * @throws \Illuminate\Auth\Access\AuthorizationException
+     *@author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v1.6]
+     */
+    public function store(UploadFileRequest $request, User $user)
+    {
+        $this->authorize('update', $user);
+        $files = $request->file('file');
+        $errors = 0;
+
+        if (is_null($files)) {
+            return redirect()->back()->with('error', trans('admin/users/message.upload.nofiles'));
+        }
+
+        foreach ($files as $file) {
+            $file_name = $request->handleFile('private_uploads/users/', 'user-' . $user->id, $file);
+
+            //Log the uploaded file to the log
+            $logAction = new Actionlog();
+            $logAction->item_id = $user->id;
+            $logAction->item_type = User::class;
+            $logAction->created_by = auth()->id();
+            $logAction->note = $request->input('notes');
+            $logAction->target_type = User::class;
+            $logAction->target_id = $user->id;
+            $logAction->action_date = date("Y-m-d H:i:s");
+            $logAction->filename = $file_name;
+            $logAction->action_source = 'gui';
+            $logAction->user_agent = request()->header('User-Agent');
+            $logAction->remote_ip = request()->ip();
+            $logAction->action_type = 'uploaded';
+
+            if (!$logAction->save()) {
+                $errors++;
+            }
+        }
+
+        if ($errors > 0) {
+            return redirect()->back()->withFragment('files')->with('warning', 'Some files could not be uploaded');
+        }
+        
+        return redirect()->back()->withFragment('files')->with('success', trans('admin/users/message.upload.success'));
+
+    }
+
+    /**
+     * Delete file
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v1.6]
+     * @param  int $userId
+     * @param  int $fileId
+     * @return \Illuminate\Http\RedirectResponse
+     * @throws \Illuminate\Auth\Access\AuthorizationException
+     */
+    public function destroy($userId = null, $fileId = null)
+    {
+        if ($user = User::find($userId)) {
+
+            $this->authorize('delete', $user);
+            $rel_path = 'private_uploads/users';
+
+
+            if ($log = Actionlog::find($fileId)) {
+                $filename = $log->filename;
+                $log->delete();
+                
+                if (Storage::exists($rel_path.'/'.$filename)) {
+                    Storage::delete($rel_path.'/'.$filename);
+                    return redirect()->back()->withFragment('files')->with('success', trans('admin/users/message.deletefile.success'));
+                }
+
+            }
+
+            // The log record doesn't exist somehow
+            return redirect()->back()->with('success', trans('admin/users/message.deletefile.success'));
+        }
+
+        return redirect()->route('users.index')->with('error', trans('admin/users/message.user_not_found', ['id' => $userId]));
+
+    }
+
+    /**
+     * Display/download the uploaded file
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v1.6]
+     * @param  int $userId
+     * @param  int $fileId
+     * @return mixed
+     * @throws \Illuminate\Auth\Access\AuthorizationException
+     */
+    public function show(User $user, $fileId = null)
+    {
+
+
+        if (empty($fileId)) {
+            return redirect()->route('users.show')->with('error', 'Invalid file request');
+        }
+
+            $this->authorize('view', $user);
+
+        if ($log = Actionlog::whereNotNull('filename')->where('item_id', $user->id)->find($fileId)) {
+            $file = 'private_uploads/users/'.$log->filename;
+
+            try {
+                return StorageHelper::showOrDownloadFile($file, $log->filename);
+            } catch (\Exception $e) {
+                return redirect()->route('users.show', ['user' => $user])->with('error',  trans('general.file_not_found'));
+            }
+        }
+
+        // The log record doesn't exist somehow
+        return redirect()->route('users.show', ['user' => $user])->with('error',  trans('general.log_record_not_found'));
+
+    }
+
+}
--- a/app/Http/Controllers/Users/UsersController.php
+++ b/app/Http/Controllers/Users/UsersController.php
@@ -13,8 +13,15 @@ use App\Models\Company;
 use App\Models\Group;
 use App\Models\Setting;
 use App\Models\User;
+use App\Notifications\WelcomeNotification;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Password;
+use Illuminate\Support\Facades\Storage;
+use Redirect;
+use Str;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 use App\Notifications\CurrentInventory;

@@ -88,7 +95,6 @@ class UsersController extends Controller
        //Username, email, and password need to be handled specially because the need to respect config values on an edit.
        $user->email = trim($request->input('email'));
        $user->username = trim($request->input('username'));
-        $user->display_name = $request->input('display_name');
        if ($request->filled('password')) {
            $user->password = bcrypt($request->input('password'));
        }
@@ -99,7 +105,6 @@ class UsersController extends Controller
        $user->activated = $request->input('activated', 0);
        $user->jobtitle = $request->input('jobtitle');
        $user->phone = $request->input('phone');
-        $user->mobile = $request->input('mobile');
        $user->location_id = $request->input('location_id', null);
        $user->department_id = $request->input('department_id', null);
        $user->company_id = Company::getIdForUser($request->input('company_id', null));
@@ -125,15 +130,10 @@ class UsersController extends Controller
        }
        $user->permissions = json_encode($permissions_array);

-        // we have to invoke the form request here to handle image uploads
+        // we have to invoke the
        app(ImageUploadRequest::class)->handleImages($user, 600, 'avatar', 'avatars', 'avatar');

-        if($request->get('redirect_option') === 'back'){
-            session()->put(['redirect_option' => 'index']);
-        } else {
        session()->put(['redirect_option' => $request->get('redirect_option')]);
-        }
-

        if ($user->save()) {
            if ($request->filled('groups')) {
@@ -142,8 +142,19 @@ class UsersController extends Controller
                $user->groups()->sync([]);
            }

-            return Helper::getRedirectOption($request, $user->id, 'Users')
-                ->with('success', trans('admin/users/message.success.create'));
+            if (($request->input('email_user') == 1) && ($request->filled('email'))) {
+                // Send the credentials through email
+                $data = [];
+                $data['email'] = e($request->input('email'));
+                $data['username'] = e($request->input('username'));
+                $data['first_name'] = e($request->input('first_name'));
+                $data['last_name'] = e($request->input('last_name'));
+                $data['password'] = e($request->input('password'));
+
+                $user->notify(new WelcomeNotification($data));
+            }
+
+            return redirect()->to(Helper::getRedirectOption($request, $user->id, 'Users'))->with('success', trans('admin/users/message.success.create'));
        }

        return redirect()->back()->withInput()->withErrors($user->getErrors());
@@ -167,7 +178,7 @@ class UsersController extends Controller
     * @author [A. Gianotto] [<snipe@snipe.net>]
     * @since [v1.0]
     * @param $permissions
-     * @return \Illuminate\Contracts\View\View|\Illuminate\Http\RedirectResponse
+     * @return \Illuminate\Contracts\View\View
     * @internal param int $id
     * @throws \Illuminate\Auth\Access\AuthorizationException
     */
@@ -175,15 +186,10 @@ class UsersController extends Controller
    {

        $this->authorize('update', User::class);
-        session()->put('back_url', url()->previous());
        $user = User::with(['assets', 'assets.model', 'consumables', 'accessories', 'licenses', 'userloc'])->withTrashed()->find($user->id);

        if ($user) {

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

@@ -236,18 +242,22 @@ class UsersController extends Controller
            }
        }

+        // Only save groups if the user is a superuser
+        if (auth()->user()->isSuperUser()) {
+            $user->groups()->sync($request->input('groups'));
+        }

        // Update the user fields
-
+        $user->username = trim($request->input('username'));
+        $user->email = trim($request->input('email'));
        $user->first_name = $request->input('first_name');
        $user->last_name = $request->input('last_name');
-        $user->display_name = $request->input('display_name');
        $user->two_factor_optin = $request->input('two_factor_optin') ?: 0;
        $user->locale = $request->input('locale');
        $user->employee_num = $request->input('employee_num');
+        $user->activated = $request->input('activated', 0);
        $user->jobtitle = $request->input('jobtitle', null);
        $user->phone = $request->input('phone');
-        $user->mobile = $request->input('mobile');
        $user->location_id = $request->input('location_id', null);
        $user->company_id = Company::getIdForUser($request->input('company_id', null));
        $user->manager_id = $request->input('manager_id', null);
@@ -257,6 +267,8 @@ class UsersController extends Controller
        $user->city = $request->input('city', null);
        $user->state = $request->input('state', null);
        $user->country = $request->input('country', null);
+        // if a user is editing themselves we should always keep activated true
+        $user->activated = $request->input('activated', $request->user()->is($user) ? 1 : 0);
        $user->zip = $request->input('zip', null);
        $user->remote = $request->input('remote', 0);
        $user->vip = $request->input('vip', 0);
@@ -265,27 +277,21 @@ class UsersController extends Controller
        $user->end_date = $request->input('end_date', null);
        $user->autoassign_licenses = $request->input('autoassign_licenses', 0);

-        // Set this here so that we can overwrite it later if the user is an admin or superadmin
-        $user->activated = $request->input('activated', auth()->user()->is($user) ? 1 : $user->activated);
-
-
        // Update the location of any assets checked out to this user
        Asset::where('assigned_type', User::class)
            ->where('assigned_to', $user->id)
            ->update(['location_id' => $request->input('location_id', null)]);

-        // check for permissions related fields and only set them if the user has permission to edit them
-        if (auth()->user()->can('canEditAuthFields', $user) && auth()->user()->can('editableOnDemo')) {
-
-            $user->username = trim($request->input('username'));
-            $user->email = trim($request->input('email'));
-            $user->activated = $request->input('activated', $request->user()->is($user) ? 1 : 0);
-
        // Do we want to update the user password?
        if ($request->filled('password')) {
            $user->password = bcrypt($request->input('password'));
        }

+        // Update the location of any assets checked out to this user
+        Asset::where('assigned_type', User::class)
+            ->where('assigned_to', $user->id)
+            ->update(['location_id' => $user->location_id]);
+
        $permissions_array = $request->input('permission');

        // Strip out the superuser permission if the user isn't a superadmin
@@ -296,26 +302,13 @@ class UsersController extends Controller

        $user->permissions = json_encode($permissions_array);

-            // Only save groups if the user is a superuser
-            if (auth()->user()->isSuperUser()) {
-                $user->groups()->sync($request->input('groups'));
-            }
-        }
-
-
-        // Update the location of any assets checked out to this user
-        Asset::where('assigned_type', User::class)
-            ->where('assigned_to', $user->id)
-            ->update(['location_id' => $user->location_id]);
-
-
        // Handle uploaded avatar
        app(ImageUploadRequest::class)->handleImages($user, 600, 'avatar', 'avatars', 'avatar');
        session()->put(['redirect_option' => $request->get('redirect_option')]);

        if ($user->save()) {
            // Redirect to the user page
-            return Helper::getRedirectOption($request, $user->id, 'Users')
+            return redirect()->to(Helper::getRedirectOption($request, $user->id, 'Users'))
                ->with('success', trans('admin/users/message.success.update'));
        }
        return redirect()->back()->withInput()->withErrors($user->getErrors());
@@ -441,7 +434,7 @@ class UsersController extends Controller
        app('request')->request->set('permissions', $permissions);


-        $user_to_clone = User::with('userloc')->withTrashed()->find($user->id);
+        $user_to_clone = User::with('assets', 'assets.model', 'consumables', 'accessories', 'licenses', 'userloc')->withTrashed()->find($user->id);
        // Make sure they can view this particular user
        $this->authorize('view', $user_to_clone);

@@ -456,8 +449,6 @@ class UsersController extends Controller
            $user->last_name = '';
            $user->email = substr($user->email, ($pos = strpos($user->email, '@')) !== false ? $pos : 0);
            $user->id = null;
-            $user->username = null;
-            $user->avatar = null;

            // Get this user's groups
            $userGroups = $user_to_clone->groups()->pluck('name', 'id');
@@ -473,7 +464,7 @@ class UsersController extends Controller
                ->with('user', $user)
                ->with('groups', Group::pluck('name', 'id'))
                ->with('userGroups', $userGroups)
-                ->with('cloned_model', $user_to_clone)
+                ->with('clone_user', $user_to_clone)
                ->with('item', $user);
        }

@@ -515,8 +506,6 @@ class UsersController extends Controller
                        trans('admin/companies/table.title'),
                        trans('admin/users/table.title'),
                        trans('general.employee_number'),
-                        trans('admin/users/table.first_name'),
-                        trans('admin/users/table.last_name'),
                        trans('admin/users/table.name'),
                        trans('admin/users/table.username'),
                        trans('admin/users/table.email'),
@@ -562,12 +551,10 @@ class UsersController extends Controller
                            ($user->company) ? $user->company->name : '',
                            $user->jobtitle,
                            $user->employee_num,
-                            $user->first_name,
-                            $user->last_name,
-                            $user->display_name,
+                            $user->present()->fullName(),
                            $user->username,
                            $user->email,
-                            ($user->manager) ? $user->manager->display_name : '',
+                            ($user->manager) ? $user->manager->present()->fullName() : '',
                            ($user->userloc) ? $user->userloc->name : '',
                            ($user->department) ? $user->department->name : '',
                            $user->assets->count(),
@@ -607,18 +594,18 @@ class UsersController extends Controller

        $user = User::where('id', $id)
            ->with([
-                '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.assetlog',
+                'assets.assignedAssets.assetlog',
                'assets.assignedAssets.defaultLoc',
                'assets.assignedAssets.location',
                'assets.assignedAssets.model.category',
                'assets.defaultLoc',
                'assets.location',
                'assets.model.category',
-                'accessories.log' => fn($query) => $query->withTrashed()->where('target_type', User::class)->where('target_id', $id)->where('action_type', 'accepted'),
+                'accessories.assetlog',
                'accessories.category',
                'accessories.manufacturer',
-                'consumables.log' => fn($query) => $query->withTrashed()->where('target_type', User::class)->where('target_id', $id)->where('action_type', 'accepted'),
+                'consumables.assetlog',
                'consumables.category',
                'consumables.manufacturer',
                'licenses.category',
--- a/app/Http/Controllers/ViewAssetsController.php
+++ b/app/Http/Controllers/ViewAssetsController.php
@@ -27,126 +27,50 @@ use Exception;
 class ViewAssetsController extends Controller
 {
    /**
-     * Extract custom fields that should be displayed in user view.
-     *
-     * @param User $user
-     * @return array
-     */
-    private function extractCustomFields(User $user): array
-    {
-        $fieldArray = [];
-        foreach ($user->assets as $asset) {
-            if ($asset->model && $asset->model->fieldset) {
-                foreach ($asset->model->fieldset->fields as $field) {
-                    if ($field->display_in_user_view == '1') {
-                        $fieldArray[$field->db_column] = $field->name;
-                    }
-                }
-            }
-        }
-        return array_unique($fieldArray);
-    }
-
-    /**
-     * Get list of users viewable by the current user.
-     *
-     * @param User $authUser
-     * @return \Illuminate\Support\Collection
-     */
-    private function getViewableUsers(User $authUser): \Illuminate\Support\Collection
-    {
-        // SuperAdmin sees all users
-        if ($authUser->isSuperUser()) {
-            return User::select('id', 'first_name', 'last_name', 'username')
-                ->where('activated', 1)
-                ->orderBy('last_name')
-                ->orderBy('first_name')
-                ->get();
-        }
-
-        // Regular manager sees only their subordinates + self
-        $managedUsers = $authUser->getAllSubordinates();
-        
-        // If user has subordinates, show them with self at beginning
-        if ($managedUsers->count() > 0) {
-            return collect([$authUser])->merge($managedUsers)
-                ->sortBy('last_name')
-                ->sortBy('first_name');
-        }
-        
-        // User has no subordinates, only sees themselves
-        return collect([$authUser]);
-    }
-
-    /**
-     * Get the selected user ID from request or default to current user.
-     *
-     * @param Request $request
-     * @param \Illuminate\Support\Collection $subordinates
-     * @param int $defaultUserId
-     * @return int
-     */
-    private function getSelectedUserId(Request $request, \Illuminate\Support\Collection $subordinates, int $defaultUserId): int
-    {
-        // If no subordinates or no user_id in request, return default
-        if ($subordinates->count() <= 1 || !$request->filled('user_id')) {
-            return $defaultUserId;
-        }
-
-        $requestedUserId = (int) $request->input('user_id');
-        
-        // Validate if the requested user is allowed
-        if ($subordinates->contains('id', $requestedUserId)) {
-            return $requestedUserId;
-        }
-        
-        // If invalid ID or not authorized, return default
-        return $defaultUserId;
-    }
-
-    /**
-     * Show user's assigned assets with optional manager view functionality.
+     * Redirect to the profile page.
     *
     */
-    public function getIndex(Request $request) : View | RedirectResponse
+    public function getIndex() : View | RedirectResponse
    {
-        $authUser = auth()->user();
-        $settings = Setting::getSettings();
-        $subordinates = collect();
-        $selectedUserId = $authUser->id;
-
-        // Process manager view if enabled
-        if ($settings->manager_view_enabled) {
-            $subordinates = $this->getViewableUsers($authUser);
-            $selectedUserId = $this->getSelectedUserId($request, $subordinates, $authUser->id);
-        }
-
-        // Load the data for the user to be viewed (either auth user or selected subordinate)
-        $userToView = User::with([
+        $user = User::with(
            'assets',
            'assets.model',
            'assets.model.fieldset.fields',
            'consumables',
            'accessories',
-            'licenses'
-        ])->find($selectedUserId);
+            'licenses',
+        )->find(auth()->id());

-        // If the user to view couldn't be found (shouldn't happen with proper logic), redirect with error
-        if (!$userToView) {
-            return redirect()->route('view-assets')->with('error', trans('admin/users/message.user_not_found'));
+        $field_array = array();
+
+        // Loop through all the custom fields that are applied to any model the user has assigned
+        foreach ($user->assets as $asset) {
+
+            // Make sure the model has a custom fieldset before trying to loop through the associated fields
+            if ($asset->model->fieldset) {
+
+                foreach ($asset->model->fieldset->fields as $field) {
+                    // check and make sure they're allowed to see the value of the custom field
+                    if ($field->display_in_user_view == '1') {
+                        $field_array[$field->db_column] = $field->name;
                    }
                    
-        // Process custom fields for the user being viewed
-        $fieldArray = $this->extractCustomFields($userToView);
+                }
+            }

-        // Pass the necessary data to the view
-        return view('account/view-assets', [
-            'user' => $userToView, // Use 'user' for compatibility with the existing view
-            'field_array' => $fieldArray,
-            'settings' => $settings,
-            'subordinates' => $subordinates,
-            'selectedUserId' => $selectedUserId
-        ]);
+        }
+
+        // Since some models may re-use the same fieldsets/fields, let's make the array unique so we don't repeat columns
+        array_unique($field_array);
+
+        if (isset($user->id)) {
+            return view('account/view-assets', compact('user', 'field_array' ))
+                ->with('settings', Setting::getSettings());
+        }
+
+        // Redirect to the user management page
+        return redirect()->route('users.index')
+            ->with('error', trans('admin/users/message.user_not_found', $user->id));
    }

    /**
@@ -185,7 +109,7 @@ class ViewAssetsController extends Controller
        $logaction->target_type = User::class;

        $data['item_quantity'] = $request->has('request-quantity') ? e($request->input('request-quantity')) : 1;
-        $data['requested_by'] = $user->display_name;
+        $data['requested_by'] = $user->present()->fullName();
        $data['item'] = $item;
        $data['item_type'] = $itemType;
        $data['target'] = auth()->user();
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -73,7 +73,6 @@ class Kernel extends HttpKernel
        'can' => \Illuminate\Auth\Middleware\Authorize::class,
        'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
        'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
-        'api-throttle' => \App\Http\Middleware\SetAPIResponseHeaders::class,
        'health' => null,
    ];
 }
--- a/app/Http/Middleware/SecurityHeaders.php
+++ b/app/Http/Middleware/SecurityHeaders.php
@@ -26,6 +26,7 @@ class SecurityHeaders
        $response = $next($request);

        $response->headers->set('X-Content-Type-Options', 'nosniff');
+        $response->headers->set('X-XSS-Protection', '1; mode=block');

        // Ugh. Feature-Policy is dumb and clumsy and mostly irrelevant for Snipe-IT,
        // since we don't provide any way to IFRAME anything in in the first place.
--- a/app/Http/Middleware/SetAPIResponseHeaders.php
+++ b/app/Http/Middleware/SetAPIResponseHeaders.php
@@ -1,82 +0,0 @@
-<?php
-
-namespace App\Http\Middleware;
-
-use Closure;
-use Illuminate\Routing\Middleware\ThrottleRequests;
-use Symfony\Component\HttpFoundation\Response;
-
-class SetAPIResponseHeaders extends ThrottleRequests
-{
-
-    /**
-     * Add the rate limit headers to the response.
-     *
-     * This extends the original ThrottleRequests middleware to add the 'X-RateLimit-Reset' and 'Retry-After' headers, even
-     * if the rate limit is not exceeded.
-     * @param $maxAttempts
-     * @param $remainingAttempts
-     * @param $retryAfter
-     * @param Response|null $response
-     * @return array|int[]
-     */
-    protected function getHeaders($maxAttempts,  $remainingAttempts, $retryAfter = null, ?Response $response = null)
-    {
-        if ($response &&
-            ! is_null($response->headers->get('X-RateLimit-Remaining')) &&
-            (int) $response->headers->get('X-RateLimit-Remaining') <= (int) $remainingAttempts) {
-            $headers = [];
-            $headers['Retry-After'] = $retryAfter; // this is the only line we changed
-            $headers['X-RateLimit-Reset'] = $retryAfter; // this is the only line we changed
-            $headers['X-RateLimit-Reset-Timestamp'] = $this->availableAt($retryAfter); // this is the only line we changed
-            return $headers;
-        }
-
-        $headers = [
-            'X-RateLimit-Limit' => $maxAttempts,
-            'X-RateLimit-Remaining' => $remainingAttempts,
-        ];
-
-        if (! is_null($retryAfter)) {
-            $headers['Retry-After'] = $retryAfter;
-            $headers['X-RateLimit-Reset'] = $retryAfter; // this is the only line we changed
-            $headers['X-RateLimit-Reset-Timestamp'] = $this->availableAt($retryAfter); // this is the only line we changed
-        }
-
-        return $headers;
-    }
-
-
-
-    /**
-     * Handle an incoming request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure  $next
-     * @return mixed
-     */
-    protected function handleRequest($request, Closure $next, array $limits)
-    {
-        foreach ($limits as $limit) {
-            if ($this->limiter->tooManyAttempts($limit->key, $limit->maxAttempts)) {
-                throw $this->buildException($request, $limit->key, $limit->maxAttempts, $limit->responseCallback);
-            }
-
-            $this->limiter->hit($limit->key, $limit->decaySeconds);
-        }
-
-        $response = $next($request);
-
-        foreach ($limits as $limit) {
-            $response = $this->addHeaders(
-                $response,
-                $limit->maxAttempts,
-                $this->calculateRemainingAttempts($limit->key, $limit->maxAttempts),
-                $this->getTimeUntilNextRetry($limit->key) // this is the only line we changed
-            );
-        }
-
-        return $response;
-    }
-
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
snipe	c3d834cb9d	Re-adding scope Signed-off-by: snipe <snipe@snipe.net>	2025-04-18 04:16:40 +01:00
snipe	4e52aa7e12	Removed the wrong method lol Signed-off-by: snipe <snipe@snipe.net>	2025-04-18 04:15:40 +01:00
snipe	4e97eac13c	Dev assets Signed-off-by: snipe <snipe@snipe.net>	2025-04-18 04:12:10 +01:00
snipe	b7ba48c589	Remove unused method Signed-off-by: snipe <snipe@snipe.net>	2025-04-18 04:07:12 +01:00
snipe	9a2403b4a1	Refactor for more logging, switch to use the components Signed-off-by: snipe <snipe@snipe.net>	2025-04-18 04:07:12 +01:00
snipe	14f95033a8	Consumables history table Signed-off-by: snipe <snipe@snipe.net>	2025-04-18 04:07:12 +01:00
snipe	cca52a1e70	Use target or item Signed-off-by: snipe <snipe@snipe.net>	2025-04-18 04:07:12 +01:00
snipe	93a809ecaf	Added history count badge, use blade component Signed-off-by: snipe <snipe@snipe.net>	2025-04-18 04:07:12 +01:00
snipe	28051d82c2	Create history table component Signed-off-by: snipe <snipe@snipe.net>	2025-04-18 04:07:12 +01:00
snipe	91265184a7	Added translations Signed-off-by: snipe <snipe@snipe.net>	2025-04-18 04:07:12 +01:00
snipe	b91971961b	Find targetlogs Signed-off-by: snipe <snipe@snipe.net>	2025-04-18 04:07:12 +01:00
snipe	52d0fcc802	Fixed user file uploads > 1 Signed-off-by: snipe <snipe@snipe.net>	2025-04-18 04:07:12 +01:00
snipe	2f1b7ec8c1	Added created by Signed-off-by: snipe <snipe@snipe.net>	2025-04-18 04:07:12 +01:00
snipe	3f74b6cc72	Fixed doofy export filename Signed-off-by: snipe <snipe@snipe.net>	2025-04-18 04:07:12 +01:00
snipe	a455f82474	Prod assets Signed-off-by: snipe <snipe@snipe.net>	2025-04-18 04:07:12 +01:00
snipe	d450847754	Comment out location scoping option for now Signed-off-by: snipe <snipe@snipe.net>	2025-04-18 04:06:48 +01:00
snipe	737ddb173f	Prod assets Signed-off-by: snipe <snipe@snipe.net>	2025-04-18 04:06:47 +01:00