Matthew Dillon
6810c209d8
update merge
2015-10-29 12:09:26 -07:00
Matthew Dillon
0868576a72
Addresses #24
...
Divshot was purchased by Firebase
2015-10-29 12:05:28 -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
Matthew Dillon
80bd608045
Merge branch 'master' into clostridium
...
* master:
Revert #22
2015-10-21 07:28:59 -07:00
Matthew Dillon
8e11942521
Revert #22
2015-10-21 07:27:33 -07:00
Matthew Dillon
fd9157007a
Merge branch 'master' into clostridium
...
* master:
Missing semicolon in login controller
2015-10-20 20:35:31 -07:00
Matthew Dillon
c7a34023b5
Missing semicolon in login controller
2015-10-20 20:35:20 -07:00
Matthew Dillon
c17abc6829
Missing pod prefix
2015-10-20 18:16:41 -07:00
38daf6ea5b
fixing config
2015-10-20 16:46:11 -07:00
Matthew Dillon
ddc2eb725c
Merge pull request #35 from thermokarst/esa10
...
ember-simple-auth 1.0
Fixes #29 .
2015-10-20 16:42:43 -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
52979ac9e2
Setup authorizer and custom session for account
2015-10-20 15:04:14 -07:00
30b1706868
Remove old session
2015-10-20 15:03:39 -07:00
1f163737da
Remove dead route
2015-10-20 15:03:28 -07:00
7051180e49
Remove extra mixin
2015-10-20 15:03:08 -07:00
c2e8299e67
Can log in now
2015-10-20 13:34:06 -07:00
1aa8d8d88d
Clear out old stuff
2015-10-20 10:40:23 -07:00
e526167c62
Application boots
...
Can’t authenticate
2015-10-20 10:28:28 -07:00
131c59daa2
Update package, drop esa-token
2015-10-20 10:24:58 -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
135d7a2c2c
Don't transition to loading route during login
...
Fixes #22 .
2015-10-19 16:26:25 -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
744f5be2a4
Refresh token notes
2015-10-19 13:34:29 -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
45eca0227c
Tweak custom session
2015-10-13 10:31:47 -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
Matthew Dillon
abb57c9ee0
Confirm delete on meas/char
2015-10-12 10:47:54 -07:00
