diff options
| author | Lauri Ojansivu <x@xet7.org> | 2017-06-26 12:26:44 +0300 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2017-06-26 12:26:44 +0300 |
| commit | 6c9725a8c9c1ca9fc0536a1f8cb6a98f3f0d3676 (patch) | |
| tree | 9437b1a02e7fc0aec6ec865bddd1513d56e70d4d | |
| parent | 01f907897a40f1890bf94c9b78e4e26ce803b740 (diff) | |
| parent | db9fc3cde110a344c06fd40a1797e4aff6a87a75 (diff) | |
| download | wekan-6c9725a8c9c1ca9fc0536a1f8cb6a98f3f0d3676.tar.gz wekan-6c9725a8c9c1ca9fc0536a1f8cb6a98f3f0d3676.tar.bz2 wekan-6c9725a8c9c1ca9fc0536a1f8cb6a98f3f0d3676.zip | |
Merge branch 'nztqa-fix-adminPanel-subfolder' into devel
Fix admin panel route for subfolder. Thanks to nztqa ! Related: #973
| -rw-r--r-- | CHANGELOG.md | 8 | ||||
| -rw-r--r-- | client/components/users/userHeader.jade | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 51b56769..f97e1db8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +# Upcoming Wekan release + +This release fixes the following bugs: + +* [Fix admin panel route for subfolder](https://github.com/wekan/wekan/pull/1084); + +Thanks to GitHub user nztqa for contributions. + # v0.25 2017-06-24 Wekan release This release adds the following new features: diff --git a/client/components/users/userHeader.jade b/client/components/users/userHeader.jade index 51b0888b..84ef5a09 100644 --- a/client/components/users/userHeader.jade +++ b/client/components/users/userHeader.jade @@ -18,7 +18,7 @@ template(name="memberMenuPopup") li: a.js-change-language {{_ 'changeLanguagePopup-title'}} li: a.js-edit-notification {{_ 'editNotificationPopup-title'}} if currentUser.isAdmin - li: a.js-go-setting(href='/setting') {{_ 'admin-panel'}} + li: a.js-go-setting(href="{{pathFor 'setting'}}") {{_ 'admin-panel'}} hr ul.pop-over-list li: a.js-logout {{_ 'log-out'}} |