Merge branch 'nztqa-fix-adminPanel-subfolder' into devel

Fix admin panel route for subfolder. Thanks to nztqa ! Related: #973
This commit is contained in:
Lauri Ojansivu 2017-06-26 12:26:44 +03:00
commit 6c9725a8c9
2 changed files with 9 additions and 1 deletions

View file

@ -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:

View file

@ -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'}}