Matthew Dillon
4f4b5d8a4d
Merge branch 'master' into clostridium
...
* master:
ember-cli 1.13.13
2015-11-28 11:35:23 -07:00
Matthew Dillon
6d97466075
ember-cli 1.13.13
2015-11-28 11:34:04 -07:00
Matthew Dillon
b3c646cb18
Merge branch 'master' into clostridium
...
* master:
ember 2.2.0 & ember-data 2.2.1
2015-11-25 21:48:26 -07:00
Matthew Dillon
bb1efd6733
ember 2.2.0 & ember-data 2.2.1
2015-11-25 21:47:51 -07:00
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
1c16c7239f
Easiest to just unload the entire store
...
Fixes #66
2015-11-25 21:29:39 -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
d2c1609e86
Merge branch 'master' into clostridium
...
* master:
Context-sensitive save-model mixin
2015-11-17 16:36:48 -07:00
Matthew Dillon
e45ca02afb
Context-sensitive save-model mixin
2015-11-17 16:36:08 -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
14be82212d
ember 2 series
2015-11-17 08:11:59 -07:00
Matthew Dillon
99309e0e91
Remove globals initializer
...
Fixes #62
2015-11-17 06:43:33 -07:00
Matthew Dillon
0815e4c4c9
Merge branch 'master' into clostridium
...
* master:
ESA 1.0.1
2015-11-16 18:29:15 -07:00
Matthew Dillon
04d05f9795
ESA 1.0.1
2015-11-16 18:29:06 -07:00
Matthew Dillon
d93f4a3152
Merge branch 'master' into clostridium
...
* master:
Lint
2015-11-16 18:15:42 -07:00
Matthew Dillon
de630dba68
Lint
2015-11-16 18:15:20 -07:00
Matthew Dillon
aa4ca05897
Merge branch 'master' into clostridium
...
* master:
Customizing refresh token flow
Remove quint-notifications
Tweaking bower.json to fix CI build errors
Changed mind on strain model MU prop
Remove ES6 features from config
2015-11-16 16:59:10 -07:00
Matthew Dillon
55f71b0a00
Customizing refresh token flow
...
Departs from oauth2, oh well. Fixes #58 .
2015-11-16 16:58:00 -07:00
Matthew Dillon
6b30b33281
Remove quint-notifications
...
Trying on travis
2015-11-16 12:42:02 -07:00
Matthew Dillon
9218c29c0e
Tweaking bower.json to fix CI build errors
2015-11-16 12:25:27 -07:00
Matthew Dillon
c561e0ec76
Changed mind on strain model MU prop
...
Closes #55 .
2015-11-16 11:39:53 -07:00
Matthew Dillon
b8e4ba3c84
Remove ES6 features from config
2015-11-16 11:39:16 -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
7d05740901
Inline images in CSP
2015-11-16 10:53:28 -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
dfe2c9cd74
Lint
2015-11-16 09:37:31 -07:00
Matthew Dillon
6574f4986c
Merge branch 'master' into clostridium
...
* master:
select2 ember-cli-build
2015-11-13 17:01:36 -07:00
