snipe b29d7beb3a Merge branch 'develop' ... # Conflicts: # .gitignore # Dockerfile # README.md # app/Http/Controllers/AccessoriesController.php # app/Http/Controllers/AssetMaintenancesController.php # app/Http/Controllers/AssetsController.php # app/Http/Controllers/ConsumablesController.php # app/Http/Controllers/GroupsController.php # app/Http/Controllers/LicensesController.php # app/Http/Controllers/ReportsController.php # app/Http/Controllers/UsersController.php # app/Http/routes.php # app/Models/Depreciation.php # app/Models/Location.php # config/version.php # resources/views/account/view-assets.blade.php # resources/views/hardware/edit.blade.php # resources/views/hardware/view.blade.php # resources/views/partials/modals.blade.php # resources/views/reports/custom.blade.php # snipeit.sh		2017-09-22 16:12:18 -07:00
..
accessories	Partialize forms (#2884)	2016-11-16 16:56:57 -08:00
asset_maintenances	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
categories	More minor fixes (#3126)	2017-01-03 16:55:43 -08:00
companies	Partialize forms (#2884)	2016-11-16 16:56:57 -08:00
components	Updated translation strings with new purge text	2016-04-19 12:26:49 -07:00
consumables	Partialize forms (#2884)	2016-11-16 16:56:57 -08:00
custom_fields	Adds basic GET api support for CustomFieldsets (#3697)	2017-07-12 17:51:22 -07:00
departments	Dept strings	2017-05-23 02:50:16 -07:00
depreciations	Partialize forms (#2884)	2016-11-16 16:56:57 -08:00
groups	Partialize forms (#2884)	2016-11-16 16:56:57 -08:00
hardware	Merge branch 'develop'	2017-09-22 16:12:18 -07:00
licenses	Allow XML mimetypes	2016-11-29 08:01:08 -08:00
locations	Add support for location-specific LDAP OUs. (#3176)	2017-01-11 23:37:14 -08:00
manufacturers	Fixes #3311 - more fields for manufacturers	2017-03-10 22:08:59 -08:00
models	Fixes #3414 - bulk update for asset models	2017-06-08 17:48:48 -07:00
reports	Updated translation strings with new purge text	2016-04-19 12:26:49 -07:00
settings	Auduting improvements	2017-08-25 18:40:20 -07:00
statuslabels	Show in nav language option	2016-08-23 15:51:45 -07:00
suppliers	Partialize forms (#2884)	2016-11-16 16:56:57 -08:00
users	Fixes #3924 - missing/donked language string	2017-09-06 17:11:23 -07:00