diff options
| author | Lauri Ojansivu <x@xet7.org> | 2017-06-19 23:41:29 +0300 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2017-06-19 23:41:29 +0300 |
| commit | e796f6d19568301618f4fe3013f24ccf62df85d6 (patch) | |
| tree | 335d94b8db906457bea2994e334e2643096008a7 | |
| parent | f2b4ccd043d3549ab40b7e91bc701b7078813ddf (diff) | |
| download | wekan-e796f6d19568301618f4fe3013f24ccf62df85d6.tar.gz wekan-e796f6d19568301618f4fe3013f24ccf62df85d6.tar.bz2 wekan-e796f6d19568301618f4fe3013f24ccf62df85d6.zip | |
Fix login url in invitation email. Closes #993
| -rw-r--r-- | CHANGELOG.md | 5 | ||||
| -rw-r--r-- | models/settings.js | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index dcac35fa..8e870d4c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,9 +13,10 @@ and fixes the following bugs: * [Fix IE 11 drag board to scroll](https://github.com/wekan/wekan/pull/1052); * [Fix Export Wekan board](https://github.com/wekan/wekan/pull/1067); -* [Fix "W" shortcut binding](https://github.com/wekan/wekan/pull/1066). +* [Fix "W" shortcut binding](https://github.com/wekan/wekan/pull/1066); +* [Fix login url in invitation email](https://github.com/wekan/wekan/issues/993). -Thanks to GitHub users BaobabCoder, GhassenRjab, nebulade and nztqa +Thanks to GitHub users BaobabCoder, GhassenRjab, nebulade, nztqa and xet7 for their contributions. # v0.23 2017-05-21 Wekan release diff --git a/models/settings.js b/models/settings.js index e9dce26d..ce162d45 100644 --- a/models/settings.js +++ b/models/settings.js @@ -105,7 +105,7 @@ if (Meteor.isServer) { inviter: Users.findOne(icode.authorId).username, user: icode.email.split('@')[0], icode: icode.code, - url: FlowRouter.url('sign-up'), + url: FlowRouter.url('sign-in'), }; const lang = author.getLanguage(); Email.send({ |