Merge branch 'master' into clostridium

* master:
  Drop soft delete

app/models/characteristic.js

@@ -7,10 +7,8 @@ export default DS.Model.extend({
   measurements          : DS.hasMany('measurements', { async: false }),
   createdAt             : DS.attr('date'),
   updatedAt             : DS.attr('date'),
-  deletedAt             : DS.attr('date'),
   createdBy             : DS.attr('number'),
   updatedBy             : DS.attr('number'),
-  deletedBy             : DS.attr('number'),
   sortOrder             : DS.attr('number'),
   canEdit               : DS.attr('boolean'),
 });

app/models/species.js

@@ -11,10 +11,8 @@ export default DS.Model.extend({
   totalStrains: DS.attr('number'),
   createdAt   : DS.attr('date'),
   updatedAt   : DS.attr('date'),
-  deletedAt   : DS.attr('date'),
   createdBy   : DS.attr('number'),
   updatedBy   : DS.attr('number'),
-  deletedBy   : DS.attr('number'),
   sortOrder   : DS.attr('number'),
   canEdit     : DS.attr('boolean'),
 

app/models/strain.js

@@ -14,10 +14,8 @@ export default DS.Model.extend({
   notes              : DS.attr('string'),
   createdAt          : DS.attr('date'),
   updatedAt          : DS.attr('date'),
-  deletedAt          : DS.attr('date'),
   createdBy          : DS.attr('number'),
   updatedBy          : DS.attr('number'),
-  deletedBy          : DS.attr('number'),
   totalMeasurements  : DS.attr('number'),
   sortOrder          : DS.attr('number'),
   canEdit            : DS.attr('boolean'),

app/models/user.js

@@ -8,7 +8,6 @@ export default DS.Model.extend({
   canEdit  : DS.attr('boolean'),
   createdAt: DS.attr('date'),
   updatedAt: DS.attr('date'),
-  deletedAt: DS.attr('date'),
 
   isAdmin: function() {
     return this.get('role') === 'A';

app/pods/protected/characteristics/show/template.hbs

@@ -33,7 +33,7 @@
       </div>
 
       {{! ROW 3 }}
-      <div class="grid-3 gutter-20">
+      <div class="grid-2 gutter-20">
         <dl class="span-1">
           <dt>Record Created</dt>
           <dd>{{null-time model.createdAt 'LL'}}</dd>
@@ -42,10 +42,6 @@
           <dt>Record Updated</dt>
           <dd>{{null-time model.updatedAt 'LL'}}</dd>
         </dl>
-        <dl class="span-1">
-          <dt>Record Deleted</dt>
-          <dd>{{null-time model.deletedAt 'LL'}}</dd>
-        </dl>
       </div>
     </fieldset>
   </div>

app/pods/protected/species/show/template.hbs

@@ -40,7 +40,7 @@
       </div>
 
       {{! ROW 3 }}
-      <div class="grid-3 gutter-20">
+      <div class="grid-2 gutter-20">
         <dl class="span-1">
           <dt>Record Created</dt>
           <dd>{{null-time model.createdAt 'LL'}}</dd>
@@ -49,10 +49,6 @@
           <dt>Record Updated</dt>
           <dd>{{null-time model.updatedAt 'LL'}}</dd>
         </dl>
-        <dl class="span-1">
-          <dt>Record Deleted</dt>
-          <dd>{{null-time model.deletedAt 'LL'}}</dd>
-        </dl>
       </div>
     </fieldset>
   </div>

app/pods/protected/strains/show/template.hbs

@@ -84,7 +84,7 @@
     </div>
 
     {{! ROW 6 }}
-    <div class="grid-3 gutter-20">
+    <div class="grid-2 gutter-20">
       <dl class="span-1">
         <dt>Record Created</dt>
         <dd>{{null-time model.createdAt 'LL'}}</dd>
@@ -93,10 +93,6 @@
         <dt>Record Updated</dt>
         <dd>{{null-time model.updatedAt 'LL'}}</dd>
       </dl>
-      <dl class="span-1">
-        <dt>Record Deleted</dt>
-        <dd>{{null-time model.deletedAt 'LL'}}</dd>
-      </dl>
     </div>
   </fieldset>
 </div>

app/pods/protected/users/show/template.hbs

@@ -21,7 +21,7 @@
     </div>
 
     {{! ROW 2 }}
-    <div class="grid-3 gutter-20">
+    <div class="grid-2 gutter-20">
       <dl class="span-1">
         <dt>Record Created</dt>
         <dd>{{null-time model.createdAt 'LL'}}</dd>
@@ -30,10 +30,6 @@
         <dt>Record Updated</dt>
         <dd>{{null-time model.updatedAt 'LL'}}</dd>
       </dl>
-      <dl class="span-1">
-        <dt>Record Deleted</dt>
-        <dd>{{null-time model.deletedAt 'LL'}}</dd>
-      </dl>
     </div>
   </fieldset>
 </div>