From b3b8d3c0860b6060a939a2f9405b2e8b594368ee Mon Sep 17 00:00:00 2001
From: Omar Sy <sy@net.elsys-design.com>
Date: Wed, 22 Aug 2018 14:24:21 +0200
Subject: [PATCH 01/15] make the attributes that the webhook sends configurable

---
 server/notifications/outgoing.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/server/notifications/outgoing.js b/server/notifications/outgoing.js
index 779d41a0f..7e3ee60ca 100644
--- a/server/notifications/outgoing.js
+++ b/server/notifications/outgoing.js
@@ -8,6 +8,8 @@ const postCatchError = Meteor.wrapAsync((url, options, resolve) => {
   });
 });
 
+let webhooksAtbts = ( (process.env.WEBHOOKS_ATTRIBUTES && process.env.WEBHOOKS_ATTRIBUTES.split(',') ) || ['cardId', 'listId', 'oldListId', 'boardId', 'comment', 'user', 'card', 'commentId']);
+
 Meteor.methods({
   outgoingWebhooks(integrations, description, params) {
     check(integrations, Array);
@@ -19,7 +21,7 @@ Meteor.methods({
       if (quoteParams[key]) quoteParams[key] = `"${params[key]}"`;
     });
 
-    const userId = (params.userId)?params.userId:integrations[0].userId;
+    const userId = (params.userId) ? params.userId : integrations[0].userId;
     const user = Users.findOne(userId);
     const text = `${params.user} ${TAPi18n.__(description, quoteParams, user.getLanguage())}\n${params.url}`;
 
@@ -29,10 +31,7 @@ Meteor.methods({
       text: `${text}`,
     };
 
-    [   'cardId', 'listId', 'oldListId',
-      'boardId', 'comment', 'user',
-      'card', 'commentId',
-    ].forEach((key) => {
+    webhooksAtbts.forEach((key) => {
       if (params[key]) value[key] = params[key];
     });
     value.description = description;

From fcbbb93bb663eec04e53230e447b2846f28d86e6 Mon Sep 17 00:00:00 2001
From: Omar Sy <sy@net.elsys-design.com>
Date: Wed, 22 Aug 2018 15:07:46 +0200
Subject: [PATCH 02/15] change let to const

---
 server/notifications/outgoing.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/notifications/outgoing.js b/server/notifications/outgoing.js
index 7e3ee60ca..b35b3b2ee 100644
--- a/server/notifications/outgoing.js
+++ b/server/notifications/outgoing.js
@@ -8,7 +8,7 @@ const postCatchError = Meteor.wrapAsync((url, options, resolve) => {
   });
 });
 
-let webhooksAtbts = ( (process.env.WEBHOOKS_ATTRIBUTES && process.env.WEBHOOKS_ATTRIBUTES.split(',') ) || ['cardId', 'listId', 'oldListId', 'boardId', 'comment', 'user', 'card', 'commentId']);
+const webhooksAtbts = ( (process.env.WEBHOOKS_ATTRIBUTES && process.env.WEBHOOKS_ATTRIBUTES.split(',') ) || ['cardId', 'listId', 'oldListId', 'boardId', 'comment', 'user', 'card', 'commentId']);
 
 Meteor.methods({
   outgoingWebhooks(integrations, description, params) {

From d68ad5af042893069f4c28f56f4aaf862d5a1799 Mon Sep 17 00:00:00 2001
From: Lauri Ojansivu <x@xet7.org>
Date: Wed, 22 Aug 2018 16:16:56 +0300
Subject: [PATCH 03/15] 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.

Thanks to Caddy contributors and xet7 !
---
 snapcraft.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snapcraft.yaml b/snapcraft.yaml
index f3f784e7a..a3ca80dc0 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

From 1b94b919fe953d8da5ad2cd358866579481bbeb2 Mon Sep 17 00:00:00 2001
From: Lauri Ojansivu <x@xet7.org>
Date: Wed, 22 Aug 2018 16:56:02 +0300
Subject: [PATCH 04/15] 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.

Thanks to Caddy contributors and xet7 !
---
 CHANGELOG.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e9f315016..8d31a2823 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,19 @@
+# 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.
+
+Thanks to Caddy contributors and Github user xet7 for their contributions!
+
 # v1.34 2018-08-22 Wekan release
 
 This release fixes the following bugs:

From 7e0bc1e33aef6dc0de11a595b81854623b417572 Mon Sep 17 00:00:00 2001
From: Lauri Ojansivu <x@xet7.org>
Date: Wed, 22 Aug 2018 21:42:53 +0300
Subject: [PATCH 05/15] - Remove suburl from beginning of avatar file path, 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.

Thanks to xet7 !

Closes #1776,
closes #386
---
 client/components/users/userAvatar.jade | 2 +-
 client/components/users/userAvatar.js   | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/client/components/users/userAvatar.jade b/client/components/users/userAvatar.jade
index 83e2c8d09..c61ade216 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 91cad2377..5fb5d9df7 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';

From cc84bf2de38f15d20a5f46ac9f57e4a967375f88 Mon Sep 17 00:00:00 2001
From: Lauri Ojansivu <x@xet7.org>
Date: Wed, 22 Aug 2018 21:57:38 +0300
Subject: [PATCH 06/15] - Remove suburl from beginning of avatar file path,  
 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.

Thanks to xet7 !
---
 CHANGELOG.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8d31a2823..c69664e5f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,14 @@ Add Caddy plugins:
   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

From d165733242eee22a1a2bb4e2bf451fa96857ef18 Mon Sep 17 00:00:00 2001
From: Lauri Ojansivu <x@xet7.org>
Date: Wed, 22 Aug 2018 22:19:06 +0300
Subject: [PATCH 07/15] - Add webhooks-attributes to Snap and Docker.

Thanks to xet7 !
---
 Dockerfile              | 4 +++-
 docker-compose.yml      | 3 +++
 snap-src/bin/config     | 6 +++++-
 snap-src/bin/wekan-help | 6 ++++++
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 94528ec93..e3371d55d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,6 +17,7 @@ ARG MATOMO_DO_NOT_TRACK
 ARG MATOMO_WITH_USERNAME
 ARG BROWSER_POLICY_ENABLED
 ARG TRUSTED_URL
+ARG WEBHOOKS_ATTRIBUTES
 
 # Set the environment variables (defaults where required)
 # DOES NOT WORK: paxctl fix for alpine linux: https://github.com/wekan/wekan/issues/1303
@@ -36,7 +37,8 @@ ENV BUILD_DEPS="apt-utils gnupg gosu wget curl bzip2 build-essential python git
     MATOMO_DO_NOT_TRACK=true \
     MATOMO_WITH_USERNAME=false \
     BROWSER_POLICY_ENABLED=true \
-    TRUSTED_URL=""
+    TRUSTED_URL="" \
+    WEBHOOKS_ATTRIBUTES=""
 
 # Copy the app to the image
 COPY ${SRC_PATH} /home/wekan/app
diff --git a/docker-compose.yml b/docker-compose.yml
index 548669962..bf4d02ccb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -60,6 +60,9 @@ services:
       - BROWSER_POLICY_ENABLED=true
       # When browser policy is enabled, HTML code at this Trusted URL can have iframe that embeds Wekan inside.
       - TRUSTED_URL=''
+      # What to send to Outgoing Webhook, or leave out. Example, that includes all that are default: cardId,listId,oldListId,boardId,comment,user,card,commentId .
+      # example: WEBHOOKS_ATTRIBUTES=cardId,listId,oldListId,boardId,comment,user,card,commentId
+      - WEBHOOKS_ATTRIBUTES=''
     depends_on:
       - wekandb
 
diff --git a/snap-src/bin/config b/snap-src/bin/config
index 5a745184d..85b71fa7a 100755
--- a/snap-src/bin/config
+++ b/snap-src/bin/config
@@ -3,7 +3,7 @@
 # All supported keys are defined here together with descriptions and default values
 
 # list of supported keys
-keys="MONGODB_BIND_UNIX_SOCKET MONGODB_BIND_IP MONGODB_PORT MAIL_URL MAIL_FROM ROOT_URL PORT DISABLE_MONGODB CADDY_ENABLED CADDY_BIND_PORT WITH_API MATOMO_ADDRESS MATOMO_SITE_ID MATOMO_DO_NOT_TRACK MATOMO_WITH_USERNAME BROWSER_POLICY_ENABLED TRUSTED_URL"
+keys="MONGODB_BIND_UNIX_SOCKET MONGODB_BIND_IP MONGODB_PORT MAIL_URL MAIL_FROM ROOT_URL PORT DISABLE_MONGODB CADDY_ENABLED CADDY_BIND_PORT WITH_API MATOMO_ADDRESS MATOMO_SITE_ID MATOMO_DO_NOT_TRACK MATOMO_WITH_USERNAME BROWSER_POLICY_ENABLED TRUSTED_URL WEBHOOKS_ATTRIBUTES"
 
 # default values
 DESCRIPTION_MONGODB_BIND_UNIX_SOCKET="mongodb binding unix socket:\n"\
@@ -77,3 +77,7 @@ KEY_BROWSER_POLICY_ENABLED="browser-policy-enabled"
 DESCRIPTION_TRUSTED_URL="When browser policy is enabled, HTML code at this Trusted URL can have iframe that embeds Wekan inside."
 DEFAULT_TRUSTED_URL=""
 KEY_TRUSTED_URL="trusted-url"
+
+DESCRIPTION_WEBHOOKS_ATTRIBUTES="What to send to Outgoing Webhook, or leave out. Example, that includes all that are default: cardId,listId,oldListId,boardId,comment,user,card,commentId ."
+DEFAULT_WEBHOOKS_ATTRIBUTES=""
+KEY_WEBHOOKS_ATTRIBUTES="webhooks-attributes"
diff --git a/snap-src/bin/wekan-help b/snap-src/bin/wekan-help
index 2cd0f0376..76a271830 100755
--- a/snap-src/bin/wekan-help
+++ b/snap-src/bin/wekan-help
@@ -47,6 +47,12 @@ echo -e "\t$ snap set $SNAP_NAME TRUSTED_URL='https://example.com'"
 echo -e "\t-Disable the Trusted URL of Wekan:"
 echo -e "\t$ snap set $SNAP_NAME TRUSTED_URL=''"
 echo -e "\n"
+echo -e "What to send to Outgoing Webhook, or leave out. Example, that includes all that are default: cardId,listId,oldListId,boardId,comment,user,card,commentId ."
+echo -e "To enable the Webhooks Attributes of Wekan:"
+echo -e "\t$ snap set $SNAP_NAME WEBHOOKS_ATTRIBUTES='cardId,listId,oldListId,boardId,comment,user,card,commentId'"
+echo -e "\t-Disable the Webhooks Attributest of Wekan to send all default ones:"
+echo -e "\t$ snap set $SNAP_NAME WEBHOOKS_ATTRIBUTES=''"
+echo -e "\n"
 # parse config file for supported settings keys
 echo -e "wekan supports settings keys"
 echo -e "values can be changed by calling\n$ snap set $SNAP_NAME <key name>='<key value>'"

From 4ed2f29e303feddc5685f7bc8016525f4db5e80e Mon Sep 17 00:00:00 2001
From: Lauri Ojansivu <x@xet7.org>
Date: Wed, 22 Aug 2018 22:23:39 +0300
Subject: [PATCH 08/15] - Make the attributes that the webhook sends
 configurable.

Thanks to omarsy and xet7 !
---
 CHANGELOG.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c69664e5f..3526ddb4f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,9 @@ Add Caddy plugins:
   for showing real X-Forwarded-For IP to behind proxy;
 - Turn off Caddy telemetry.
 
+Add configuring webhooks:
+- [Make the attributes that the webhook sends configurable](https://github.com/wekan/wekan/pull/1852).
+
 and fixes the following bugs:
 
 - [Remove suburl from beginning of avatar file path](https://github.com/wekan/wekan/issues/1776),
@@ -20,7 +23,7 @@ and fixes the following bugs:
   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!
+Thanks to Caddy contributors, and Github users omarsy and xet7 for their contributions!
 
 # v1.34 2018-08-22 Wekan release
 

From f170c116bba3abceef8741b2b74d8f4e4de99699 Mon Sep 17 00:00:00 2001
From: Lauri Ojansivu <x@xet7.org>
Date: Wed, 22 Aug 2018 22:35:52 +0300
Subject: [PATCH 09/15] Fix typo.

---
 snap-src/bin/wekan-help | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snap-src/bin/wekan-help b/snap-src/bin/wekan-help
index 76a271830..5117028d8 100755
--- a/snap-src/bin/wekan-help
+++ b/snap-src/bin/wekan-help
@@ -50,7 +50,7 @@ echo -e "\n"
 echo -e "What to send to Outgoing Webhook, or leave out. Example, that includes all that are default: cardId,listId,oldListId,boardId,comment,user,card,commentId ."
 echo -e "To enable the Webhooks Attributes of Wekan:"
 echo -e "\t$ snap set $SNAP_NAME WEBHOOKS_ATTRIBUTES='cardId,listId,oldListId,boardId,comment,user,card,commentId'"
-echo -e "\t-Disable the Webhooks Attributest of Wekan to send all default ones:"
+echo -e "\t-Disable the Webhooks Attributes of Wekan to send all default ones:"
 echo -e "\t$ snap set $SNAP_NAME WEBHOOKS_ATTRIBUTES=''"
 echo -e "\n"
 # parse config file for supported settings keys

From 71b642a2ba95e932092abb83f7971a6bbed123bd Mon Sep 17 00:00:00 2001
From: Lauri Ojansivu <x@xet7.org>
Date: Wed, 22 Aug 2018 22:42:17 +0300
Subject: [PATCH 10/15] Fix lint errors.

---
 client/components/users/userAvatar.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/components/users/userAvatar.js b/client/components/users/userAvatar.js
index 5fb5d9df7..4578d0b9b 100644
--- a/client/components/users/userAvatar.js
+++ b/client/components/users/userAvatar.js
@@ -17,7 +17,7 @@ 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);
+    avatarUrl = `/${  avatarUrl.substring(avatarUrl.indexOf('/cfs/files/avatars/')+1)}`;
     return avatarUrl;
   },
 

From 1249bef93ef068539d075e98aff862539f702c2d Mon Sep 17 00:00:00 2001
From: Lauri Ojansivu <x@xet7.org>
Date: Wed, 22 Aug 2018 22:45:20 +0300
Subject: [PATCH 11/15] Fix typo.

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3526ddb4f..8035cd785 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,7 +23,7 @@ and fixes the following bugs:
   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 users omarsy and xet7 for their contributions!
+Thanks to Caddy contributors, and Github users omarsy and xet7 for their contributions.
 
 # v1.34 2018-08-22 Wekan release
 

From d2c3ecdbcd6324f153dc6ab8d181c1634aea7c76 Mon Sep 17 00:00:00 2001
From: Lauri Ojansivu <x@xet7.org>
Date: Wed, 22 Aug 2018 22:46:56 +0300
Subject: [PATCH 12/15] Fix typos.

---
 CHANGELOG.md | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8035cd785..5addda76a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,13 +27,16 @@ Thanks to Caddy contributors, and Github users omarsy and xet7 for their contrib
 
 # v1.34 2018-08-22 Wekan release
 
-This release fixes the following bugs:
+This release add the following new features:
+
+- [Add Favicon for pinned tab on Safari browser](https://github.com/wekan/wekan/issues/1795).
+
+and fixes the following bugs:
 
 - [Restored SMTP settings at Admin Panel, and disabled showing password](https://github.com/wekan/wekan/issues/1790);
 - [Move color labels on minicard to bottom of minicard](https://github.com/wekan/wekan/issues/1842);
 - [Fix and improve linked cards](https://github.com/wekan/wekan/pull/1849);
 - [Allow Sandstorm to serve Wekan HTTP API](https://github.com/wekan/wekan/pull/1851);
-- [Add Favicon for pinned tab on Safari browser](https://github.com/wekan/wekan/issues/1795).
 
 Thanks to GitHub users andresmanelli, ocdtrekkie, therampagerado, woodyart and xet7 for their contributions.
 

From dfd26e4843028ab77bd103ed3c207f353eaad10f Mon Sep 17 00:00:00 2001
From: Lauri Ojansivu <x@xet7.org>
Date: Wed, 22 Aug 2018 23:58:47 +0300
Subject: [PATCH 13/15] - Remove avatar url fix javascript version, it breaks
 too easily.   Same can be done with Caddy.

Thanks to xet7 !

Closes #1776,
closes #386
---
 CHANGELOG.md                            | 8 --------
 client/components/users/userAvatar.jade | 2 +-
 client/components/users/userAvatar.js   | 7 -------
 3 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5addda76a..6e7dcdee7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,14 +15,6 @@ Add Caddy plugins:
 Add configuring webhooks:
 - [Make the attributes that the webhook sends configurable](https://github.com/wekan/wekan/pull/1852).
 
-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 users omarsy and xet7 for their contributions.
 
 # v1.34 2018-08-22 Wekan release
diff --git a/client/components/users/userAvatar.jade b/client/components/users/userAvatar.jade
index c61ade216..ebfa48ba8 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="{{fixAvatarUrl userData.profile.avatarUrl}}")
+      img.avatar.avatar-image(src="{{userData.profile.avatarUrl}}")
     else
       +userAvatarInitials(userId=userData._id)
 
diff --git a/client/components/users/userAvatar.js b/client/components/users/userAvatar.js
index 4578d0b9b..91cad2377 100644
--- a/client/components/users/userAvatar.js
+++ b/client/components/users/userAvatar.js
@@ -14,13 +14,6 @@ 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';

From 511d1973eb2050dce7ef24de1429ebf73c7ca282 Mon Sep 17 00:00:00 2001
From: Lauri Ojansivu <x@xet7.org>
Date: Thu, 23 Aug 2018 00:02:00 +0300
Subject: [PATCH 14/15] Add webhooks-attributes to Sandstorm.

Thanks to xet7 !
---
 sandstorm-pkgdef.capnp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp
index d6a35cb59..19fa19a3e 100644
--- a/sandstorm-pkgdef.capnp
+++ b/sandstorm-pkgdef.capnp
@@ -244,6 +244,7 @@ const myCommand :Spk.Manifest.Command = (
     (key = "MATOMO_WITH_USERNAME", value="false"),
     (key = "BROWSER_POLICY_ENABLED", value="true"),
     (key = "TRUSTED_URL", value=""),
+    (key = "WEBHOOKS_ATTRIBUTES", value=""),
     (key = "SANDSTORM", value = "1"),
     (key = "METEOR_SETTINGS", value = "{\"public\": {\"sandstorm\": true}}")
   ]

From 13db2fd7b2652eef081cb50d30d0a132ecd06157 Mon Sep 17 00:00:00 2001
From: Lauri Ojansivu <x@xet7.org>
Date: Thu, 23 Aug 2018 00:06:15 +0300
Subject: [PATCH 15/15] v1.35

---
 CHANGELOG.md           | 2 +-
 package.json           | 2 +-
 sandstorm-pkgdef.capnp | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6e7dcdee7..067a22c78 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# Upcoming Wekan release
+# v1.35 2018-08-23 Wekan release
 
 This release adds the following new features:
 
diff --git a/package.json b/package.json
index b39eacf67..6f2812f87 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "1.34.0",
+  "version": "1.35.0",
   "description": "The open-source kanban",
   "private": true,
   "scripts": {
diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp
index 19fa19a3e..cb8bbb5fb 100644
--- a/sandstorm-pkgdef.capnp
+++ b/sandstorm-pkgdef.capnp
@@ -22,10 +22,10 @@ const pkgdef :Spk.PackageDefinition = (
     appTitle = (defaultText = "Wekan"),
     # The name of the app as it is displayed to the user.
 
-    appVersion = 119,
+    appVersion = 120,
     # Increment this for every release.
 
-    appMarketingVersion = (defaultText = "1.34.0~2018-08-22"),
+    appMarketingVersion = (defaultText = "1.35.0~2018-08-23"),
     # Human-readable presentation of the app version.
 
     minUpgradableAppVersion = 0,