Commit graph

149 commits

Author SHA1 Message Date
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
Matthew Dillon
e6510992dc Refactor users/index 2015-11-05 17:48:58 -07:00
Matthew Dillon
2d7d22f847 Set up preliminary tests for users 2015-11-05 17:42:50 -07:00
Matthew Dillon
dc5b54cfbf Merge branch 'master' into clostridium
* master:
  Refactor characteristics/new
  Refactor characteristics/edit
  Refactor characteristics/show
  Refactor characteristics/index
  MetaData mixin
  Additional creation checks
  Set up tests for existing pod
2015-11-05 15:37:01 -07:00
Matthew Dillon
9cb030ab02 Refactor characteristics/new 2015-11-05 14:18:59 -07:00
Matthew Dillon
7106696533 Refactor characteristics/edit 2015-11-05 14:05:57 -07:00
Matthew Dillon
31c4ff4d52 Refactor characteristics/show 2015-11-05 14:05:50 -07:00
Matthew Dillon
9715aac1f5 Refactor characteristics/index 2015-11-05 14:05:40 -07:00
Matthew Dillon
e6c6cac212 MetaData mixin 2015-11-05 12:40:10 -07:00
Matthew Dillon
35c53fc79b Set up tests for existing pod 2015-11-05 10:16:27 -07:00
Matthew Dillon
d674d07951 Merge branch 'master' into clostridium
* master: (27 commits)
  Temporary fix for quill editor use in strains edit
  Test new species (plus minor cleanup)
  Wrapping up form cleanup
  Quill DDAU
  Fixed up checkbox input
  WIP (checkbox)
  ember-one-way-input
  DeleteModel Mixin
  Using mixins on new species
  ElevatedAccess Mixin
  SaveModel Mixin
  Refactor species edit
  Refactor species/show
  fix format date import
  nvm
  Drop node version
  trying a different phantomjs route
  Rough in species index test
  Tweak mirage config
  ember-cli-mirage
  ...
2015-11-04 20:29:14 -07:00
Matthew Dillon
c672a245aa Temporary fix for quill editor use in strains edit 2015-11-04 13:36:09 -07:00
Matthew Dillon
19ce579983 Test new species (plus minor cleanup) 2015-11-04 13:05:03 -07:00
Matthew Dillon
30e7000a81 Wrapping up form cleanup 2015-11-04 12:26:43 -07:00
Matthew Dillon
cb43c27c6f Fixed up checkbox input 2015-11-04 10:55:12 -07:00