diff options
| -rw-r--r-- | CHANGELOG.md | 24 | ||||
| -rw-r--r-- | client/components/users/userAvatar.jade | 2 | ||||
| -rw-r--r-- | client/components/users/userAvatar.js | 7 | ||||
| -rw-r--r-- | snapcraft.yaml | 2 |
4 files changed, 33 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index e9f31501..c69664e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,27 @@ +# Upcoming Wekan release + +This release adds the following new features: + +Add Caddy plugins: +- [http.filter](https://caddyserver.com/docs/http.filter) + for changing Wekan UI on the fly, for example custom logo, + or changing to all different CSS file to have custom theme; +- [http.ipfilter](https://caddyserver.com/docs/http.ipfilter) + to block requests by ip address; +- [http.realip](https://caddyserver.com/docs/http.realip) + for showing real X-Forwarded-For IP to behind proxy; +- Turn off Caddy telemetry. + +and fixes the following bugs: + +- [Remove suburl from beginning of avatar file path](https://github.com/wekan/wekan/issues/1776), + so that avatar images don't get broken when root-url changes + to different sub-url. This does not change avatar urls + in database, instead this [fixes url on the fly after + loading avatar url from database](https://github.com/wekan/wekan/commit/7e0bc1e33aef6dc0de11a595b81854623b417572). + +Thanks to Caddy contributors and Github user xet7 for their contributions! + # v1.34 2018-08-22 Wekan release This release fixes the following bugs: diff --git a/client/components/users/userAvatar.jade b/client/components/users/userAvatar.jade index 83e2c8d0..c61ade21 100644 --- a/client/components/users/userAvatar.jade +++ b/client/components/users/userAvatar.jade @@ -1,7 +1,7 @@ template(name="userAvatar") a.member.js-member(title="{{userData.profile.fullname}} ({{userData.username}})") if userData.profile.avatarUrl - img.avatar.avatar-image(src=userData.profile.avatarUrl) + img.avatar.avatar-image(src="{{fixAvatarUrl userData.profile.avatarUrl}}") else +userAvatarInitials(userId=userData._id) diff --git a/client/components/users/userAvatar.js b/client/components/users/userAvatar.js index 91cad237..5fb5d9df 100644 --- a/client/components/users/userAvatar.js +++ b/client/components/users/userAvatar.js @@ -14,6 +14,13 @@ Template.userAvatar.helpers({ }); }, + fixAvatarUrl(avatarUrl) { + // Remove suburl from beginning of avatar file path, + // so that avatar images don't get broken when root-url changes to different sub-url. + avatarUrl = '/' + avatarUrl.substring(avatarUrl.indexOf('/cfs/files/avatars/')+1); + return avatarUrl; + }, + memberType() { const user = Users.findOne(this.userId); return user && user.isBoardAdmin() ? 'admin' : 'normal'; diff --git a/snapcraft.yaml b/snapcraft.yaml index f3f784e7..a3ca80dc 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -176,7 +176,7 @@ parts: caddy: plugin: dump - source: https://caddyserver.com/download/linux/amd64?license=personal + source: https://caddyserver.com/download/linux/amd64?plugins=http.filter,http.ipfilter,http.realip&license=personal&telemetry=off source-type: tar organize: caddy: bin/caddy |