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
..
asset-requested.blade.php	WIP - Improved requested assets (#5289)	2018-04-04 17:33:02 -07:00
checkin-accessory.blade.php	Notification improvements (#5254)	2018-03-25 13:46:57 -07:00
checkin-asset.blade.php	Fixed #6029 - model number not appearing in checkin/checkout emails	2018-08-02 11:43:11 -07:00
checkin-license.blade.php	Add category to licenses	2018-05-08 00:14:38 -07:00
checkout-accessory.blade.php	Notification improvements (#5254)	2018-03-25 13:46:57 -07:00
checkout-asset.blade.php	Fixed #6082 - don’t show expected checkin in email if none given	2018-08-16 14:30:06 -07:00
checkout-consumable.blade.php	Notification improvements (#5254)	2018-03-25 13:46:57 -07:00
checkout-license.blade.php	#5696 proposed fix (#6314)	2018-10-11 14:08:09 -07:00
report-expected-checkins.blade.php	Added model name to expected checkin reminders	2018-05-08 05:59:34 -07:00
report-expiring-assets.blade.php	Features/nicer notifications (#5886)	2018-07-18 19:15:45 -07:00
report-expiring-licenses.blade.php	Features/nicer notifications (#5886)	2018-07-18 19:15:45 -07:00
report-low-inventory.blade.php	Fixed #6323 - typo in link for low inventory	2018-10-11 15:31:10 -07:00
upcoming-audits.blade.php	Added scope for both overdue and upcoming	2019-05-05 22:13:30 -04:00
user-inventory.blade.php	Added console command to send inventory reports to users	2018-09-07 02:24:41 -07:00