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 |
|