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
Matthew Dillon
56e7b088ac
Delete strains
2015-10-12 10:46:13 -07:00
Matthew Dillon
bf8289436f
Delete species
2015-10-12 10:41:07 -07:00
Matthew Dillon
a1e4e03b89
Delete characteristic
2015-10-12 10:20:17 -07:00
Matthew Dillon
5be2888223
minor cleanup
2015-10-04 15:54:02 -07:00
Matthew Dillon
33ed70caaf
ember 1.13.7 & ember-data 1.13.13
2015-10-01 07:45:08 -07:00
Matthew Dillon
f2f16e15a4
Edit user
2015-10-01 07:13:36 -07:00
Matthew Dillon
69dbdcaa89
Adapter error deprecated.
2015-10-01 06:46:51 -07:00
Matthew Dillon
da27b42f76
Add characteristic/measurement to strain
2015-09-29 15:55:34 -07:00
Matthew Dillon
34aa59caf3
Delete measurement
2015-09-25 15:37:23 -07:00
Matthew Dillon
482bfddf12
Track changes
2015-09-25 14:46:49 -07:00
Matthew Dillon
418b294634
Merge branch 'master' into clostridium
...
* master:
Refresh token
2015-09-17 15:58:25 -07:00
Matthew Dillon
97db4e4662
Refresh token
2015-09-17 15:56:47 -07:00
Matthew Dillon
56888c7fba
Merge branch 'master' into clostridium
...
* master:
Notes
Cleaning up measurement edit
Dummy measurement edit
Fix login error transition
2015-09-17 11:01:04 -07:00
Matthew Dillon
4699e26fa0
Notes
2015-09-17 10:39:14 -07:00
Matthew Dillon
4b6a776b63
Cleaning up measurement edit
2015-09-17 10:39:03 -07:00
Matthew Dillon
40f2b789e4
Dummy measurement edit
2015-09-16 09:12:13 -07:00
Matthew Dillon
fa6507be66
Fix login error transition
2015-09-15 10:59:57 -07:00
Matthew Dillon
f4939a962e
Merge branch 'master' into clostridium
...
* master:
Drop isEditing
Fix table widths
2015-09-10 16:26:28 -07:00
Matthew Dillon
065ab972e2
Drop isEditing
2015-09-10 07:03:40 -07:00
Matthew Dillon
06417b6069
Fix table widths
2015-09-10 07:02:44 -07:00
Matthew Dillon
53650c7808
Merge branch 'master' into clostridium
...
* master:
Working on users
Roughing in user admin
Add measurements to strains page
Clean up models
Application-wide serializer
Create and edit characteristics
Characteristics details
Rough in detail view for characteristics
Restructuring forms
2015-09-09 16:54:10 -07:00
Matthew Dillon
425dd689ae
Working on users
2015-09-09 16:49:48 -07:00
Matthew Dillon
be8a842c67
Roughing in user admin
2015-09-09 14:23:25 -07:00
