diff options
| author | Lauri Ojansivu <x@xet7.org> | 2017-07-12 01:53:40 +0300 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2017-07-12 01:53:40 +0300 |
| commit | 19a71c0d9295b3d1e595ceb711eadca7bac3a868 (patch) | |
| tree | e373d6162d2b76b417a83f97c1acc1fc294f5b61 | |
| parent | 1aea465a23ccbc70301ba7bd2d544a3c1d9e0d29 (diff) | |
| parent | 6fe4f00c44190a73bc5612ba076a120d03b59686 (diff) | |
| download | wekan-19a71c0d9295b3d1e595ceb711eadca7bac3a868.tar.gz wekan-19a71c0d9295b3d1e595ceb711eadca7bac3a868.tar.bz2 wekan-19a71c0d9295b3d1e595ceb711eadca7bac3a868.zip | |
Merge branch 'jtickle-devel' into devel
Fix double slash issue. Thanks to jtickle ! Closes #1110
| -rw-r--r-- | CHANGELOG.md | 5 | ||||
| -rw-r--r-- | Dockerfile | 11 |
2 files changed, 9 insertions, 7 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 967c8aec..ef3f5d75 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,9 +11,10 @@ This release adds the following new features: and fixes the following bugs: -* [Possible to add empty item to checklist](https://github.com/wekan/wekan/pull/1107). +* [Possible to add empty item to checklist](https://github.com/wekan/wekan/pull/1107); +* [Double-slash issue](https://github.com/wekan/wekan/pull/1114). -Thanks to GitHub users GhassenRjab, nztqa and zarnifoulette for their contributions. +Thanks to GitHub users GhassenRjab, jtickle, nztqa and zarnifoulette for their contributions. # v0.27 2017-06-28 Wekan release @@ -96,12 +96,13 @@ RUN \ gosu wekan:wekan sh ./install_meteor.sh; \ else \ gosu wekan:wekan git clone --recursive --depth 1 -b release/METEOR@${METEOR_EDGE} git://github.com/meteor/meteor.git /home/wekan/.meteor && \ - cd /home/wekan/packages && \ - gosu wekan:wekan git clone --depth 1 -b master git://github.com/wekan/flow-router.git kadira-flow-router && \ - gosu wekan:wekan git clone --depth 1 -b master git://github.com/meteor-useraccounts/core.git meteor-useraccounts-core && \ - cd /home/wekan/.meteor && \ - gosu wekan /home/wekan/.meteor/meteor -- help; \ fi && \ + cd /home/wekan/.meteor/packages && \ + gosu wekan:wekan git clone --depth 1 -b master git://github.com/wekan/flow-router.git kadira-flow-router && \ + gosu wekan:wekan git clone --depth 1 -b master git://github.com/meteor-useraccounts/core.git meteor-useraccounts-core && \ + sed -i 's/api\.versionsFrom/\/\/api.versionsFrom/' /home/wekan/.meteor/packages/meteor-useraccounts-core/package.js && \ + cd /home/wekan/.meteor && \ + gosu wekan /home/wekan/.meteor/meteor -- help; \ \ # Build app cd /home/wekan/app && \ |