snipe f2f8f96991 Merge remote-tracking branch 'origin/master' into develop ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # app/Http/Controllers/Api/AssetsController.php # app/Http/Transformers/AssetsTransformer.php # app/Importer/ConsumableImporter.php # app/Models/Consumable.php # config/version.php # package-lock.json # package.json # public/css/dist/all.css # public/css/dist/bootstrap-table.css # public/js/build/app.js # public/js/dist/all.js # public/js/dist/bootstrap-table.js # public/mix-manifest.json # resources/views/custom_fields/fieldsets/view.blade.php # resources/views/layouts/default.blade.php # routes/web.php # routes/web/fields.php		2021-11-15 19:24:38 -08:00
..
accessories.php	Fixed accessories route	2021-09-24 04:11:58 -07:00
components.php	Fixes route not defined exception on components and consumables	2021-09-24 11:38:07 -05:00
consumables.php	Fixes route not defined exception on components and consumables	2021-09-24 11:38:07 -05:00
fields.php	Turn cusotm fields required/optional/remove into POST requests	2021-11-05 10:53:48 -07:00
hardware.php	Updated routes to use POST for restore	2021-10-04 17:17:36 -07:00
kits.php	Some fixes to some typos in other routes, commeting out parameters parameter which seems crashy	2021-06-22 18:58:25 -07:00
licenses.php	Almost finished with the routes which is...hopefully? The last thing?	2021-06-22 16:58:23 -07:00
models.php	Merge remote-tracking branch 'origin/master' into develop	2021-10-20 17:26:41 -07:00
users.php	Merge remote-tracking branch 'origin/master' into develop	2021-10-20 17:26:41 -07:00