Merge remote-tracking branch 'origin/develop'

Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/css/dist/skins/skin-black-dark.css
#	public/css/dist/skins/skin-black-dark.min.css
#	public/css/dist/skins/skin-black.css
#	public/css/dist/skins/skin-black.min.css
#	public/css/dist/skins/skin-blue-dark.css
#	public/css/dist/skins/skin-blue-dark.min.css
#	public/css/dist/skins/skin-blue.css
#	public/css/dist/skins/skin-blue.min.css
#	public/css/dist/skins/skin-green-dark.css
#	public/css/dist/skins/skin-green-dark.min.css
#	public/css/dist/skins/skin-green.css
#	public/css/dist/skins/skin-green.min.css
#	public/css/dist/skins/skin-orange-dark.css
#	public/css/dist/skins/skin-orange-dark.min.css
#	public/css/dist/skins/skin-orange.css
#	public/css/dist/skins/skin-orange.min.css
#	public/css/dist/skins/skin-purple-dark.css
#	public/css/dist/skins/skin-purple-dark.min.css
#	public/css/dist/skins/skin-purple.css
#	public/css/dist/skins/skin-purple.min.css
#	public/css/dist/skins/skin-red-dark.css
#	public/css/dist/skins/skin-red-dark.min.css
#	public/css/dist/skins/skin-red.css
#	public/css/dist/skins/skin-red.min.css
#	public/css/dist/skins/skin-yellow-dark.css
#	public/css/dist/skins/skin-yellow-dark.min.css
#	public/css/dist/skins/skin-yellow.css
#	public/css/dist/skins/skin-yellow.min.css
#	public/mix-manifest.json

.all-contributorsrc

@@ -2801,6 +2801,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "akemidx",
+      "name": "akemidx",
+      "avatar_url": "https://avatars.githubusercontent.com/u/116301219?v=4",
+      "profile": "https://github.com/akemidx",
+      "contributions": [
+        "code"
+      ]
     }
   ]
 }

README.md

