Commit graph

38 commits

Author SHA1 Message Date
Matthew Dillon
53650c7808 Merge branch 'master' into clostridium
* master:
  Working on users
  Roughing in user admin
  Add measurements to strains page
  Clean up models
  Application-wide serializer
  Create and edit characteristics
  Characteristics details
  Rough in detail view for characteristics
  Restructuring forms
2015-09-09 16:54:10 -07:00
Matthew Dillon
425dd689ae Working on users 2015-09-09 16:49:48 -07:00
Matthew Dillon
be8a842c67 Roughing in user admin 2015-09-09 14:23:25 -07:00
Matthew Dillon
3b3f8cc691 Add measurements to strains page 2015-09-09 11:40:32 -07:00
Matthew Dillon
de8ac653f6 Create and edit characteristics 2015-09-08 10:37:48 -07:00
Matthew Dillon
fb296340c3 Characteristics details 2015-09-08 06:31:57 -07:00
Matthew Dillon
ceccf6e536 Rough in detail view for characteristics 2015-09-04 10:47:32 -07:00
Matthew Dillon
f59de829ee Restructuring forms 2015-09-04 10:30:36 -07:00
Matthew Dillon
1ce84c7269 Merge branch 'master' into clostridium
* master:
  Removing measurements route
  Edit characteristic
  'Select All' in compare.
  Fixed sort order in strains list
  genbank url for whole genome sequences
2015-09-04 09:32:05 -07:00
Matthew Dillon
e58d01f999 Removing measurements route 2015-09-04 09:31:42 -07:00
Matthew Dillon
f25fae0a83 Edit characteristic 2015-09-04 08:45:54 -07:00
Matthew Dillon
24c870353f 'Select All' in compare.
Fixes #8
2015-09-03 10:50:01 -07:00
Matthew Dillon
1ee73a342e Fixed sort order in strains list 2015-09-03 08:41:17 -07:00
Matthew Dillon
391b15cf92 genbank url for whole genome sequences 2015-08-31 13:35:01 -07:00
Matthew Dillon
9696313568 Merge branch 'master' into clostridium
* master:
  DS deprecation (rollback)
  Fix up moment js
  Drop brocfile
  ember-cli 1.13.8
  Fix transition deprecation
  Upgrade ember-cli-flash
2015-08-24 19:29:10 -07:00
Matthew Dillon
2ae0523a9f DS deprecation (rollback) 2015-08-24 15:25:42 -07:00
Matthew Dillon
765bc45ce7 Merge branch 'master' into clostridium
* master:
  Fix broken strain reference
  Rich text species and strains
  Add in quill WYSIWYG
2015-07-20 12:23:17 -08:00
Matthew Dillon
1d0d948c29 Fix broken strain reference 2015-07-20 12:17:38 -08:00
Matthew Dillon
8ab9312b9e Rich text species and strains 2015-07-20 12:17:37 -08:00
Matthew Dillon
b5a260615b Merge branch 'master' into clostridium
* master:
  Add CSV download for compare (change backing service, too)
  Drop new user component, for now
  Clean up some loading stuff
2015-07-17 16:39:57 -08:00
Matthew Dillon
da4ebc9b29 Add CSV download for compare (change backing service, too) 2015-07-17 16:38:52 -08:00
Matthew Dillon
fb57534b64 Clean up some loading stuff 2015-07-17 07:32:53 -08:00
Matthew Dillon
8c3bf30ace Merge branch 'master' into clostridium
* master:
  Clean up forms a bit
  Missing import in ajax-request
2015-07-16 21:24:46 -08:00
Matthew Dillon
1bb5dc67b2 Clean up forms a bit 2015-07-16 21:23:35 -08:00
Matthew Dillon
cbac28e040 Merge branch 'master' into clostridium
* master:
  Working on deprecations
2015-07-15 15:51:54 -08:00
Matthew Dillon
7696b7008f Working on deprecations 2015-07-15 15:49:44 -08:00
Matthew Dillon
0ab0cf5a6a Merge branch 'master' into clostridium
* master:
  Remove duplicate mixins
  auto-reload compare/results model, cleanup
2015-07-14 08:03:21 -08:00
Matthew Dillon
60f518d911 Remove duplicate mixins 2015-07-14 08:02:49 -08:00
Matthew Dillon
cd082ef616 auto-reload compare/results model, cleanup 2015-07-14 07:59:29 -08:00
Matthew Dillon
f295082592 update merge from master 2015-07-13 16:32:03 -08:00
Matthew Dillon
8bdc31f99e Refactor compare 2015-07-13 16:16:54 -08:00
Matthew Dillon
9b0528e38f SQUASH with drop chartype 2015-07-13 09:46:18 -08:00
Matthew Dillon
de18cfc949 Minor cleanup 2015-07-13 08:29:53 -08:00
Matthew Dillon
ea77042b19 Drop characteristic types 2015-07-13 08:27:03 -08:00
Matthew Dillon
b78aa571ee Remove ember-table and measurements 2015-07-10 12:33:12 -08:00
Matthew Dillon
33b6fe32b3 more cleanup 2015-07-10 12:14:05 -08:00
Matthew Dillon
e36d327f36 Wait to load until currentUser returns 2015-07-10 10:34:17 -08:00
Matthew Dillon
eb1a8bb6e3 protected route 2015-07-10 09:29:12 -08:00