update merge from master

2015-07-13 16:32:03 -08:00 · 2015-07-13 16:32:03 -08:00 · f295082592
commit f295082592
parent 8ab97c00e1 8bdc31f99e
88 changed files with 771 additions and 675 deletions
--- a/app/pods/species/new/route.js
+++ b/app/pods/species/new/route.js
@ -1,9 +0,0 @@
-import Ember from 'ember';
-import AuthenticatedRouteMixin from 'simple-auth/mixins/authenticated-route-mixin';
-
-export default Ember.Route.extend(AuthenticatedRouteMixin, {
-  model: function() {
-    return this.store.createRecord('species');
-  },
-
-});
--- a/app/pods/species/new/template.hbs
+++ b/app/pods/species/new/template.hbs
@ -1,6 +0,0 @@
-{{
-  forms/species-form
-  species=model
-  save="save"
-  cancel="cancel"
-}}