Merge branch 'master' into status-history

routes/api/asset/index.js

@@ -96,4 +96,12 @@ router.put('/:asset_id/settings', (req, res, next) => {
 
 });
 
+router.put('/:asset_id/status', (req, res, next) => {
+  // Update the asset status
+  Asset
+    .update({id: req.params.asset_id}, {status: req.query.status})
+    .then(() => res.status(204).end())
+    .catch((err) => next(err));
+});
+
 module.exports = router;