thermokarst/hymenobacterdotinfo
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
200 commits 3 branches 0 tags 775 KiB
Commit graph

200 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
c276cdc74c Add in quill WYSIWYG 2015-07-20 12:17:32 -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
7c194447f7 Drop new user component, for now 2015-07-17 08:38:42 -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
226a82d57f Missing import in ajax-request 2015-07-16 21:15:51 -08:00
Matthew Dillon
c996dd5374 Merge branch 'master' into clostridium 
* master:
  Handle user lockouts (new authenticator added)
  catch split exception in parsebase64
  Refactor ajax request
 2015-07-16 21:13:54 -08:00
Matthew Dillon
c51a1deeab Handle user lockouts (new authenticator added) 2015-07-16 18:47:12 -08:00
Matthew Dillon
c7dc14d4f9 catch split exception in parsebase64 2015-07-16 12:56:19 -08:00
Matthew Dillon
755414cd7a Refactor ajax request 2015-07-15 19:52:05 -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
cca97e7542 Merge branch 'master' into clostridium 
* master:
  Clean up verification
  Update flash message
  Inject global var service in routes
 2015-07-14 13:43:57 -08:00
Matthew Dillon
e91a283680 Clean up verification 2015-07-14 13:43:40 -08:00
Matthew Dillon
6ce2fbe83b Update flash message 2015-07-14 13:34:50 -08:00
Matthew Dillon
2343913f91 Inject global var service in routes 2015-07-14 13:34:33 -08:00
Matthew Dillon
14a678092e Missed in merge 2015-07-14 08:05:01 -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
6ad9ad17b8 Remove search panel and related 2015-07-13 09:46:37 -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
99c94e9c7b Clean up species id in strain serializer 2015-07-10 15:28:27 -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
6bc5ddfeb0 Remove old perms utils 2015-07-10 10:52:59 -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
Matthew Dillon
72c957f8dc roughing in custom session (again :( ) 2015-07-09 20:52:01 -08:00
Matthew Dillon
bb2386807c Limit species and strain new access 2015-07-09 17:39:31 -08:00
Matthew Dillon
58779a4a7d ember-cli 1.13.1 2015-07-09 16:08:09 -08:00
Matthew Dillon
780b5ddb6c Cleaning up species and strains 2015-07-09 16:07:51 -08:00
Matthew Dillon
01a3075655 Refactoring strains 2015-07-08 14:44:56 -08:00
Matthew Dillon
5290e7efd7 Shuffle cancel button 2015-07-07 16:55:42 -08:00
Matthew Dillon
963b3591a4 characteristics sort order 2015-07-07 16:55:41 -08:00
Matthew Dillon
03b6ea2c3b Overflow table 2015-07-07 16:55:41 -08:00
Matthew Dillon
6f0f9d8ea2 Edit species 2015-07-07 16:55:41 -08:00
Matthew Dillon
3b17955c0d Sideload strains in species list 2015-07-07 16:55:40 -08:00
Matthew Dillon
3db54ea933 Test-drive metadata 2015-07-07 16:55:40 -08:00
Matthew Dillon
45223fd57f Species edit refactor 2015-07-07 16:55:19 -08:00
Matthew Dillon
8ab97c00e1 Updated merge from master 2015-07-07 14:41:40 -08:00