Skip to content

Commit

Permalink
Merge branch 'v0.3.x_Jed'
Browse files Browse the repository at this point in the history
* v0.3.x_Jed:
  v0.3.19
  Update CHANGELOG
  Backporting connect-mongo fix, ref. keystonejs#2645
  malign support
  v0.3.18
  Update CHANGELOG
  Removing refs to private domain
  Email prototype: allow headers. Fixes keystonejs#2687
  • Loading branch information
gemng committed May 6, 2016
2 parents fd505bf + be556a7 commit 47f4ed3
Show file tree
Hide file tree
Showing 4 changed files with 151 additions and 76 deletions.
12 changes: 12 additions & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,18 @@

KeystoneJS is maintained by [@JedWatson](https://github.com/JedWatson) and an amazing team of contributors. All contributions are given credit here except for Jed's.

## v0.3.19 / 2016-05-04

* added; support for Mailgun, thanks [Wolfgang](https://github.com/w01fgang)
* fixed; issues with connect-mongo on Node 0.12, thanks [gemscng](https://github.com/gemscng)

## v0.3.18 / 2016-04-27

fixed; make localfiles previews properly show up in admin ui column, thanks [Gabor K](https://github.com/krksgbr)
improved; allow adding headers when sending email, thanks [Joss Mackison](https://github.com/JossMac)

This is a hotfix release to allow for adding headers when sending emails.

## v0.3.17 / 2016-03-23

* fixed; issue when keystone is a dependency of a global package, thanks [Robert Jensen](https://github.com/erg0dic)
Expand Down
3 changes: 3 additions & 0 deletions lib/core/mount.js
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,9 @@ function mount(mountPath, parentApp, events) {
switch (sessionStore) {
case 'connect-mongo/es5':
debug('using mongo for session store');
if (process.version.substr(0, 4) === 'v0.1') {
sessionStore = 'connect-mongo/es5';
}
_.defaults(sessionStoreOptions, {
collection: 'app_sessions',
url: this.get('mongo')
Expand Down
Loading

0 comments on commit 47f4ed3

Please sign in to comment.