snipe 97731cd7c8 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		2022-12-05 16:34:34 -08:00
..
accessories	Fixed image path to show preview	2022-11-03 13:51:48 -07:00
account	Fixed broken table header tag	2022-11-14 22:06:23 +00:00
asset_maintenances	Use BS datepicker’s built in clear button	2022-09-26 14:34:35 -07:00
auth	Set safeMode to true and use helper for all parsedown	2022-08-29 11:26:47 -07:00
categories	Use scoped query for asset count	2022-06-23 13:43:23 -07:00
companies	Added bulk edit to company view	2022-08-01 14:06:18 -07:00
components	Fixed image path to show preview	2022-11-03 13:51:48 -07:00
consumables	Fixed image path to show preview	2022-11-03 13:51:48 -07:00
custom_fields	Properly select 'CUSTOM REGEX' from the select list if the format declares onee	2022-11-30 16:21:23 -06:00
departments	Squashed commit of the following:	2022-06-14 17:54:18 -07:00
depreciations	Fixed #11232 - missing closing div	2022-06-01 10:26:26 -07:00
errors	Fixed #11124 - updated maintenance page	2022-05-17 19:01:37 -07:00
groups	Squashed commit of the following:	2022-06-14 17:54:18 -07:00
hardware	Replace error suppression with better logic	2022-11-15 17:41:57 +00:00
importer	Changed button icon for importer	2022-10-21 16:59:19 -07:00
kits	Fixed kit parse error on model edit	2022-10-18 15:00:33 -07:00
layouts	Removed extra spaces	2022-10-26 10:51:06 -07:00
licenses	Prevent 500 if license file is missing	2022-11-14 17:42:40 +00:00
livewire	Save and show the default values properly on custom fields of type checkbox	2022-09-15 11:52:49 -05:00
locations	Added Assets Assigned to tab	2022-10-26 00:16:06 -07:00
manufacturers	Use new scope for additional tabs	2022-06-23 15:37:39 -07:00
modals	Merge pull request #9 from snipe/develop	2022-01-04 10:48:51 +01:00
models	Corrected the view when editing custom fields values	2022-11-23 16:34:29 -06:00
notifications	Added serial number to emailed inventory report	2022-11-28 17:14:38 -08:00
paginator	Version 3 - hold onto your butts	2016-03-25 01:18:05 -07:00
partials	Inherit the background color, since the field isn’t actually technically readonly	2022-11-22 08:54:48 -08:00
reports	adds serial to activity report page	2022-11-17 13:09:06 -08:00
settings	Updated help text to be more clear	2022-10-11 12:38:37 -07:00
setup	Typo of 'general' was in the migration blade a few places	2022-06-24 16:00:15 -07:00
statuslabels	Squashed commit of the following:	2022-06-14 17:54:18 -07:00
suppliers	Use scoped query for asset count	2022-06-23 13:43:23 -07:00
users	Add jobh title to header in print assets view	2022-11-28 19:19:42 -08:00
vendor	Fix typo in variable (ah-hyuck!)	2022-11-15 11:00:40 -06:00
dashboard.blade.php	Modified dashboard tooltips to add percentage as well as count	2022-09-29 13:46:56 -07:00
notifications.blade.php	Add files via upload	2022-08-31 13:07:05 +02:00