snipe 221cf1f9c8 Merge branch 'checkout-to-things-v1' of https://github.com/dmeltzer/snipe-it into dmeltzer-checkout-to-things-v1 ... # Conflicts: # app/Http/Controllers/AssetsController.php # app/Http/Controllers/ReportsController.php # app/Http/Controllers/UsersController.php # app/Presenters/AssetPresenter.php		2016-12-29 16:20:17 -08:00
..
assets	Make delete routes work. (#3077)	2016-12-19 10:42:33 -08:00
lang	Move sanitization of input to the model attribute setters. This cleans up a lot of checks in the various controller methods and ensures data will be set in the model accurately regardless of where it's set. Add unit tests for these methods (#3102)	2016-12-26 15:17:46 -08:00
macros	Allow certain users to override 2FA with permission	2016-10-31 16:52:25 -07:00
views	Merge branch 'checkout-to-things-v1' of https://github.com/dmeltzer/snipe-it into dmeltzer-checkout-to-things-v1	2016-12-29 16:20:17 -08:00