Merge branch 'master' into clostridium

* master:
  Inline images in CSP
  Strains form formatting
  Clean up delete button and tests
  Lint
This commit is contained in:
Matthew Dillon 2015-11-16 10:55:10 -07:00
commit 09650e0f1b
10 changed files with 94 additions and 18 deletions

View file

@ -19,11 +19,13 @@ export function testConfig() {
this.post('/species');
this.get('/species/:id');
this.put('/species/:id');
this.delete('/species/:id');
this.get('/characteristics');
this.post('/characteristics');
this.get('/characteristics/:id');
this.put('/characteristics/:id');
this.delete('/characteristics/:id');
this.get('/strains', function(db /*, request*/) {
return {
@ -39,4 +41,5 @@ export function testConfig() {
};
});
this.put('/strains/:id');
this.delete('/strains/:id');
}