Commit graph

163 commits

Author SHA1 Message Date
Matthew Dillon
26dcecaa05 Merge branch 'master' into clostridium
* master:
  Easiest to just unload the entire store
  Hide measurements on new strain
  Fix char/strain sort order
2015-11-25 21:31:24 -07:00
Matthew Dillon
f93c4af029 Hide measurements on new strain
Fixes #65
2015-11-20 19:00:07 -07:00
Matthew Dillon
edc95ecb3a Fix char/strain sort order
Fixes #64.
2015-11-20 18:49:14 -07:00
Matthew Dillon
935a3511de Merge branch 'master' into clostridium
* master:
  Removing char edit text
2015-11-17 16:18:05 -07:00
Matthew Dillon
2bbb29d785 Removing char edit text 2015-11-17 16:17:32 -07:00
Matthew Dillon
732e8482a5 Merge branch 'master' into clostridium
* master:
  Detailed characteristics view
2015-11-17 16:11:22 -07:00
Matthew Dillon
8b4a26a932 Detailed characteristics view 2015-11-17 16:10:33 -07:00
Matthew Dillon
d6d9c92ef6 Merge branch 'master' into clostridium
* master:
  Use API sort order for species
2015-11-17 15:54:29 -07:00
Matthew Dillon
e33852120a Use API sort order for species 2015-11-17 15:53:22 -07:00
Matthew Dillon
ab964bbca1 Merge branch 'master' into clostridium
* master:
  Compare - link to chars
2015-11-17 13:47:39 -07:00
Matthew Dillon
a669945c35 Compare - link to chars 2015-11-17 13:47:04 -07:00
Matthew Dillon
7c503876ac Merge branch 'master' into clostridium
* master:
  Fix up full name, again
  Force sort order for compare
2015-11-17 13:19:39 -07:00
Matthew Dillon
9d57e1bbfb Fix up full name, again 2015-11-17 13:16:00 -07:00
Matthew Dillon
c350dd6fcc Force sort order for compare 2015-11-17 13:10:10 -07:00
Matthew Dillon
838588da54 Merge branch 'master' into clostridium
* master:
  User permission error handling
2015-11-17 09:34:43 -07:00
Matthew Dillon
40ac4b30af User permission error handling 2015-11-17 09:33:44 -07:00
Matthew Dillon
2aa432376f Merge branch 'master' into clostridium
* master:
  Fix strains index strain name formatting
2015-11-17 09:08:42 -07:00
Matthew Dillon
4e0d67800c Fix strains index strain name formatting
Fixes #63
2015-11-17 09:07:49 -07:00
Matthew Dillon
4aaa9cdfb9 Merge branch 'master' into clostridium
* master:
  ember 2 series
  Remove globals initializer
2015-11-17 08:13:07 -07:00
Matthew Dillon
99309e0e91 Remove globals initializer
Fixes #62
2015-11-17 06:43:33 -07:00
Matthew Dillon
09650e0f1b Merge branch 'master' into clostridium
* master:
  Inline images in CSP
  Strains form formatting
  Clean up delete button and tests
  Lint
2015-11-16 10:55:10 -07:00
Matthew Dillon
7673b225f8 Strains form formatting
Gridforms doesn't play well with textarea, so just split rows for now.
Fixes #60.
2015-11-16 10:49:46 -07:00
Matthew Dillon
27c2788bd2 Merge branch 'master' into clostridium
* master:
  Dropping ember-select2 for custom component
  Update getProperty helper
  #55, species
  Rest of strain MU
  strain.strainNameMU to component
  Refactor delete button
  Handle password change errors
  New Ajax Error util
  ember-cli 1.13.12
2015-11-13 15:50:32 -07:00
Matthew Dillon
d05c31cc94 Dropping ember-select2 for custom component
Fixes #53
2015-11-13 15:13:46 -07:00
Matthew Dillon
62e651b597 #55, species 2015-11-13 14:31:29 -07:00
Matthew Dillon
81b6b9aee4 strain.strainNameMU to component
Part of #55
2015-11-13 14:24:26 -07:00
Matthew Dillon
031a83808c Handle password change errors 2015-11-13 13:43:55 -07:00
Matthew Dillon
8730b6659f fixed merge conflict in tests/index 2015-11-13 08:33:04 -07:00
Matthew Dillon
2d2950ed33 Linting 2015-11-12 13:49:32 -07:00
Matthew Dillon
b12ff0eb20 ember-ajax
Fixes #37
Fixes #38
2015-11-12 13:32:41 -07:00
Matthew Dillon
21e0e6c624 Linting 2015-11-12 05:54:18 -07:00
Matthew Dillon
aeb3206fd9 compare/results component 2015-11-11 20:29:50 -07:00
Matthew Dillon
268ab18cf6 Compare, begin components 2015-11-11 17:07:45 -07:00
90deef228b Linting 2015-11-11 11:52:52 -07:00
Matthew Dillon
d46b3fc48b Dropping select 2 for now 2015-11-10 21:32:49 -07:00
Matthew Dillon
1ee0e0e5ed DDAU (WIP) 2015-11-10 21:21:59 -07:00
Matthew Dillon
c1ff0d57b4 Delete measurement 2015-11-10 16:14:02 -07:00
Matthew Dillon
b2fa171d17 Save measurement 2015-11-10 16:08:40 -07:00
Matthew Dillon
15474c76f3 Rename row -> measurement 2015-11-10 15:55:52 -07:00
Matthew Dillon
ba15af411e Stop loading chars in measurements-table 2015-11-10 15:49:55 -07:00
Matthew Dillon
fbfbdf19d1 WIP 2015-11-10 15:42:20 -07:00
Matthew Dillon
48cd1f4f39 Step one, move up to pod root 2015-11-10 14:35:17 -07:00
Matthew Dillon
fa5b741e35 Refactor strains/new 2015-11-10 14:31:38 -07:00
Matthew Dillon
29c507af6b Refactor strain form and edit strain 2015-11-10 12:57:12 -07:00
Matthew Dillon
04486880a0 Begin refactoring strains/show
Will address measurements table later
2015-11-10 11:41:04 -07:00
Matthew Dillon
85d861da27 Refactor strains/index 2015-11-10 11:13:22 -07:00
Matthew Dillon
35475c2b92 Rough in some tests 2015-11-10 11:02:23 -07:00
Matthew Dillon
45703e67ee refactor user password change 2015-11-06 11:56:38 -07:00
Matthew Dillon
1dd0910ed1 Refactored users/edit 2015-11-06 11:20:28 -07:00
Matthew Dillon
b742ddbb51 refactored users/show 2015-11-05 20:24:07 -07:00