snipe-it/resources/views/hardware
snipe 407445456a Merge branch 'features/6204_email_audit-alerts' into develop
# Conflicts:
#	app/Console/Commands/LdapSync.php
#	app/Console/Kernel.php
#	app/Http/Controllers/Auth/LoginController.php
#	app/Http/Controllers/LicensesController.php
#	composer.json
#	composer.lock
#	config/version.php
#	resources/views/auth/two_factor_enroll.blade.php
2019-05-06 08:45:13 -04:00
..
audit-due.blade.php Added language strings for audit views 2019-05-05 19:35:20 -04:00
audit-overdue.blade.php Added language strings for audit views 2019-05-05 19:35:20 -04:00
audit.blade.php Reformatted help popover 2018-10-04 20:51:50 -07:00
bulk-checkout.blade.php adds select-id as an option for the asset-select partial. allows you to manually override the ID of an element. currently, the bulk-checkout partial has two asset-selects, with conflicting IDs. attempts to resolve #5882 (#5883) 2018-07-18 19:55:13 -07:00
bulk-delete.blade.php Changed assetloc to location 2017-11-02 12:50:34 -07:00
bulk.blade.php Remove old helpers (#5843) 2018-07-16 14:22:25 -07:00
checkin.blade.php Valo/checkin date in history of asset (#6733) 2019-03-13 21:36:32 -07:00
checkout.blade.php Display asset name if one exists and the user cannot edit 2018-10-15 17:02:31 -07:00
edit.blade.php Fixed #6301: Do not allow duplicate asset tags (#6324) 2018-10-11 17:15:09 -07:00
history.blade.php Fixed #6634: Asset Import History fixes and optimizations (#6657) 2019-02-08 16:05:56 -08:00
index.blade.php Fixed - suppress the asset create button if the user is not allowed to create assets 2018-10-15 17:57:47 -07:00
labels.blade.php Allow multiple upload fields and add logo option to labels (#6736) 2019-03-01 15:25:42 -08:00
qr-view.blade.php PHP7.2 count fixes (#5427) 2018-04-29 06:10:49 -07:00
quickscan.blade.php Insert audited items to the top of the list. (#6376) 2018-10-31 11:13:08 -07:00
requested.blade.php WIP - Improved requested assets (#5289) 2018-04-04 17:33:02 -07:00
view.blade.php Added “record created” string for clarification in asset/license history 2019-03-13 22:06:57 -07:00