snipe bcd988bb81 Merge branch 'develop' of https://github.com/DeusMaximus/snipe-it into develop ... # Conflicts: # app/Http/Controllers/Auth/LoginController.php		2018-07-17 01:11:15 -07:00
..
Console	Check for > 0 expected assets	2018-05-21 15:41:19 -07:00
Events
Exceptions	Assetcontroller cleanup (#5858)	2018-07-16 17:44:03 -07:00
Helpers	Remove old helpers (#5843)	2018-07-16 14:22:25 -07:00
Http	Merge branch 'develop' of https://github.com/DeusMaximus/snipe-it into develop	2018-07-17 01:11:15 -07:00
Importer	Assetcontroller cleanup (#5858)	2018-07-16 17:44:03 -07:00
Jobs
LegacyEncrypter
Listeners	Fixed typo	2018-07-17 01:03:32 -07:00
Models	Fix: Searching for multiple terms on assets (#5860)	2018-07-16 17:44:31 -07:00
Notifications	Fixing #5470: Checkin emails not working (#5838)	2018-07-16 14:09:04 -07:00
Observers
Policies	Adds permission checks for custom fields and custom fieldsets (#5645) (#5795)	2018-07-12 18:28:20 -07:00
Presenters	Update my email address across files. (#5716)	2018-06-20 01:59:59 -07:00
Providers	Added login log	2018-07-16 23:49:08 -07:00