Commit graph

396 commits

Author SHA1 Message Date
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
7d05740901 Inline images in CSP 2015-11-16 10:53:28 -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
5ba3b125e8 Clean up delete button and tests
Fixes #59
2015-11-16 10:32:49 -07:00
Matthew Dillon
dfe2c9cd74 Lint 2015-11-16 09:37:31 -07:00
Matthew Dillon
6574f4986c Merge branch 'master' into clostridium
* master:
  select2 ember-cli-build
2015-11-13 17:01:36 -07:00
Matthew Dillon
41e79b6890 select2 ember-cli-build 2015-11-13 17:00:10 -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
024836cab0 Update getProperty helper 2015-11-13 15:01:16 -07:00
Matthew Dillon
62e651b597 #55, species 2015-11-13 14:31:29 -07:00
Matthew Dillon
075ef0aaa1 Rest of strain MU
#55
2015-11-13 14:27:08 -07:00
Matthew Dillon
81b6b9aee4 strain.strainNameMU to component
Part of #55
2015-11-13 14:24:26 -07:00
Matthew Dillon
20a6707144 Refactor delete button
Fixes #50
2015-11-13 14:16:50 -07:00
Matthew Dillon
031a83808c Handle password change errors 2015-11-13 13:43:55 -07:00
Matthew Dillon
936edd41d7 New Ajax Error util 2015-11-13 13:43:46 -07:00
Matthew Dillon
28e82d59ba ember-cli 1.13.12 2015-11-13 08:55:20 -07:00
Matthew Dillon
8730b6659f fixed merge conflict in tests/index 2015-11-13 08:33:04 -07:00
Matthew Dillon
bb05e114d7 Clean up Quill Component
Fixes #54
2015-11-13 08:29:48 -07:00
Matthew Dillon
305c108825 Clean up README
Fixes #36
2015-11-12 13:53:54 -07:00
Matthew Dillon
e5dc115607 Drop store initializer
Fixes #39
2015-11-12 13:49:55 -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
e54c6fcb2f Bring back CSP 2015-11-12 07:08:14 -07:00
Matthew Dillon
1fe7702430 ember-cli 1.13.11 2015-11-12 06:36:22 -07:00
Matthew Dillon
d185dad716 Merge pull request #56 from thermokarst/form-helpers
Form helpers
2015-11-12 06:08:05 -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
Matthew Dillon
2beabf817c DDAU (dropping two-way helpers) 2015-11-11 16:53:46 -07:00
73461d4048 WIP 2015-11-11 13:01:23 -07:00
2d5e2c4be7 WIP 2015-11-11 12:48:21 -07:00
Matthew Dillon
7497bacc4b Merge pull request #52 from thermokarst/refactor-strains
Refactor strains
2015-11-11 12:36:56 -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
9fa701c44e Merge pull request #51 from thermokarst/refactor-users
Refactor users
2015-11-10 10:26:24 -07:00
Matthew Dillon
079b2c59f6 Refactor user lockout/pw reset 2015-11-10 09:22:35 -07:00
Matthew Dillon
ec597cd419 Refactor new user creation 2015-11-10 09:15:28 -07:00