diff options
author | Lauri Ojansivu <x@xet7.org> | 2018-08-23 00:07:12 +0300 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2018-08-23 00:07:12 +0300 |
commit | c34b1a9ec5d0637e45e20e5f4f4c4c4b377d4b44 (patch) | |
tree | 1f38fa61e3e353d4fc90f6e9ee8b227189b51c48 | |
parent | 676140f5c8887a5f710779150a55d5c68f63a8a0 (diff) | |
parent | 13db2fd7b2652eef081cb50d30d0a132ecd06157 (diff) | |
download | wekan-c34b1a9ec5d0637e45e20e5f4f4c4c4b377d4b44.tar.gz wekan-c34b1a9ec5d0637e45e20e5f4f4c4c4b377d4b44.tar.bz2 wekan-c34b1a9ec5d0637e45e20e5f4f4c4c4b377d4b44.zip |
Merge branch 'devel'
-rw-r--r-- | CHANGELOG.md | 26 | ||||
-rw-r--r-- | Dockerfile | 4 | ||||
-rw-r--r-- | client/components/users/userAvatar.jade | 2 | ||||
-rw-r--r-- | docker-compose.yml | 3 | ||||
-rw-r--r-- | package.json | 2 | ||||
-rw-r--r-- | sandstorm-pkgdef.capnp | 5 | ||||
-rw-r--r-- | server/notifications/outgoing.js | 9 | ||||
-rwxr-xr-x | snap-src/bin/config | 6 | ||||
-rwxr-xr-x | snap-src/bin/wekan-help | 6 | ||||
-rw-r--r-- | snapcraft.yaml | 2 |
10 files changed, 51 insertions, 14 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index e9f31501..067a22c7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,34 @@ +# v1.35 2018-08-23 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. + +Add configuring webhooks: +- [Make the attributes that the webhook sends configurable](https://github.com/wekan/wekan/pull/1852). + +Thanks to Caddy contributors, and Github users omarsy and xet7 for their contributions. + # 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. @@ -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/client/components/users/userAvatar.jade b/client/components/users/userAvatar.jade index 83e2c8d0..ebfa48ba 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="{{userData.profile.avatarUrl}}") else +userAvatarInitials(userId=userData._id) diff --git a/docker-compose.yml b/docker-compose.yml index 54866996..bf4d02cc 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/package.json b/package.json index b39eacf6..6f2812f8 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 d6a35cb5..cb8bbb5f 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, @@ -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}}") ] diff --git a/server/notifications/outgoing.js b/server/notifications/outgoing.js index 779d41a0..b35b3b2e 100644 --- a/server/notifications/outgoing.js +++ b/server/notifications/outgoing.js @@ -8,6 +8,8 @@ const postCatchError = Meteor.wrapAsync((url, options, resolve) => { }); }); +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) { 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; diff --git a/snap-src/bin/config b/snap-src/bin/config index 5a745184..85b71fa7 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 2cd0f037..5117028d 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 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 echo -e "wekan supports settings keys" echo -e "values can be changed by calling\n$ snap set $SNAP_NAME <key name>='<key value>'" 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 |