@@ -1,5 +1,5 @@
 ![Build Status](https://app.chipperci.com/projects/0e5f8979-31eb-4ee6-9abf-050b76ab0383/status/master) [![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/) [![Twitter Follow](https://img.shields.io/twitter/follow/snipeitapp.svg?style=social)](https://twitter.com/snipeitapp)  [![Codacy Badge](https://api.codacy.com/project/badge/Grade/553ce52037fc43ea99149785afcfe641)](https://www.codacy.com/app/snipe/snipe-it?utm_source=github.com&utm_medium=referral&utm_content=snipe/snipe-it&utm_campaign=Badge_Grade)
-[![All Contributors](https://img.shields.io/badge/all_contributors-308-orange.svg?style=flat-square)](#contributors) [![Discord](https://badgen.net/badge/icon/discord?icon=discord&label)](https://discord.gg/yZFtShAcKk) [![huntr](https://cdn.huntr.dev/huntr_security_badge_mono.svg)](https://huntr.dev)
+[![All Contributors](https://img.shields.io/badge/all_contributors-309-orange.svg?style=flat-square)](#contributors) [![Discord](https://badgen.net/badge/icon/discord?icon=discord&label)](https://discord.gg/yZFtShAcKk) [![huntr](https://cdn.huntr.dev/huntr_security_badge_mono.svg)](https://huntr.dev)
 
 ## Snipe-IT - Open Source Asset Management System
 
@@ -139,6 +139,7 @@ Thanks goes to all of these wonderful people ([emoji key](https://github.com/ken
 | [<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") |
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
 This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome!

app/Http/Controllers/Api/UsersController.php

@@ -492,7 +492,7 @@ class UsersController extends Controller
     }
 
     /**
-     * Notify a specific user via email with all of his assigned assets.
+     * Notify a specific user via email with all of their assigned assets.
      *
      * @author [Lukas Fehling] [<lukas.fehling@adabay.rocks>]
      * @since [v6.0.13]
@@ -505,22 +505,11 @@ class UsersController extends Controller
         $user = User::findOrFail($id);
 
         if (empty($user->email)) {
-            return response()->json(
+            return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/users/message.inventorynotification.error')));
-                [
-                    'status' => 'error',
-                    'message' => 'This user has no email set.',
-                    'payload' => null,
-                ], 404);
         }
-
+ 
-        $user->notify((new CurrentInventory($user)));
+        return response()->Helper::formatStandardApiResponse('success', null, trans('admin/users/message.inventorynotification.success'));
-
+ 
-        return response()->json(
-            [
-                'status' => 'success',
-                'message' => 'The user was notified about his current inventory.',
-                'payload' => null,
-            ], 200);
     }
 
     /**

public/mix-manifest.json

@@ -1,23 +1,23 @@
 {
     "/js/build/app.js": "/js/build/app.js?id=f19f6d7dd0a5a579589e538977255b18",
-    "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=940da5c039a1f104654e127e0d43b801",
+    "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=392cc93cfc0be0349bab9697669dd091",
     "/css/build/overrides.css": "/css/build/overrides.css?id=e946ade78cda507ae99ecfaf10d43368",
     "/css/build/app.css": "/css/build/app.css?id=41ec65bd0c0e3000a48af1893e313cc6",
     "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=f25c77ed07053646a42e9c19923d24fa",
-    "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=083eab0a6e1062adfe24ee21a829e6c3",
+    "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=268041e902b019730c23ee3875838005",
-    "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=695630d340769449855b2d544d3993db",
+    "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=c3aebf96518113fe22517a67c6ec1dc1",
-    "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=cea656be7c914908a0faaea6217857eb",
+    "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=bf6f6c2270110b3b29f2f3af7e07636d",
-    "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=a06fd1a29ac0dddbb55c5381cf9e9401",
+    "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=b23ea958779a62474f398ffab9da7ba1",
-    "/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=bcacab67c45f81a06e6f84c4872cfd84",
+    "/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=fc7adb943668ac69fe4b646625a7571f",
-    "/css/dist/skins/skin-purple-dark.css": "/css/dist/skins/skin-purple-dark.css?id=6f4a85278d217139351868bde9e9a224",
+    "/css/dist/skins/skin-purple-dark.css": "/css/dist/skins/skin-purple-dark.css?id=5f7e5307fa12a54195d2000b5b5b5076",
-    "/css/dist/skins/skin-purple.css": "/css/dist/skins/skin-purple.css?id=06ff5fe6930e974a9d13794196fcf48a",
+    "/css/dist/skins/skin-purple.css": "/css/dist/skins/skin-purple.css?id=cf6c8c340420724b02d6e787ef9bded5",
-    "/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css?id=90e155d4e7bb15cd4396a9a2252428fb",
+    "/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css?id=0f4baf95eb4bb23cf837007e61cb666e",
-    "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=404aea7beeac389978f2306358f545ba",
+    "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=067d7b5d630f23d68ea3b1122527cb04",
-    "/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=c3033f52259f665b0e46b9c88543035a",
+    "/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=1f33ca3d860461c1127ec465ab3ebb6b",
-    "/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=287b8e3fb75a1b76d0ec190ce88b8b8e",
+    "/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=8f449de09e00c15481b144b44b1a7185",
-    "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=af9b811e81b591789d1155c0d4ed42af",
+    "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=b48f4d8af0e1ca5621c161e93951109f",
     "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=fc501683e0cb04a8717593610d215baf",
-    "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=476ccb37fe487f4d29ebfb49c198e311",
+    "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=b9a74ec0cd68f83e7480d5ae39919beb",
     "/css/dist/all.css": "/css/dist/all.css?id=a1563bbeb0d0369c50f67591537ec7ae",
     "/css/blue.png": "/css/blue.png?id=e83a6c29e04fe851f2122815b2e4b150",
     "/css/blue@2x.png": "/css/blue@2x.png?id=51135dd4d24f88f5de0b2414bd51dac5",
@@ -35,19 +35,19 @@
     "/js/build/vendor.js": "/js/build/vendor.js?id=47ecbb4bb3b0e02315f391caadbdf971",
     "/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=14d9a2affec7b066d20fcba2e6e67ad2",
     "/js/dist/all.js": "/js/dist/all.js?id=081efc7b07f9a7a308efad9108c8ec66",
-    "/css/dist/skins/skin-green.min.css": "/css/dist/skins/skin-green.min.css?id=af9b811e81b591789d1155c0d4ed42af",
+    "/css/dist/skins/skin-green.min.css": "/css/dist/skins/skin-green.min.css?id=b48f4d8af0e1ca5621c161e93951109f",
-    "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=287b8e3fb75a1b76d0ec190ce88b8b8e",
+    "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=8f449de09e00c15481b144b44b1a7185",
-    "/css/dist/skins/skin-black.min.css": "/css/dist/skins/skin-black.min.css?id=c3033f52259f665b0e46b9c88543035a",
+    "/css/dist/skins/skin-black.min.css": "/css/dist/skins/skin-black.min.css?id=1f33ca3d860461c1127ec465ab3ebb6b",
-    "/css/dist/skins/skin-black-dark.min.css": "/css/dist/skins/skin-black-dark.min.css?id=404aea7beeac389978f2306358f545ba",
+    "/css/dist/skins/skin-black-dark.min.css": "/css/dist/skins/skin-black-dark.min.css?id=067d7b5d630f23d68ea3b1122527cb04",
-    "/css/dist/skins/skin-blue.min.css": "/css/dist/skins/skin-blue.min.css?id=940da5c039a1f104654e127e0d43b801",
+    "/css/dist/skins/skin-blue.min.css": "/css/dist/skins/skin-blue.min.css?id=392cc93cfc0be0349bab9697669dd091",
-    "/css/dist/skins/skin-blue-dark.min.css": "/css/dist/skins/skin-blue-dark.min.css?id=cea656be7c914908a0faaea6217857eb",
+    "/css/dist/skins/skin-blue-dark.min.css": "/css/dist/skins/skin-blue-dark.min.css?id=bf6f6c2270110b3b29f2f3af7e07636d",
-    "/css/dist/skins/skin-yellow.min.css": "/css/dist/skins/skin-yellow.min.css?id=bcacab67c45f81a06e6f84c4872cfd84",
+    "/css/dist/skins/skin-yellow.min.css": "/css/dist/skins/skin-yellow.min.css?id=fc7adb943668ac69fe4b646625a7571f",
-    "/css/dist/skins/skin-yellow-dark.min.css": "/css/dist/skins/skin-yellow-dark.min.css?id=a06fd1a29ac0dddbb55c5381cf9e9401",
+    "/css/dist/skins/skin-yellow-dark.min.css": "/css/dist/skins/skin-yellow-dark.min.css?id=b23ea958779a62474f398ffab9da7ba1",
-    "/css/dist/skins/skin-red.min.css": "/css/dist/skins/skin-red.min.css?id=476ccb37fe487f4d29ebfb49c198e311",
+    "/css/dist/skins/skin-red.min.css": "/css/dist/skins/skin-red.min.css?id=b9a74ec0cd68f83e7480d5ae39919beb",
-    "/css/dist/skins/skin-red-dark.min.css": "/css/dist/skins/skin-red-dark.min.css?id=90e155d4e7bb15cd4396a9a2252428fb",
+    "/css/dist/skins/skin-red-dark.min.css": "/css/dist/skins/skin-red-dark.min.css?id=0f4baf95eb4bb23cf837007e61cb666e",
-    "/css/dist/skins/skin-purple.min.css": "/css/dist/skins/skin-purple.min.css?id=06ff5fe6930e974a9d13794196fcf48a",
+    "/css/dist/skins/skin-purple.min.css": "/css/dist/skins/skin-purple.min.css?id=cf6c8c340420724b02d6e787ef9bded5",
-    "/css/dist/skins/skin-purple-dark.min.css": "/css/dist/skins/skin-purple-dark.min.css?id=6f4a85278d217139351868bde9e9a224",
+    "/css/dist/skins/skin-purple-dark.min.css": "/css/dist/skins/skin-purple-dark.min.css?id=5f7e5307fa12a54195d2000b5b5b5076",
-    "/css/dist/skins/skin-orange.min.css": "/css/dist/skins/skin-orange.min.css?id=083eab0a6e1062adfe24ee21a829e6c3",
+    "/css/dist/skins/skin-orange.min.css": "/css/dist/skins/skin-orange.min.css?id=268041e902b019730c23ee3875838005",
-    "/css/dist/skins/skin-orange-dark.min.css": "/css/dist/skins/skin-orange-dark.min.css?id=695630d340769449855b2d544d3993db",
+    "/css/dist/skins/skin-orange-dark.min.css": "/css/dist/skins/skin-orange-dark.min.css?id=c3aebf96518113fe22517a67c6ec1dc1",
     "/css/dist/skins/skin-contrast.min.css": "/css/dist/skins/skin-contrast.min.css?id=fc501683e0cb04a8717593610d215baf"
 }

resources/assets/less/skins/skin-black-dark.less

@@ -152,6 +152,9 @@ a {
 .thead, .navbar-nav>li>a:link {
   color: var(--nav-link);
 }
+.far fa-life-ring{
+  color:var(--link);
+}
 
 .modal-content {
   background-color: var(--back-main);

resources/assets/less/skins/skin-black.less

@@ -124,6 +124,9 @@ a.btn-info:link, a.btn-warning:link, a.btn-danger:link{
 .btn-danger.btn-sm.disabled{
   color: #FFF;
 }
+.far fa-life-ring{
+  color:var(--link);
+}
 
 .sidebar-toggle-mobile {
   color: #FFF !important;

resources/assets/less/skins/skin-blue-dark.less

@@ -149,7 +149,9 @@ a {
 .thead, .navbar-nav>li>a:link {
   color: var(--nav-link);
 }
-
+.far fa-life-ring{
+  color:var(--link);
+}
 .modal-content {
   background-color: var(--back-main);
   color: var(--text-main);

resources/assets/less/skins/skin-blue.less

@@ -52,7 +52,7 @@
 
 .skin-blue.layout-top-nav .main-header > .logo {
   .logo-variant {
-    background-color: none;
+    background-color: unset;
   }
 }
 
@@ -98,7 +98,7 @@
     color: #fff;
 }
 
-.btn-default:link, a.btn-default:hover, .btn-default:visited,
+.btn-default:link, a.btn-default:hover, .btn-default:visited
 {
   color: @dark-gray;
 }
@@ -138,7 +138,9 @@ a:hover {
 .text-primary {
   color: darken(@light-blue, 20%);
 }
-
+.far fa-life-ring{
+  color:var(--link);
+}
 
 .fixed-table-container tbody .selected td {
   background-color: #fff8af;

resources/assets/less/skins/skin-green-dark.less

@@ -142,7 +142,9 @@ a {
 .bootstrap-table .fixed-table-container .table thead th .sortable {
   color: var(--nav-link);
 }
-
+.far fa-life-ring{
+  color:var(--link);
+}
 .thead, .navbar-nav>li>a:link {
   color: var(--nav-link);
 }

resources/assets/less/skins/skin-green.less

@@ -125,7 +125,9 @@ a {
 .text-primary {
   color: darken(@green, 20%);
 }
-
+.far fa-life-ring{
+  color:var(--link);
+}
 .fixed-table-container tbody .selected td {
   background-color: #fff8af;
 }

resources/assets/less/skins/skin-orange-dark.less

@@ -126,6 +126,9 @@ li.dropdown-item-marker {
   background: linear-gradient(to bottom, var(--header) 0%,var(--header) 100%);
   border-color: var(--header);
 }
+.far fa-life-ring{
+  color:var(--link);
+}
 
 .bootstrap-table .fixed-table-container .table thead th .sortable {
   color: var(--nav-link);

resources/assets/less/skins/skin-orange.less

@@ -119,6 +119,9 @@ a.btn-info:link, a.btn-warning:link, a.btn-danger:link{
 &a.btn-info:visited, a.btn-warning:visited, a.btn-danger:visited{
   color: #FFF;
 }
+.far fa-life-ring{
+  color:var(--link);
+}
 
 .fixed-table-container tbody .selected td {
   background-color: #fff8af;

resources/assets/less/skins/skin-purple-dark.less

@@ -162,7 +162,9 @@ a {
 a:link {
   color: var(--link);
 }
-
+.far fa-life-ring{
+  color:var(--link);
+}
 .btn-primary.hover {
   color: var(--nav-link);
 }

resources/assets/less/skins/skin-purple.less

@@ -128,7 +128,9 @@ a.btn-info:link, a.btn-warning:link, a.btn-danger:link{
 .select2-container--default .select2-selection--multiple .select2-selection__choice {
   background-color: @purple;
 }
-
+.far fa-life-ring{
+  color:var(--link);
+}
 .search-highlight, .search-highlight:hover {
   background-color: #e9d15b;
 }

resources/assets/less/skins/skin-red-dark.less

@@ -169,6 +169,9 @@ a:visited {
 a:hover {
   color: var(--hover-link);
 }
+.far fa-life-ring{
+  color:var(--link);
+}
 
 .btn-primary.hover {
   color: var(--nav-link);

resources/assets/less/skins/skin-red.less

@@ -137,4 +137,7 @@ a.btn-info:link, a.btn-warning:link, a.btn-danger:link{
 
 .search-highlight, .search-highlight:hover {
   background-color: #e9d15b;
+}
+.far fa-life-ring{
+  color:var(--link);
 }

resources/assets/less/skins/skin-yellow-dark.less

@@ -170,6 +170,9 @@ a:link.btn-default{
     color: var(--nav-link) !important;
   }
 }
+.far fa-life-ring{
+  color:var(--link);
+}
 
 #accessoriesTable>tbody>tr>td>nobr>a>i.fa {
   color: var(--text-main);

resources/assets/less/skins/skin-yellow.less

@@ -141,4 +141,7 @@ a {
 }
 .skin-yellow .main-header .navbar .nav > li > a {
   color: #413F42;
+}
+.far fa-life-ring{
+  color:var(--link);
 }

resources/lang/en/admin/accessories/message.php

@@ -31,7 +31,8 @@ return array(
         'error'   		=> 'Accessory was not checked in, please try again',
         'success' 		=> 'Accessory checked in successfully.',
         'user_does_not_exist' => 'That user is invalid. Please try again.'
-    )
+    ),
+
 
 
 );

resources/lang/en/admin/users/message.php

@@ -59,4 +59,8 @@ return array(
         'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.',
     ),
 
+    'inventorynotification' => array(
+        'error'   => 'This user has no email set.',
+        'success' => 'The user has been notified about their current inventory.'
+    )
 );

resources/views/custom_fields/fields/edit.blade.php

@@ -74,8 +74,14 @@
             <label for="format" class="col-md-4 control-label">
               {{ trans('admin/custom_fields/general.field_format') }}
             </label>
+              @php
+              $field_format = '';
+              if (stripos($field->format, 'regex') === 0){
+                $field_format = 'CUSTOM REGEX';
+              }
+              @endphp
             <div class="col-md-6 required">
-              {{ Form::select("format",Helper::predefined_formats(), $field->format, array('class'=>'format select2 form-control', 'aria-label'=>'format')) }}
+              {{ Form::select("format",Helper::predefined_formats(), ($field_format == '') ? $field->format : $field_format, array('class'=>'format select2 form-control', 'aria-label'=>'format')) }}
               {!! $errors->first('format', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
             </div>
           </div>