Commit graph

419 commits

Author SHA1 Message Date
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
Matthew Dillon
41e79b6890 select2 ember-cli-build 2015-11-13 17:00:10 -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
024836cab0 Update getProperty helper 2015-11-13 15:01:16 -07:00
Matthew Dillon
62e651b597 #55, species 2015-11-13 14:31:29 -07:00
Matthew Dillon
075ef0aaa1 Rest of strain MU
#55
2015-11-13 14:27:08 -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
936edd41d7 New Ajax Error util 2015-11-13 13:43:46 -07:00
Matthew Dillon
28e82d59ba ember-cli 1.13.12 2015-11-13 08:55:20 -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
305c108825 Clean up README
Fixes #36
2015-11-12 13:53:54 -07:00
Matthew Dillon
e5dc115607 Drop store initializer
Fixes #39
2015-11-12 13:49:55 -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
e54c6fcb2f Bring back CSP 2015-11-12 07:08:14 -07:00
Matthew Dillon
1fe7702430 ember-cli 1.13.11 2015-11-12 06:36:22 -07:00
Matthew Dillon
d185dad716 Merge pull request #56 from thermokarst/form-helpers
Form helpers
2015-11-12 06:08:05 -07:00
Matthew Dillon
21e0e6c624 Linting 2015-11-12 05:54:18 -07:00