Matthew Dillon
|
26dcecaa05
|
Merge branch 'master' into clostridium
* master:
Easiest to just unload the entire store
Hide measurements on new strain
Fix char/strain sort order
|
2015-11-25 21:31:24 -07:00 |
|
Matthew Dillon
|
f93c4af029
|
Hide measurements on new strain
Fixes #65
|
2015-11-20 19:00:07 -07:00 |
|
Matthew Dillon
|
edc95ecb3a
|
Fix char/strain sort order
Fixes #64.
|
2015-11-20 18:49:14 -07:00 |
|
Matthew Dillon
|
935a3511de
|
Merge branch 'master' into clostridium
* master:
Removing char edit text
|
2015-11-17 16:18:05 -07:00 |
|
Matthew Dillon
|
2bbb29d785
|
Removing char edit text
|
2015-11-17 16:17:32 -07:00 |
|
Matthew Dillon
|
732e8482a5
|
Merge branch 'master' into clostridium
* master:
Detailed characteristics view
|
2015-11-17 16:11:22 -07:00 |
|
Matthew Dillon
|
8b4a26a932
|
Detailed characteristics view
|
2015-11-17 16:10:33 -07:00 |
|
Matthew Dillon
|
d6d9c92ef6
|
Merge branch 'master' into clostridium
* master:
Use API sort order for species
|
2015-11-17 15:54:29 -07:00 |
|
Matthew Dillon
|
e33852120a
|
Use API sort order for species
|
2015-11-17 15:53:22 -07:00 |
|
Matthew Dillon
|
ab964bbca1
|
Merge branch 'master' into clostridium
* master:
Compare - link to chars
|
2015-11-17 13:47:39 -07:00 |
|
Matthew Dillon
|
a669945c35
|
Compare - link to chars
|
2015-11-17 13:47:04 -07:00 |
|
Matthew Dillon
|
7c503876ac
|
Merge branch 'master' into clostridium
* master:
Fix up full name, again
Force sort order for compare
|
2015-11-17 13:19:39 -07:00 |
|
Matthew Dillon
|
9d57e1bbfb
|
Fix up full name, again
|
2015-11-17 13:16:00 -07:00 |
|
Matthew Dillon
|
c350dd6fcc
|
Force sort order for compare
|
2015-11-17 13:10:10 -07:00 |
|
Matthew Dillon
|
acb17480ec
|
Merge branch 'master' into clostridium
* master:
select2 4.0
|
2015-11-17 12:34:20 -07:00 |
|
Matthew Dillon
|
4e5a91f776
|
select2 4.0
|
2015-11-17 12:33:30 -07:00 |
|
Matthew Dillon
|
019031dd58
|
Merge branch 'master' into clostridium
* master:
User adapter
|
2015-11-17 09:59:12 -07:00 |
|
Matthew Dillon
|
b19913aece
|
User adapter
coalesceFindRequests: false
|
2015-11-17 09:59:02 -07:00 |
|
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
|
74e901380e
|
Merge branch 'master' into clostridium
* master:
Password reset verbiage
|
2015-11-17 09:20:25 -07:00 |
|
Matthew Dillon
|
9fc81bcc87
|
Password reset verbiage
|
2015-11-17 09:20:18 -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
|
5ba3b125e8
|
Clean up delete button and tests
Fixes #59
|
2015-11-16 10:32:49 -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
|
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
|
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
|
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 |
|
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 |
|
|
|
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 |
|
