Commit graph

104 commits

Author SHA1 Message Date
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
16d77dead7 WIP (checkbox) 2015-11-03 15:48:35 -07:00
3f5eb26a33 DeleteModel Mixin 2015-11-03 13:58:01 -07:00
cc85ee6f27 Using mixins on new species 2015-11-03 13:54:45 -07:00
76942a10d0 ElevatedAccess Mixin 2015-11-03 13:47:58 -07:00
58cbf4027d SaveModel Mixin
#43
2015-11-03 13:41:04 -07:00
4dbfb73b3c Refactor species edit 2015-11-03 11:27:22 -07:00
Matthew Dillon
d1e3d05db2 Refactor species/show 2015-11-03 09:22:04 -07:00
Matthew Dillon
9c065af74a Rough in species index test 2015-11-02 18:06:45 -07:00
Matthew Dillon
257ca6edff Explicit parameters 2015-11-02 13:22:56 -07:00
Matthew Dillon
8684d0d148 Destructuring 2015-10-29 17:00:13 -07:00
Matthew Dillon
a52710f090 New index 2015-10-29 16:52:20 -07:00
Matthew Dillon
6dbdd70d31 Clean up after cancelling new model creation
Fixes #27
2015-10-29 16:41:50 -07:00
Matthew Dillon
6ab7e66d03 measurement row flash typo 2015-10-29 13:28:48 -07:00
Matthew Dillon
6a8a4c1a36 Merge branch 'master' into clostridium
* master:
  Clean up password reset
2015-10-27 16:20:20 -07:00
Matthew Dillon
1605f34dcc Clean up password reset 2015-10-27 16:17:18 -07:00
38daf6ea5b fixing config 2015-10-20 16:46:11 -07:00
227a85bb01 Clean up delete transitions 2015-10-20 16:12:35 -07:00
f06fbd0305 Inject session for vanilla ajax requests 2015-10-20 16:09:51 -07:00
bbcef5459e Update account service references 2015-10-20 15:04:35 -07:00
7051180e49 Remove extra mixin 2015-10-20 15:03:08 -07:00
e526167c62 Application boots
Can’t authenticate
2015-10-20 10:28:28 -07:00
43bc7645f2 Replace calls to store for metaData with user CP
Fixes #25.
2015-10-20 10:07:29 -07:00
7665452f72 Merge branch 'master' into clostridium
* master:
  Fix "New Strain" button under species edit
  Don't transition to loading route during login
2015-10-19 16:52:31 -07:00
be81bb9066 Fix "New Strain" button under species edit
Fixes #23.
2015-10-19 16:38:45 -07:00
13f8c5afcc Merge branch 'master' into clostridium
* master:
  Add clickable to strains chars table
  Sort meas table in chars
  Fixes #33
  Manually sort strains/chars
  Refresh token notes
  Linting
2015-10-19 15:42:57 -07:00
002bfa6d81 Add clickable to strains chars table
Part of #11.
2015-10-19 15:39:17 -07:00
0676058276 Sort meas table in chars
Fixes #13.
2015-10-19 15:38:59 -07:00
f7f04fd25c Fixes #33 2015-10-19 15:26:04 -07:00
93bdc594f5 Manually sort strains/chars
Fixes #11.
2015-10-19 15:22:21 -07:00
d3355370fd Linting 2015-10-16 11:07:09 -07:00
Matthew Dillon
f6a175980a Merge branch 'master' into clostridium
* master:
  Clean up beforeModel(s)
  Remove unneeded user model hook
  404/Not Found
2015-10-14 13:12:48 -07:00
Matthew Dillon
bcd2bbb4c4 Clean up beforeModel(s)
Fixes #20
2015-10-14 13:12:06 -07:00
Matthew Dillon
0dbcd45c4e Remove unneeded user model hook 2015-10-14 11:25:20 -07:00
Matthew Dillon
0c8fc4db6c 404/Not Found
Fixes #21
2015-10-14 11:24:40 -07:00
Matthew Dillon
075585c54f Merge branch 'master' into clostridium
* master:
  Show validation errors on save
2015-10-14 10:30:00 -07:00
Matthew Dillon
8577c38a9f Show validation errors on save
Fixes #17.
2015-10-14 10:27:18 -07:00
Matthew Dillon
c505afd0fe Merge branch 'master' into clostridium
* master:
  Drop soft delete
2015-10-13 16:34:23 -07:00
Matthew Dillon
007de178d8 Drop soft delete
Fixes #19.
2015-10-13 16:33:34 -07:00
Matthew Dillon
421831b5a6 Merge branch 'master' into clostridium
* master:
  Need to wait for currentUser promise
  Tweak custom session
  Keep non-admins out of user profiles
2015-10-13 10:49:52 -07:00
Matthew Dillon
be1b58a380 Need to wait for currentUser promise
Also, add ‘id’ to password change payload
2015-10-13 10:32:25 -07:00
Matthew Dillon
1de25effb5 Keep non-admins out of user profiles
Fixes #16.
2015-10-13 08:47:22 -07:00
Matthew Dillon
096e2dca20 Merge branch 'master' into clostridium
* master:
  Change password
  Clear store on role change
  Roughing in roles selection
  Confirm delete on meas/char
  Delete strains
  Delete species
  Delete characteristic
  minor cleanup
  ember 1.13.7 & ember-data 1.13.13
  Edit user
  Adapter error deprecated.
  Add characteristic/measurement to strain
  Delete measurement
  Track changes
2015-10-12 20:48:27 -07:00
Matthew Dillon
4a54813440 Change password
Fixes #14
2015-10-12 20:43:36 -07:00
Matthew Dillon
d353dc6e75 Clear store on role change
Fixes #18.
2015-10-12 15:05:02 -07:00
Matthew Dillon
c3e0da9cb4 Roughing in roles selection 2015-10-12 12:05:45 -07:00