v3.36

Add Feature: complete the original author's webhook functions and add two-way webhook type

.devcontainer/Dockerfile

@@ -6,7 +6,7 @@ ENV DEBIAN_FRONTEND=noninteractive
 
 ENV \
     DEBUG=false \
-    NODE_VERSION=8.16.0 \
+    NODE_VERSION=8.16.1 \
     METEOR_RELEASE=1.8.1 \
     USE_EDGE=false \
     METEOR_EDGE=1.5-beta.17 \
@@ -144,11 +144,13 @@ RUN set -o xtrace \
   && printf "\n[-] Installing Meteor $METEOR_VERSION...\n\n" \
   && sh /home/wekan/install-meteor.sh
 
-ENV PATH=$PATH:$HOME/.meteor/
+ENV PATH=$PATH:/home/wekan/.meteor/
 
 # Copy source dir
 USER root
 
+RUN echo "export PATH=$PATH" >> /etc/environment
+
 RUN set -o xtrace \
   && mkdir /home/wekan/app
 

.devcontainer/devcontainer.json

@@ -1,6 +1,6 @@
 // See https://aka.ms/vscode-remote/devcontainer.json for format details.
 {
-  "dockerComposeFile": "docker-compose.yml",
+  "dockerComposeFile": ["docker-compose.yml", "docker-compose.extend.yml"],
   "service": "wekan-dev",
   "workspaceFolder": "/home/wekan/app",
   "extensions": [

.devcontainer/docker-compose.yml

@@ -3,7 +3,7 @@ version: '3.7'
 services:
 
   wekandb-dev:
-    image: mongo:4.0.11
+    image: mongo:4.0.12
     container_name: wekan-dev-db
     restart: unless-stopped
     command: mongod --smallfiles --oplogSize 128
@@ -29,9 +29,6 @@ services:
     environment:
       - MONGO_URL=mongodb://wekandb-dev:27017/wekan
       - ROOT_URL=http://localhost:3000
-      #- MAIL_URL=smtp://user:pass@mailserver.example.com:25/
-      - MAIL_URL=smtp://<mail_url>:25/?ignoreTLS=true&tls={rejectUnauthorized:false}
-      - MAIL_FROM=Wekan Notifications <noreply.wekan@mydomain.com>
       - WITH_API=true
       - RICHER_CARD_COMMENT_EDITOR=true
       - BROWSER_POLICY_ENABLED=true

.gitignore

@@ -31,3 +31,4 @@ ehthumbs.db
 .eslintcache
 .meteor/local
 .meteor-1.6-snap/.meteor/local
+.devcontainer/docker-compose.extend.yml

CHANGELOG.md

@@ -1,3 +1,106 @@
+# v3.36 2019-09-05 Wekan release
+
+This release adds the following new features:
+
+- [Complete the original author's webhook functions and add two-way webhook type](https://github.com/wekan/wekan/pull/2665):
+  1. Make webhook function more complete by allowing user to specify name and token of
+  a webhook to increase security.
+  1. Allow wekan admin to sepcify a global webhook.
+  3. Add new type of two-way webhook that can act on the JSON webhook return payload:
+  3.1. If the payload data contains cardId, boardId, and comment key words,
+  3.2. If it has commentId, an existing comment will be modified
+  3.3. If it doesn't have commentId, then a new comment will be added, otherwise, does nothing.
+  Thanks to whowillcare.
+- [Patch admin search feature to Search in all users, not just "loaded" users
+  in the client](https://github.com/wekan/wekan/pull/2667).
+  Thanks to Akuket.
+- [Devcontainer: Moved MAIL-Vars to not-committed file, and added PATH with meteor to
+  Environment](https://github.com/wekan/wekan/pull/2672).
+  Thanks to road42.
+
+and fixes the following bugs:
+
+- [Fix incorrect date types for created and updated, so now newest card comments are at top](https://github.com/wekan/wekan/pull/2679).
+  Thanks to justinr1234.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v3.35 2019-08-29 Wekan release
+
+This release fixes the following bugs:
+
+- [Try to fix Snap](https://github.com/wekan/wekan/commit/71d32c6bc8e6affd345026797ff31e94a0a10d77).
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v3.34 2019-08-29 Wekan release
+
+This release fixes the following bugs:
+
+- [Snap: Delete all .swp files](https://github.com/wekan/wekan/commit/d5403bbfc53390aeaaf68eb452bc24d88f1e0942).
+  Thanks to xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v3.33 2019-08-29 Wekan release
+
+This release adds the following new features:
+
+- [Add card color to calendar event. The color of the calendar event will match the card
+  color](https://github.com/wekan/wekan/pull/2664).
+  Thanks to grmpfhmbl.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v3.32 2019-08-29 Wekan release
+
+This release fixes the following bugs:
+
+- [Fix Snap adopt-info](https://github.com/wekan/wekan/commit/79d4cd83b1fa83bb814230683b7449ed7f3e1ede).
+  Thanks to [popey at Snapcraft forum](https://forum.snapcraft.io/t/dirty-snap-release/12975/12).
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v3.31 2019-08-29 Wekan release
+
+This release fixes the following bugs:
+
+- [Try](https://github.com/wekan/wekan/commit/be5f435bc5f500b24bc838ac1dc8bf3bb9a33a22) to
+  [fix adopt-info](https://forum.snapcraft.io/t/dirty-snap-release/12975/8).
+  Thanks to ogra at Snapcraft forum.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v3.30 2019-08-29 Wekan release
+
+This release fixes the following bugs:
+
+- Snap: [Change version-script to adopt-info](https://github.com/wekan/wekan/commit/0ff5ce8fde6cc9a05a3c8b93e18ebce7282d3a67)
+  to [fix dirty](https://forum.snapcraft.io/t/dirty-snap-release/12975/4).
+  Thanks to popey and daniel at Snapcraft forum.
+- [Delete another phantomjs binary from Snap](https://github.com/wekan/wekan/commit/5084102e6e17fa2cb3bc8c1180745e15379fab5f).
+  Thanks to xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v3.29 2019-08-29 Wekan release
+
+This release fixes the following bugs:
+
+- [Fix Snap](https://github.com/wekan/wekan/commit/7761a22bb4e88ad9a5a39ed84e1ff244015c3a58).
+  Thanks to xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
+# v3.28 2019-08-29 Wekan release
+
+This release fixes the following bugs:
+
+- Fix broken Sandstorm release by reverting upgrading MongoDB.
+  Thanks to xet7
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
 # v3.27 2019-08-29 Wekan release
 
 This release adds the following upgrades:

Stackerfile.yml

@@ -1,5 +1,5 @@
 appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928
-appVersion: "v3.27.0"
+appVersion: "v3.36.0"
 files:
   userUploads:
     - README.md

client/components/boards/boardBody.js

@@ -326,6 +326,7 @@ BlazeComponent.extendComponent({
                 slug: currentBoard.slug,
                 cardId: card._id,
               }),
+              className: card.color ? `calendar-event-${card.color}` : null,
             });
           });
         callback(events);

client/components/boards/boardBody.styl

@@ -53,3 +53,81 @@ position()
         padding: 0 0px 0px 0
         overflow-x: hidden
         overflow-y: auto
+
+calendar-event-color(background, borderColor, color...)
+  background: background !important
+  border-color: borderColor
+  if color
+    color: color !important //overwrite text for better visibility
+
+.calendar-event-green
+  calendar-event-color(#3cb500, #2a8000, #ffffff) //White text for better visibility
+
+.calendar-event-yellow
+  calendar-event-color(#fad900, #c7ac00, #000) //Black text for better visibility
+
+.calendar-event-orange
+  calendar-event-color(#ff9f19, #cc7c14, #000) //Black text for better visibility
+
+.calendar-event-red
+  calendar-event-color(#eb4646, #b83737, #ffffff) //White text for better visibility
+
+.calendar-event-purple
+  calendar-event-color(#a632db, #7d26a6, #ffffff) //White text for better visibility
+
+.calendar-event-blue
+  calendar-event-color(#0079bf, #005a8a, #ffffff) //White text for better visibility
+
+.calendar-event-pink
+  calendar-event-color(#ff78cb, #cc62a3, #000) //Black text for better visibility
+
+.calendar-event-sky
+  calendar-event-color(#00c2e0, #0094ab, #ffffff) //White text for better visibility
+
+.calendar-event-black
+  calendar-event-color(#4d4d4d, #1a1a1a, #ffffff) //White text for better visibility
+
+.calendar-event-lime
+  calendar-event-color(#51e898, #3eb375, #000) //Black text for better visibility
+
+.calendar-event-silver
+  calendar-event-color(#c0c0c0, #8c8c8c, #000) //Black text for better visibility
+
+.calendar-event-peachpuff
+  calendar-event-color(#ffdab9, #ccaf95, #000) //Black text for better visibility
+
+.calendar-event-crimson
+  calendar-event-color(#dc143c, #a8112f, #ffffff) //White text for better visibility
+
+.calendar-event-plum
+  calendar-event-color(#dda0dd, #a87ba8, #000) //Black text for better visibility
+
+.calendar-event-darkgreen
+  calendar-event-color(#006400, #003000, #ffffff) //White text for better visibility
+
+.calendar-event-slateblue
+  calendar-event-color(#6a5acd, #4f4399, #ffffff) //White text for better visibility
+
+.calendar-event-magenta
+  calendar-event-color(#ff00ff, #cc00cc, #ffffff) //White text for better visibility
+
+.calendar-event-gold
+  calendar-event-color(#ffd700, #ccaa00, #000) //Black text for better visibility
+
+.calendar-event-navy
+  calendar-event-color(#000080, #000033, #ffffff) //White text for better visibility
+
+.calendar-event-gray
+  calendar-event-color(#808080, #333333, #ffffff) //White text for better visibility
+
+.calendar-event-saddlebrown
+  calendar-event-color(#8b4513, #572b0c, #ffffff) //White text for better visibility
+
+.calendar-event-paleturquoise
+  calendar-event-color(#afeeee, #8ababa, #000) //Black text for better visibility
+
+.calendar-event-mistyrose
+  calendar-event-color(#ffe4e1, #ccb8b6, #000) //Black text for better visibility
+
+.calendar-event-indigo
+  calendar-event-color(#4b0082, #2b004d, #ffffff) //White text for better visibility

client/components/settings/peopleBody.js

@@ -17,7 +17,7 @@ BlazeComponent.extendComponent({
     this.autorun(() => {
       const limit = this.page.get() * usersPerPage;
 
-      this.subscribe('people', limit, () => {
+      this.subscribe('people', this.findUsersOptions.get(), limit, () => {
         this.loadNextPageLocked = false;
         const nextPeakBefore = this.callFirstWith(null, 'getNextPeak');
         this.calculateNextPeak();
@@ -85,7 +85,7 @@ BlazeComponent.extendComponent({
     const users = Users.find(this.findUsersOptions.get(), {
       fields: { _id: true },
     });
-    this.number.set(users.count());
+    this.number.set(users.count(false));
     return users;
   },
   peopleNumber() {

client/components/settings/settingBody.jade

@@ -18,6 +18,8 @@ template(name="setting")
               a.js-setting-menu(data-id="announcement-setting") {{_ 'admin-announcement'}}
             li
               a.js-setting-menu(data-id="layout-setting") {{_ 'layout'}}
+            li
+              a.js-setting-menu(data-id="webhook-setting") {{_ 'global-webhook'}}
         .main-body
           if loading.get
             +spinner
@@ -31,6 +33,12 @@ template(name="setting")
             +announcementSettings
           else if layoutSetting.get
             +layoutSettings
+          else if webhookSetting.get
+            +webhookSettings
+
+template(name="webhookSettings")
+  span
+     +outgoingWebhooksPopup
 
 template(name="general")
   ul#registration-setting.setting-detail

client/components/settings/settingBody.js

@@ -7,11 +7,13 @@ BlazeComponent.extendComponent({
     this.accountSetting = new ReactiveVar(false);
     this.announcementSetting = new ReactiveVar(false);
     this.layoutSetting = new ReactiveVar(false);
+    this.webhookSetting = new ReactiveVar(false);
 
     Meteor.subscribe('setting');
     Meteor.subscribe('mailServer');
     Meteor.subscribe('accountSettings');
     Meteor.subscribe('announcements');
+    Meteor.subscribe('globalwebhooks');
   },
 
   setError(error) {
@@ -83,6 +85,7 @@ BlazeComponent.extendComponent({
       this.accountSetting.set('account-setting' === targetID);
       this.announcementSetting.set('announcement-setting' === targetID);
       this.layoutSetting.set('layout-setting' === targetID);
+      this.webhookSetting.set('webhook-setting' === targetID);
     }
   },
 

client/components/sidebar/sidebar.jade

@@ -135,22 +135,30 @@ template(name="archiveBoardPopup")
 template(name="outgoingWebhooksPopup")
   each integrations
     form.integration-form
-      if title
-        h4 {{title}}
-      else
-        h4 {{_ 'no-name'}}
-      label
-        | URL
-        input.js-outgoing-webhooks-url(type="text" name="url" value=url)
-        input(type="hidden" value=_id name="id")
+      a.flex
+        span {{_ 'disable-webhook'}}
+        b  
+        .materialCheckBox(class="{{#unless enabled}}is-checked{{/unless}}")
+      input.js-outgoing-webhooks-title(placeholder="{{_ 'webhook-title'}}" type="text" name="title" value=title)
+      input.js-outgoing-webhooks-url(type="text" name="url" value=url autofocus)
+      input.js-outgoing-webhooks-token(placeholder="{{_ 'webhook-token' }}" type="text" value=token name="token")
+      select.js-outgoing-webhooks-type(name="type")
+          each _type in types
+              if($eq _type this.type)
+                  option(value=_type selected="selected") {{_ _type}}
+              else
+                  option(value=_type) {{_ _type}}
+      input(type="hidden" value=this.type name="_type")
+      input(type="hidden" value=_id name="id")
       input.primary.wide(type="submit" value="{{_ 'save'}}")
   form.integration-form
-    h4
-      | {{_ 'new-outgoing-webhook'}}
-    label
-      | URL
-      input.js-outgoing-webhooks-url(type="text" name="url" autofocus)
-    input.primary.wide(type="submit" value="{{_ 'save'}}")
+    input.js-outgoing-webhooks-title(placeholder="{{_ 'webhook-title'}}" type="text" name="title" autofocus)
+    input.js-outgoing-webhooks-url(placeholder="{{_ 'URL' }}" type="text" name="url")
+    input.js-outgoing-webhooks-token(placeholder="{{_ 'webhook-token' }}" type="text" name="token")
+    select.js-outgoing-webhooks-type(name="type")
+        each _type in types
+            option(value=_type) {{_ _type}}
+    input.primary.wide(type="submit" value="{{_ 'create'}}")
 
 template(name="boardMenuPopup")
   ul.pop-over-list

client/components/sidebar/sidebar.js

@@ -1,6 +1,8 @@
 Sidebar = null;
 
 const defaultView = 'home';
+const MCB = '.materialCheckBox';
+const CKCLS = 'is-checked';
 
 const viewTitles = {
   filter: 'filter-cards',
@@ -280,44 +282,71 @@ Template.membersWidget.events({
 });
 
 BlazeComponent.extendComponent({
+  boardId() {
+    return Session.get('currentBoard') || Integrations.Const.GLOBAL_WEBHOOK_ID;
+  },
   integrations() {
-    const boardId = Session.get('currentBoard');
+    const boardId = this.boardId();
     return Integrations.find({ boardId: `${boardId}` }).fetch();
   },
-
-  integration(id) {
-    const boardId = Session.get('currentBoard');
-    return Integrations.findOne({ _id: id, boardId: `${boardId}` });
+  types() {
+    return Integrations.Const.WEBHOOK_TYPES;
+  },
+  integration(cond) {
+    const boardId = this.boardId();
+    const condition = { boardId, ...cond };
+    for (const k in condition) {
+      if (!condition[k]) delete condition[k];
+    }
+    return Integrations.findOne(condition);
+  },
+  onCreated() {
+    this.disabled = new ReactiveVar(false);
   },
-
   events() {
     return [
       {
+        'click a.flex'(evt) {
+          this.disabled.set(!this.disabled.get());
+          $(evt.target).toggleClass(CKCLS, this.disabled.get());
+        },
         submit(evt) {
           evt.preventDefault();
           const url = evt.target.url.value;
-          const boardId = Session.get('currentBoard');
+          const boardId = this.boardId();
           let id = null;
           let integration = null;
+          const title = evt.target.title.value;
+          const token = evt.target.token.value;
+          const type = evt.target.type.value;
+          const enabled = !this.disabled.get();
+          let remove = false;
+          const values = {
+            url,
+            type,
+            token,
+            title,
+            enabled,
+          };
           if (evt.target.id) {
             id = evt.target.id.value;
-            integration = this.integration(id);
-            if (url) {
-              Integrations.update(integration._id, {
-                $set: {
-                  url: `${url}`,
-                },
-              });
-            } else {
-              Integrations.remove(integration._id);
-            }
+            integration = this.integration({ _id: id });
+            remove = !url;
+          } else if (url) {
+            integration = this.integration({ url, token });
+          }
+          if (remove) {
+            Integrations.remove(integration._id);
+          } else if (integration && integration._id) {
+            Integrations.update(integration._id, {
+              $set: values,
+            });
           } else if (url) {
             Integrations.insert({
+              ...values,
               userId: Meteor.userId(),
               enabled: true,
-              type: 'outgoing-webhooks',
-              url: `${url}`,
-              boardId: `${boardId}`,
+              boardId,
               activities: ['all'],
             });
           }
@@ -474,12 +503,12 @@ BlazeComponent.extendComponent({
           evt.preventDefault();
           this.currentBoard.allowsSubtasks = !this.currentBoard.allowsSubtasks;
           this.currentBoard.setAllowsSubtasks(this.currentBoard.allowsSubtasks);
-          $('.js-field-has-subtasks .materialCheckBox').toggleClass(
-            'is-checked',
+          $(`.js-field-has-subtasks ${MCB}`).toggleClass(
+            CKCLS,
             this.currentBoard.allowsSubtasks,
           );
           $('.js-field-has-subtasks').toggleClass(
-            'is-checked',
+            CKCLS,
             this.currentBoard.allowsSubtasks,
           );
           $('.js-field-deposit-board').prop(
@@ -515,15 +544,12 @@ BlazeComponent.extendComponent({
           ];
           options.forEach(function(element) {
             if (element !== value) {
-              $(`#${element} .materialCheckBox`).toggleClass(
-                'is-checked',
-                false,
-              );
-              $(`#${element}`).toggleClass('is-checked', false);
+              $(`#${element} ${MCB}`).toggleClass(CKCLS, false);
+              $(`#${element}`).toggleClass(CKCLS, false);
             }
           });
-          $(`#${value} .materialCheckBox`).toggleClass('is-checked', true);
-          $(`#${value}`).toggleClass('is-checked', true);
+          $(`#${value} ${MCB}`).toggleClass(CKCLS, true);
+          $(`#${value}`).toggleClass(CKCLS, true);
           this.currentBoard.setPresentParentTask(value);
           evt.preventDefault();
         },

client/lib/utils.js

@@ -23,7 +23,6 @@ Utils = {
       })
     );
   },
-
   MAX_IMAGE_PIXEL: Meteor.settings.public.MAX_IMAGE_PIXEL,
   COMPRESS_RATIO: Meteor.settings.public.IMAGE_COMPRESS_RATIO,
   processUploadedAttachment(card, fileObj, callback) {

i18n/ar.i18n.json

@@ -510,9 +510,14 @@
   "email-smtp-test-text": "You have successfully sent an email",
   "error-invitation-code-not-exist": "رمز الدعوة غير موجود",
   "error-notAuthorized": "أنتَ لا تملك الصلاحيات لرؤية هذه الصفحة.",
+  "webhook-title": "Webhook Name",
+  "webhook-token": "Token (Optional for Authentication)",
   "outgoing-webhooks": "الويبهوك الصادرة",
+  "bidirectional-webhooks": "Two-Way Webhooks",
   "outgoingWebhooksPopup-title": "الويبهوك الصادرة",
   "boardCardTitlePopup-title": "Card Title Filter",
+  "disable-webhook": "Disable This Webhook",
+  "global-webhook": "Global Webhooks",
   "new-outgoing-webhook": "ويبهوك جديدة ",
   "no-name": "(غير معروف)",
   "Node_version": "إصدار النود",

i18n/bg.i18n.json

@@ -510,9 +510,14 @@
   "email-smtp-test-text": "Успешно изпратихте имейл",
   "error-invitation-code-not-exist": "Invitation code doesn't exist",
   "error-notAuthorized": "You are not authorized to view this page.",
+  "webhook-title": "Webhook Name",
+  "webhook-token": "Token (Optional for Authentication)",
   "outgoing-webhooks": "Outgoing Webhooks",
+  "bidirectional-webhooks": "Two-Way Webhooks",
   "outgoingWebhooksPopup-title": "Outgoing Webhooks",
   "boardCardTitlePopup-title": "Card Title Filter",
+  "disable-webhook": "Disable This Webhook",
+  "global-webhook": "Global Webhooks",
   "new-outgoing-webhook": "New Outgoing Webhook",
   "no-name": "(Unknown)",
   "Node_version": "Версия на Node",

i18n/br.i18n.json

@@ -510,9 +510,14 @@
   "email-smtp-test-text": "You have successfully sent an email",
   "error-invitation-code-not-exist": "Invitation code doesn't exist",
   "error-notAuthorized": "You are not authorized to view this page.",
+  "webhook-title": "Webhook Name",
+  "webhook-token": "Token (Optional for Authentication)",
   "outgoing-webhooks": "Outgoing Webhooks",
+  "bidirectional-webhooks": "Two-Way Webhooks",
   "outgoingWebhooksPopup-title": "Outgoing Webhooks",
   "boardCardTitlePopup-title": "Card Title Filter",
+  "disable-webhook": "Disable This Webhook",
+  "global-webhook": "Global Webhooks",
   "new-outgoing-webhook": "New Outgoing Webhook",
   "no-name": "(Unknown)",
   "Node_version": "Node version",

i18n/ca.i18n.json

@@ -510,9 +510,14 @@
   "email-smtp-test-text": "Has enviat un missatge satisfactòriament",
   "error-invitation-code-not-exist": "El codi d'invitació no existeix",
   "error-notAuthorized": "No estau autoritzats per veure aquesta pàgina",
+  "webhook-title": "Webhook Name",
+  "webhook-token": "Token (Optional for Authentication)",
   "outgoing-webhooks": "Webhooks sortints",
+  "bidirectional-webhooks": "Two-Way Webhooks",
   "outgoingWebhooksPopup-title": "Webhooks sortints",
   "boardCardTitlePopup-title": "Card Title Filter",
+  "disable-webhook": "Disable This Webhook",
+  "global-webhook": "Global Webhooks",
   "new-outgoing-webhook": "Nou Webook sortint",
   "no-name": "Importa tauler des de Wekan",
   "Node_version": "Versió Node",

i18n/cs.i18n.json

@@ -510,9 +510,14 @@
   "email-smtp-test-text": "Email byl úspěšně odeslán",
   "error-invitation-code-not-exist": "Kód pozvánky neexistuje.",
   "error-notAuthorized": "Nejste autorizován k prohlížení této stránky.",
+  "webhook-title": "Webhook Name",
+  "webhook-token": "Token (Optional for Authentication)",
   "outgoing-webhooks": "Odchozí Webhooky",
+  "bidirectional-webhooks": "Two-Way Webhooks",
   "outgoingWebhooksPopup-title": "Odchozí Webhooky",
   "boardCardTitlePopup-title": "Filtr názvů karet",
+  "disable-webhook": "Disable This Webhook",
+  "global-webhook": "Global Webhooks",
   "new-outgoing-webhook": "Nové odchozí Webhooky",
   "no-name": "(Neznámé)",
   "Node_version": "Node verze",

i18n/da.i18n.json

@@ -510,9 +510,14 @@
   "email-smtp-test-text": "You have successfully sent an email",
   "error-invitation-code-not-exist": "Invitation code doesn't exist",
   "error-notAuthorized": "You are not authorized to view this page.",
+  "webhook-title": "Webhook Name",
+  "webhook-token": "Token (Optional for Authentication)",
   "outgoing-webhooks": "Outgoing Webhooks",
+  "bidirectional-webhooks": "Two-Way Webhooks",
   "outgoingWebhooksPopup-title": "Outgoing Webhooks",
   "boardCardTitlePopup-title": "Card Title Filter",
+  "disable-webhook": "Disable This Webhook",
+  "global-webhook": "Global Webhooks",
   "new-outgoing-webhook": "New Outgoing Webhook",
   "no-name": "(Unknown)",
   "Node_version": "Node version",

i18n/de.i18n.json

@@ -510,9 +510,14 @@
   "email-smtp-test-text": "Sie haben erfolgreich eine E-Mail versandt",
   "error-invitation-code-not-exist": "Ungültiger Einladungscode",
   "error-notAuthorized": "Sie sind nicht berechtigt diese Seite zu sehen.",
+  "webhook-title": "Webhook Name",
+  "webhook-token": "Token (Optional für Authentifizierung)",
   "outgoing-webhooks": "Ausgehende Webhooks",
+  "bidirectional-webhooks": "Zwei-Wege Webhooks",
   "outgoingWebhooksPopup-title": "Ausgehende Webhooks",
   "boardCardTitlePopup-title": "Kartentitelfilter",
+  "disable-webhook": "Diesen Webhook deaktivieren",
+  "global-webhook": "Globale Webhooks",
   "new-outgoing-webhook": "Neuer ausgehender Webhook",
   "no-name": "(Unbekannt)",
   "Node_version": "Node-Version",

i18n/el.i18n.json

@@ -510,9 +510,14 @@
   "email-smtp-test-text": "You have successfully sent an email",
   "error-invitation-code-not-exist": "Ο κωδικός πρόσκλησης δεν υπάρχει",
   "error-notAuthorized": "You are not authorized to view this page.",
+  "webhook-title": "Webhook Name",
+  "webhook-token": "Token (Optional for Authentication)",
   "outgoing-webhooks": "Outgoing Webhooks",
+  "bidirectional-webhooks": "Two-Way Webhooks",
   "outgoingWebhooksPopup-title": "Outgoing Webhooks",
   "boardCardTitlePopup-title": "Card Title Filter",
+  "disable-webhook": "Disable This Webhook",
+  "global-webhook": "Global Webhooks",
   "new-outgoing-webhook": "New Outgoing Webhook",
   "no-name": "(Άγνωστο)",
   "Node_version": "Έκδοση Node",

i18n/en-GB.i18n.json

@@ -510,9 +510,14 @@
   "email-smtp-test-text": "You have successfully sent an email",
   "error-invitation-code-not-exist": "Invitation code doesn't exist",
   "error-notAuthorized": "You are not authorised to view this page.",
+  "webhook-title": "Webhook Name",
+  "webhook-token": "Token (Optional for Authentication)",
   "outgoing-webhooks": "Outgoing Webhooks",
+  "bidirectional-webhooks": "Two-Way Webhooks",
   "outgoingWebhooksPopup-title": "Outgoing Webhooks",
   "boardCardTitlePopup-title": "Card Title Filter",
+  "disable-webhook": "Disable This Webhook",
+  "global-webhook": "Global Webhooks",
   "new-outgoing-webhook": "New Outgoing Webhook",
   "no-name": "(Unknown)",
   "Node_version": "Node version",

i18n/en.i18n.json

@@ -510,9 +510,14 @@
   "email-smtp-test-text": "You have successfully sent an email",
   "error-invitation-code-not-exist": "Invitation code doesn't exist",
   "error-notAuthorized": "You are not authorized to view this page.",
+  "webhook-title": "Webhook Name",
+  "webhook-token": "Token (Optional for Authentication)",
   "outgoing-webhooks": "Outgoing Webhooks",
+  "bidirectional-webhooks": "Two-Way Webhooks",
   "outgoingWebhooksPopup-title": "Outgoing Webhooks",
   "boardCardTitlePopup-title": "Card Title Filter",
+  "disable-webhook": "Disable This Webhook",
+  "global-webhook": "Global Webhooks",
   "new-outgoing-webhook": "New Outgoing Webhook",
   "no-name": "(Unknown)",
   "Node_version": "Node version",

i18n/eo.i18n.json

@@ -510,9 +510,14 @@
   "email-smtp-test-text": "You have successfully sent an email",
   "error-invitation-code-not-exist": "Invitation code doesn't exist",
   "error-notAuthorized": "You are not authorized to view this page.",
+  "webhook-title": "Webhook Name",
+  "webhook-token": "Token (Optional for Authentication)",
   "outgoing-webhooks": "Outgoing Webhooks",
+  "bidirectional-webhooks": "Two-Way Webhooks",
   "outgoingWebhooksPopup-title": "Outgoing Webhooks",
   "boardCardTitlePopup-title": "Card Title Filter",
+  "disable-webhook": "Disable This Webhook",
+  "global-webhook": "Global Webhooks",
   "new-outgoing-webhook": "New Outgoing Webhook",
   "no-name": "(Unknown)",
   "Node_version": "Node version",

i18n/es-AR.i18n.json

@@ -510,9 +510,14 @@
   "email-smtp-test-text": "Enviaste el correo correctamente",
   "error-invitation-code-not-exist": "El código de invitación no existe",
   "error-notAuthorized": "No estás autorizado para ver esta página.",
+  "webhook-title": "Webhook Name",
+  "webhook-token": "Token (Optional for Authentication)",
   "outgoing-webhooks": "Ganchos Web Salientes",
+  "bidirectional-webhooks": "Two-Way Webhooks",
   "outgoingWebhooksPopup-title": "Ganchos Web Salientes",
   "boardCardTitlePopup-title": "Card Title Filter",
+  "disable-webhook": "Disable This Webhook",
+  "global-webhook": "Global Webhooks",
   "new-outgoing-webhook": "Nuevo Gancho Web",
   "no-name": "(desconocido)",
   "Node_version": "Versión de Node",

i18n/es.i18n.json

@@ -510,9 +510,14 @@
   "email-smtp-test-text": "El correo se ha enviado correctamente",
   "error-invitation-code-not-exist": "El código de invitación no existe",
   "error-notAuthorized": "No estás autorizado a ver esta página.",
+  "webhook-title": "Webhook Name",
+  "webhook-token": "Token (Optional for Authentication)",
   "outgoing-webhooks": "Webhooks salientes",
+  "bidirectional-webhooks": "Two-Way Webhooks",
   "outgoingWebhooksPopup-title": "Webhooks salientes",
   "boardCardTitlePopup-title": "Filtro de títulos de tarjeta",
+  "disable-webhook": "Disable This Webhook",
+  "global-webhook": "Global Webhooks",
   "new-outgoing-webhook": "Nuevo webhook saliente",
   "no-name": "(Desconocido)",
   "Node_version": "Versión de Node",

i18n/eu.i18n.json

@@ -510,9 +510,14 @@
   "email-smtp-test-text": "Arrakastaz bidali duzu posta elektroniko mezua",
   "error-invitation-code-not-exist": "Gonbidapen kodea ez da existitzen",
   "error-notAuthorized": "Ez duzu orri hau ikusteko baimenik.",
+  "webhook-title": "Webhook Name",
+  "webhook-token": "Token (Optional for Authentication)",
   "outgoing-webhooks": "Irteerako Webhook-ak",
+  "bidirectional-webhooks": "Two-Way Webhooks",
   "outgoingWebhooksPopup-title": "Irteerako Webhook-ak",
   "boardCardTitlePopup-title": "Card Title Filter",
+  "disable-webhook": "Disable This Webhook",
+  "global-webhook": "Global Webhooks",
   "new-outgoing-webhook": "Irteera-webhook berria",
   "no-name": "(Ezezaguna)",
   "Node_version": "Nodo bertsioa",

i18n/fa.i18n.json

@@ -510,9 +510,14 @@
   "email-smtp-test-text": "با موفقیت، یک رایانامه را فرستادید",
   "error-invitation-code-not-exist": "چنین کد دعوتی یافت نشد",
   "error-notAuthorized": "شما مجاز به دیدن این صفحه نیستید.",
+  "webhook-title": "Webhook Name",
+  "webhook-token": "Token (Optional for Authentication)",
   "outgoing-webhooks": "Outgoing Webhooks",
+  "bidirectional-webhooks": "Two-Way Webhooks",
   "outgoingWebhooksPopup-title": "Outgoing Webhooks",
   "boardCardTitlePopup-title": "فیلتر موضوع کارت",
+  "disable-webhook": "Disable This Webhook",
+  "global-webhook": "Global Webhooks",
   "new-outgoing-webhook": "New Outgoing Webhook",
   "no-name": "(ناشناخته)",
   "Node_version": "نسخه Node",

i18n/fi.i18n.json

@@ -510,9 +510,14 @@
   "email-smtp-test-text": "Olet onnistuneesti lähettänyt sähköpostin",
   "error-invitation-code-not-exist": "Kutsukoodia ei ole olemassa",
   "error-notAuthorized": "Sinulla ei ole oikeutta tarkastella tätä sivua.",
+  "webhook-title": "Webkoukun nimi",
+  "webhook-token": "Token (Valinnainen autentikoinnissa)",
   "outgoing-webhooks": "Lähtevät Webkoukut",
+  "bidirectional-webhooks": "Kaksisuuntaiset Webkoukut",
   "outgoingWebhooksPopup-title": "Lähtevät Webkoukut",
   "boardCardTitlePopup-title": "Kortin otsikkosuodatin",
+  "disable-webhook": "Poista käytöstä tämä Webkoukku",
+  "global-webhook": "Kaikenkattavat Webkoukut",
   "new-outgoing-webhook": "Uusi lähtevä Webkoukku",
   "no-name": "(Tuntematon)",
   "Node_version": "Node-versio",

i18n/fr.i18n.json

@@ -510,9 +510,14 @@
   "email-smtp-test-text": "Vous avez envoyé un mail avec succès",
   "error-invitation-code-not-exist": "Ce code d'invitation n'existe pas.",
   "error-notAuthorized": "Vous n'êtes pas autorisé à accéder à cette page.",
+  "webhook-title": "Nom du webhook",
+  "webhook-token": "Jeton (optionnel pour l'authentification)",
   "outgoing-webhooks": "Webhooks sortants",
+  "bidirectional-webhooks": "Webhooks bidirectionnels",
   "outgoingWebhooksPopup-title": "Webhooks sortants",
   "boardCardTitlePopup-title": "Filtre par titre de carte",
+  "disable-webhook": "Désactiver ce webhook",
+  "global-webhook": "Webhooks globaux",
   "new-outgoing-webhook": "Nouveau webhook sortant",
   "no-name": "(Inconnu)",
   "Node_version": "Version de Node",

i18n/gl.i18n.json

@@ -510,9 +510,14 @@
   "email-smtp-test-text": "You have successfully sent an email",
   "error-invitation-code-not-exist": "Invitation code doesn't exist",
   "error-notAuthorized": "You are not authorized to view this page.",
+  "webhook-title": "Webhook Name",
+  "webhook-token": "Token (Optional for Authentication)",
   "outgoing-webhooks": "Outgoing Webhooks",
+  "bidirectional-webhooks": "Two-Way Webhooks",
   "outgoingWebhooksPopup-title": "Outgoing Webhooks",
   "boardCardTitlePopup-title": "Card Title Filter",
+  "disable-webhook": "Disable This Webhook",
+  "global-webhook": "Global Webhooks",
   "new-outgoing-webhook": "New Outgoing Webhook",
   "no-name": "(Unknown)",
   "Node_version": "Node version",

i18n/he.i18n.json

@@ -510,9 +510,14 @@
   "email-smtp-test-text": "שלחת הודעת דוא״ל בהצלחה",
   "error-invitation-code-not-exist": "קוד ההזמנה אינו קיים",
   "error-notAuthorized": "אין לך הרשאה לצפות בעמוד זה.",
+  "webhook-title": "שם ההתלייה",
+  "webhook-token": "אסימון (כרשות לצורך אימות)",
   "outgoing-webhooks": "קרסי רשת יוצאים",
+  "bidirectional-webhooks": "התליות דו־כיווניות",
   "outgoingWebhooksPopup-title": "קרסי רשת יוצאים",
   "boardCardTitlePopup-title": "מסנן כותרת כרטיס",
+  "disable-webhook": "השבתת ההתלייה הזאת",
+  "global-webhook": "התליות גלובליות",
   "new-outgoing-webhook": "קרסי רשת יוצאים חדשים",
   "no-name": "(לא ידוע)",
   "Node_version": "גרסת Node",

i18n/hi.i18n.json

@@ -510,9 +510,14 @@
   "email-smtp-test-text": "You have successfully प्रेषित an email",
   "error-invitation-code-not-exist": "Invitation code doesn't exist",
   "error-notAuthorized": "You are not authorized तक  आलोकन  यह page.",
+  "webhook-title": "Webhook Name",
+  "webhook-token": "Token (Optional for Authentication)",
   "outgoing-webhooks": "Outgoing Webhooks",
+  "bidirectional-webhooks": "Two-Way Webhooks",
   "outgoingWebhooksPopup-title": "Outgoing Webhooks",
   "boardCardTitlePopup-title": "Card Title Filter",
+  "disable-webhook": "Disable This Webhook",
+  "global-webhook": "Global Webhooks",
   "new-outgoing-webhook": "New Outgoing Webhook",
   "no-name": "(Unknown)",
   "Node_version": "Node version",

i18n/hu.i18n.json

@@ -510,9 +510,14 @@
   "email-smtp-test-text": "Sikeresen elküldött egy e-mailt",
   "error-invitation-code-not-exist": "A meghívási kód nem létezik",
   "error-notAuthorized": "Nincs jogosultsága az oldal megtekintéséhez.",
+  "webhook-title": "Webhook Name",
+  "webhook-token": "Token (Optional for Authentication)",
   "outgoing-webhooks": "Kimenő webhurkok",
+  "bidirectional-webhooks": "Two-Way Webhooks",
   "outgoingWebhooksPopup-title": "Kimenő webhurkok",
   "boardCardTitlePopup-title": "Card Title Filter",
+  "disable-webhook": "Disable This Webhook",
+  "global-webhook": "Global Webhooks",
   "new-outgoing-webhook": "Új kimenő webhurok",
   "no-name": "(Ismeretlen)",
   "Node_version": "Node verzió",

i18n/hy.i18n.json

@@ -510,9 +510,14 @@
   "email-smtp-test-text": "You have successfully sent an email",
   "error-invitation-code-not-exist": "Invitation code doesn't exist",
   "error-notAuthorized": "You are not authorized to view this page.",
+  "webhook-title": "Webhook Name",
+  "webhook-token": "Token (Optional for Authentication)",
   "outgoing-webhooks": "Outgoing Webhooks",
+  "bidirectional-webhooks": "Two-Way Webhooks",
   "outgoingWebhooksPopup-title": "Outgoing Webhooks",
   "boardCardTitlePopup-title": "Card Title Filter",
+  "disable-webhook": "Disable This Webhook",
+  "global-webhook": "Global Webhooks",
   "new-outgoing-webhook": "New Outgoing Webhook",
   "no-name": "(Unknown)",
   "Node_version": "Node version",

i18n/id.i18n.json

@@ -510,9 +510,14 @@
   "email-smtp-test-text": "You have successfully sent an email",
   "error-invitation-code-not-exist": "Kode undangan tidak ada",
   "error-notAuthorized": "You are not authorized to view this page.",
+  "webhook-title": "Webhook Name",
+  "webhook-token": "Token (Optional for Authentication)",
   "outgoing-webhooks": "Outgoing Webhooks",
+  "bidirectional-webhooks": "Two-Way Webhooks",
   "outgoingWebhooksPopup-title": "Outgoing Webhooks",
   "boardCardTitlePopup-title": "Card Title Filter",
+  "disable-webhook": "Disable This Webhook",
+  "global-webhook": "Global Webhooks",
   "new-outgoing-webhook": "New Outgoing Webhook",
   "no-name": "(Unknown)",
   "Node_version": "Node version",

i18n/ig.i18n.json

@@ -510,9 +510,14 @@
   "email-smtp-test-text": "You have successfully sent an email",
   "error-invitation-code-not-exist": "Invitation code doesn't exist",
   "error-notAuthorized": "You are not authorized to view this page.",
+  "webhook-title": "Webhook Name",
+  "webhook-token": "Token (Optional for Authentication)",
   "outgoing-webhooks": "Outgoing Webhooks",
+  "bidirectional-webhooks": "Two-Way Webhooks",
   "outgoingWebhooksPopup-title": "Outgoing Webhooks",
   "boardCardTitlePopup-title": "Card Title Filter",
+  "disable-webhook": "Disable This Webhook",
+  "global-webhook": "Global Webhooks",
   "new-outgoing-webhook": "New Outgoing Webhook",
   "no-name": "(Unknown)",
   "Node_version": "Node version",

i18n/it.i18n.json

@@ -510,9 +510,14 @@
   "email-smtp-test-text": "Hai inviato un'email con successo",
   "error-invitation-code-not-exist": "Il codice d'invito non esiste",
   "error-notAuthorized": "Non sei autorizzato ad accedere a questa pagina.",
+  "webhook-title": "Webhook Name",
+  "webhook-token": "Token (Optional for Authentication)",
   "outgoing-webhooks": "Server esterni",
+  "bidirectional-webhooks": "Two-Way Webhooks",
   "outgoingWebhooksPopup-title": "Server esterni",
   "boardCardTitlePopup-title": "Filtro per Titolo Scheda",
+  "disable-webhook": "Disable This Webhook",
+  "global-webhook": "Global Webhooks",
   "new-outgoing-webhook": "Nuovo webhook in uscita",
   "no-name": "(Sconosciuto)",
   "Node_version": "Versione di Node",

i18n/ja.i18n.json

@@ -111,8 +111,8 @@
   "restore-board": "ボードをリストア",
   "no-archived-boards": "No Boards in Archive.",
   "archives": "アーカイブ",
-  "template": "Template",
-  "templates": "Templates",
+  "template": "テンプレート",
+  "templates": "テンプレート",
   "assign-member": "メンバーの割当",
   "attached": "添付されました",
   "attachment": "添付ファイル",
@@ -164,7 +164,7 @@
   "cardLabelsPopup-title": "ラベル",
   "cardMembersPopup-title": "メンバー",
   "cardMorePopup-title": "さらに見る",
-  "cardTemplatePopup-title": "Create template",
+  "cardTemplatePopup-title": "テンプレートの作成",
   "cards": "カード",
   "cards-count": "カード",
   "casSignIn": "Sign In with CAS",
@@ -387,8 +387,8 @@
   "muted-info": "このボードの変更は通知されません",
   "my-boards": "自分のボード",
   "name": "名前",
-  "no-archived-cards": "No cards in Archive.",
-  "no-archived-lists": "No lists in Archive.",
+  "no-archived-cards": "カードをアーカイブする",
+  "no-archived-lists": "リストをアーカイブする",
   "no-archived-swimlanes": "No swimlanes in Archive.",
   "no-results": "該当するものはありません",
   "normal": "通常",
@@ -477,9 +477,9 @@
   "welcome-swimlane": "Milestone 1",
   "welcome-list1": "基本",
   "welcome-list2": "高度",
-  "card-templates-swimlane": "Card Templates",
-  "list-templates-swimlane": "List Templates",
-  "board-templates-swimlane": "Board Templates",
+  "card-templates-swimlane": "カードのテンプレート",
+  "list-templates-swimlane": "リストのテンプレート",
+  "board-templates-swimlane": "ボードのテンプレート",
   "what-to-do": "何をしたいですか？",
   "wipLimitErrorPopup-title": "Invalid WIP Limit",
   "wipLimitErrorPopup-dialog-pt1": "The number of tasks in this list is higher than the WIP limit you've defined.",
@@ -510,9 +510,14 @@
   "email-smtp-test-text": "You have successfully sent an email",
   "error-invitation-code-not-exist": "招待コードが存在しません",
   "error-notAuthorized": "このページを参照する権限がありません。",
+  "webhook-title": "Webhook Name",
+  "webhook-token": "Token (Optional for Authentication)",
   "outgoing-webhooks": "発信Webフック",
+  "bidirectional-webhooks": "Two-Way Webhooks",
   "outgoingWebhooksPopup-title": "発信Webフック",
   "boardCardTitlePopup-title": "Card Title Filter",
+  "disable-webhook": "Disable This Webhook",
+  "global-webhook": "Global Webhooks",
   "new-outgoing-webhook": "発信Webフックの作成",
   "no-name": "(Unknown)",
   "Node_version": "Nodeバージョン",

i18n/ka.i18n.json

@@ -510,9 +510,14 @@
   "email-smtp-test-text": "თქვენ წარმატებით გააგზავნეთ ელ.ფოსტა.",
   "error-invitation-code-not-exist": "მსგავსი მოსაწვევი კოდი არ არსებობს",
   "error-notAuthorized": "თქვენ არ გაქვთ ამ გვერდის ნახვის უფლება",
+  "webhook-title": "Webhook Name",
+  "webhook-token": "Token (Optional for Authentication)",
   "outgoing-webhooks": "გამავალი Webhook",
+  "bidirectional-webhooks": "Two-Way Webhooks",
   "outgoingWebhooksPopup-title": "გამავალი Webhook",
   "boardCardTitlePopup-title": "Card Title Filter",
+  "disable-webhook": "Disable This Webhook",
+  "global-webhook": "Global Webhooks",
   "new-outgoing-webhook": "New Outgoing Webhook",
   "no-name": "(უცნობი)",
   "Node_version": "Node ვერსია",

i18n/km.i18n.json

@@ -510,9 +510,14 @@
   "email-smtp-test-text": "You have successfully sent an email",
   "error-invitation-code-not-exist": "Invitation code doesn't exist",
   "error-notAuthorized": "You are not authorized to view this page.",
+  "webhook-title": "Webhook Name",
+  "webhook-token": "Token (Optional for Authentication)",
   "outgoing-webhooks": "Outgoing Webhooks",
+  "bidirectional-webhooks": "Two-Way Webhooks",
   "outgoingWebhooksPopup-title": "Outgoing Webhooks",
   "boardCardTitlePopup-title": "Card Title Filter",
+  "disable-webhook": "Disable This Webhook",
+  "global-webhook": "Global Webhooks",
   "new-outgoing-webhook": "New Outgoing Webhook",
   "no-name": "(Unknown)",
   "Node_version": "Node version",

i18n/ko.i18n.json

@@ -510,9 +510,14 @@
   "email-smtp-test-text": "테스트 메일을 성공적으로 발송하였습니다.",
   "error-invitation-code-not-exist": "초대 코드가 존재하지 않습니다.",
   "error-notAuthorized": "이 페이지를 볼 수있는 권한이 없습니다.",
+  "webhook-title": "Webhook Name",
+  "webhook-token": "Token (Optional for Authentication)",
   "outgoing-webhooks": "Outgoing Webhooks",
+  "bidirectional-webhooks": "Two-Way Webhooks",
   "outgoingWebhooksPopup-title": "Outgoing Webhooks",
   "boardCardTitlePopup-title": "Card Title Filter",
+  "disable-webhook": "Disable This Webhook",
+  "global-webhook": "Global Webhooks",
   "new-outgoing-webhook": "New Outgoing Webhook",
   "no-name": "(Unknown)",
   "Node_version": "Node version",

i18n/lv.i18n.json

@@ -510,9 +510,14 @@
   "email-smtp-test-text": "You have successfully sent an email",
   "error-invitation-code-not-exist": "Invitation code doesn't exist",
   "error-notAuthorized": "You are not authorized to view this page.",
+  "webhook-title": "Webhook Name",
+  "webhook-token": "Token (Optional for Authentication)",
   "outgoing-webhooks": "Outgoing Webhooks",
+  "bidirectional-webhooks": "Two-Way Webhooks",
   "outgoingWebhooksPopup-title": "Outgoing Webhooks",
   "boardCardTitlePopup-title": "Card Title Filter",
+  "disable-webhook": "Disable This Webhook",
+  "global-webhook": "Global Webhooks",
   "new-outgoing-webhook": "New Outgoing Webhook",
   "no-name": "(Unknown)",
   "Node_version": "Node version",

i18n/mk.i18n.json

@@ -510,9 +510,14 @@
   "email-smtp-test-text": "Успешно изпратихте е-маил",
   "error-invitation-code-not-exist": "Invitation code doesn't exist",
   "error-notAuthorized": "You are not authorized to view this page.",
+  "webhook-title": "Webhook Name",
+  "webhook-token": "Token (Optional for Authentication)",
   "outgoing-webhooks": "Outgoing Webhooks",
+  "bidirectional-webhooks": "Two-Way Webhooks",
   "outgoingWebhooksPopup-title": "Outgoing Webhooks",
   "boardCardTitlePopup-title": "Card Title Filter",
+  "disable-webhook": "Disable This Webhook",
+  "global-webhook": "Global Webhooks",
   "new-outgoing-webhook": "New Outgoing Webhook",
   "no-name": "(Unknown)",
   "Node_version": "Версия на Node",

i18n/mn.i18n.json

@@ -510,9 +510,14 @@
   "email-smtp-test-text": "You have successfully sent an email",
   "error-invitation-code-not-exist": "Invitation code doesn't exist",
   "error-notAuthorized": "You are not authorized to view this page.",
+  "webhook-title": "Webhook Name",
+  "webhook-token": "Token (Optional for Authentication)",
   "outgoing-webhooks": "Outgoing Webhooks",
+  "bidirectional-webhooks": "Two-Way Webhooks",
   "outgoingWebhooksPopup-title": "Outgoing Webhooks",
   "boardCardTitlePopup-title": "Card Title Filter",
+  "disable-webhook": "Disable This Webhook",
+  "global-webhook": "Global Webhooks",
   "new-outgoing-webhook": "New Outgoing Webhook",
   "no-name": "(Unknown)",
   "Node_version": "Node version",

i18n/nb.i18n.json

@@ -510,9 +510,14 @@
   "email-smtp-test-text": "You have successfully sent an email",
   "error-invitation-code-not-exist": "Invitation code doesn't exist",
   "error-notAuthorized": "You are not authorized to view this page.",
+  "webhook-title": "Webhook Name",
+  "webhook-token": "Token (Optional for Authentication)",
   "outgoing-webhooks": "Outgoing Webhooks",
+  "bidirectional-webhooks": "Two-Way Webhooks",
   "outgoingWebhooksPopup-title": "Outgoing Webhooks",
   "boardCardTitlePopup-title": "Card Title Filter",
+  "disable-webhook": "Disable This Webhook",
+  "global-webhook": "Global Webhooks",
   "new-outgoing-webhook": "New Outgoing Webhook",
   "no-name": "(Unknown)",
   "Node_version": "Node version",

i18n/oc.i18n.json

@@ -139,9 +139,9 @@
   "board-view-lists": "Tièras",
   "bucket-example": "Coma \"Tota la tièra\" per exemple",
   "cancel": "Tornar",
-  "card-archived": "Aquesta carta es desplaçada dins Archius",
-  "board-archived": "Aqueste tablèu esdesplaçat dins Archius",
-  "card-comments-title": "Aquesta carta a %s de comentaris.",
+  "card-archived": "Aquesta carta es desplaçada dins Archius.",
+  "board-archived": "Aqueste tablèu esdesplaçat dins Archius.",
+  "card-comments-title": "Aquesta carta a %s comentari(s).",
   "card-delete-notice": "Un còp tirat, pas de posibilitat de tornar enrè",
   "card-delete-pop": "Totes las accions van èsser quitadas del seguit d'activitat e poiretz pas mai utilizar aquesta carta.",
   "card-delete-suggest-archive": "Podètz desplaçar una carta dins Archius per la quitar del tablèu e gardar las activitats.",
@@ -510,9 +510,14 @@
   "email-smtp-test-text": "As capitat de mandar un corrièl",
   "error-invitation-code-not-exist": "Lo còde de convit existís pas",
   "error-notAuthorized": "Sès pas autorizat a agachar aquesta pagina",
+  "webhook-title": "Webhook Name",
+  "webhook-token": "Token (Optional for Authentication)",
   "outgoing-webhooks": "Outgoing Webhooks",
+  "bidirectional-webhooks": "Two-Way Webhooks",
   "outgoingWebhooksPopup-title": "Outgoing Webhooks",
   "boardCardTitlePopup-title": "Card Title Filter",
+  "disable-webhook": "Disable This Webhook",
+  "global-webhook": "Global Webhooks",
   "new-outgoing-webhook": "New Outgoing Webhook",
   "no-name": "(Desconegut)",
   "Node_version": "Node version",

i18n/pl.i18n.json

@@ -510,9 +510,14 @@
   "email-smtp-test-text": "Wiadomość testowa została wysłana z powodzeniem.",
   "error-invitation-code-not-exist": "Kod zaproszenia nie istnieje",
   "error-notAuthorized": "Nie jesteś uprawniony do przeglądania tej strony.",
+  "webhook-title": "Webhook Name",
+  "webhook-token": "Token (Optional for Authentication)",
   "outgoing-webhooks": "Wychodzące webhooki",
+  "bidirectional-webhooks": "Two-Way Webhooks",
   "outgoingWebhooksPopup-title": "Wychodzące webhooki",
   "boardCardTitlePopup-title": "Filtruj poprzez nazwę karty",
+  "disable-webhook": "Disable This Webhook",
+  "global-webhook": "Global Webhooks",
   "new-outgoing-webhook": "Nowy wychodzący webhook",
   "no-name": "(nieznany)",
   "Node_version": "Wersja Node",

i18n/pt-BR.i18n.json

@@ -510,9 +510,14 @@
   "email-smtp-test-text": "Você enviou um e-mail com sucesso",
   "error-invitation-code-not-exist": "O código do convite não existe",
   "error-notAuthorized": "Você não está autorizado à ver esta página.",
+  "webhook-title": "Nome do Webhook",
+  "webhook-token": "Token (Opcional para autenticação)",
   "outgoing-webhooks": "Webhook de saída",
+  "bidirectional-webhooks": "Two-Way Webhooks",
   "outgoingWebhooksPopup-title": "Webhook de saída",
   "boardCardTitlePopup-title": "Filtro do Título do Cartão",
+  "disable-webhook": "Desabilitar este Webhook",
+  "global-webhook": "Webhooks globais",
   "new-outgoing-webhook": "Novo Webhook de saída",
   "no-name": "(Desconhecido)",
   "Node_version": "Versão do Node",

i18n/pt.i18n.json

@@ -510,9 +510,14 @@
   "email-smtp-test-text": "Enviou um e-mail com sucesso",
   "error-invitation-code-not-exist": "O código do convite não existe",
   "error-notAuthorized": "Não tem autorização para ver esta página.",
+  "webhook-title": "Webhook Name",
+  "webhook-token": "Token (Optional for Authentication)",
   "outgoing-webhooks": "Webhooks de saída",
+  "bidirectional-webhooks": "Two-Way Webhooks",
   "outgoingWebhooksPopup-title": "Webhooks de saída",
   "boardCardTitlePopup-title": "Filtro do Título do Cartão",
+  "disable-webhook": "Disable This Webhook",
+  "global-webhook": "Global Webhooks",
   "new-outgoing-webhook": "Novo Webhook de saída",
   "no-name": "(Desconhecido)",
   "Node_version": "Versão do Node",

i18n/ro.i18n.json

@@ -510,9 +510,14 @@
   "email-smtp-test-text": "You have successfully sent an email",
   "error-invitation-code-not-exist": "Invitation code doesn't exist",
   "error-notAuthorized": "You are not authorized to view this page.",
+  "webhook-title": "Webhook Name",
+  "webhook-token": "Token (Optional for Authentication)",
   "outgoing-webhooks": "Outgoing Webhooks",
+  "bidirectional-webhooks": "Two-Way Webhooks",
   "outgoingWebhooksPopup-title": "Outgoing Webhooks",
   "boardCardTitlePopup-title": "Card Title Filter",
+  "disable-webhook": "Disable This Webhook",
+  "global-webhook": "Global Webhooks",
   "new-outgoing-webhook": "New Outgoing Webhook",
   "no-name": "(Unknown)",
   "Node_version": "Node version",

i18n/ru.i18n.json

@@ -510,10 +510,15 @@
   "email-smtp-test-text": "Вы успешно отправили письмо",
   "error-invitation-code-not-exist": "Код приглашения не существует",
   "error-notAuthorized": "У вас нет доступа на просмотр этой страницы.",
-  "outgoing-webhooks": "Исходящие Веб-хуки",
-  "outgoingWebhooksPopup-title": "Исходящие Веб-хуки",
+  "webhook-title": "Имя Веб-Хука",
+  "webhook-token": "Токен (Опционально для аутентификации)",
+  "outgoing-webhooks": "Исходящие Веб-Хуки",
+  "bidirectional-webhooks": "Двунаправленный Веб-Хук",
+  "outgoingWebhooksPopup-title": "Исходящие Веб-Хуки",
   "boardCardTitlePopup-title": "Фильтр названий карточек",
-  "new-outgoing-webhook": "Новый исходящий Веб-хук",
+  "disable-webhook": "Отключить этот Веб-Хук",
+  "global-webhook": "Глобальные Веб-Хуки",
+  "new-outgoing-webhook": "Новый исходящий Веб-Хук",
   "no-name": "(Неизвестный)",
   "Node_version": "Версия NodeJS",
   "Meteor_version": "Версия Meteor",

i18n/sr.i18n.json

@@ -510,9 +510,14 @@
   "email-smtp-test-text": "You have successfully sent an email",
   "error-invitation-code-not-exist": "Invitation code doesn't exist",
   "error-notAuthorized": "You are not authorized to view this page.",
+  "webhook-title": "Webhook Name",
+  "webhook-token": "Token (Optional for Authentication)",
   "outgoing-webhooks": "Outgoing Webhooks",
+  "bidirectional-webhooks": "Two-Way Webhooks",
   "outgoingWebhooksPopup-title": "Outgoing Webhooks",
   "boardCardTitlePopup-title": "Card Title Filter",
+  "disable-webhook": "Disable This Webhook",
+  "global-webhook": "Global Webhooks",
   "new-outgoing-webhook": "New Outgoing Webhook",
   "no-name": "(Unknown)",
   "Node_version": "Node version",

i18n/sv.i18n.json

@@ -510,9 +510,14 @@
   "email-smtp-test-text": "Du har skickat ett e-postmeddelande",
   "error-invitation-code-not-exist": "Inbjudningskod finns inte",
   "error-notAuthorized": "Du är inte behörig att se den här sidan.",
+  "webhook-title": "Webhook Name",
+  "webhook-token": "Token (Optional for Authentication)",
   "outgoing-webhooks": "Utgående Webhookar",
+  "bidirectional-webhooks": "Two-Way Webhooks",
   "outgoingWebhooksPopup-title": "Utgående Webhookar",
   "boardCardTitlePopup-title": "Korttitelfiler",
+  "disable-webhook": "Disable This Webhook",
+  "global-webhook": "Global Webhooks",
   "new-outgoing-webhook": "Ny utgående webhook",
   "no-name": "(Okänd)",
   "Node_version": "Nodversion",

i18n/sw.i18n.json

@@ -510,9 +510,14 @@
   "email-smtp-test-text": "You have successfully sent an email",
   "error-invitation-code-not-exist": "Invitation code doesn't exist",
   "error-notAuthorized": "You are not authorized to view this page.",
+  "webhook-title": "Webhook Name",
+  "webhook-token": "Token (Optional for Authentication)",
   "outgoing-webhooks": "Outgoing Webhooks",
+  "bidirectional-webhooks": "Two-Way Webhooks",
   "outgoingWebhooksPopup-title": "Outgoing Webhooks",
   "boardCardTitlePopup-title": "Card Title Filter",
+  "disable-webhook": "Disable This Webhook",
+  "global-webhook": "Global Webhooks",
   "new-outgoing-webhook": "New Outgoing Webhook",
   "no-name": "(Unknown)",
   "Node_version": "Node version",

i18n/ta.i18n.json

@@ -510,9 +510,14 @@
   "email-smtp-test-text": "You have successfully sent an email",
   "error-invitation-code-not-exist": "Invitation code doesn't exist",
   "error-notAuthorized": "You are not authorized to view this page.",
+  "webhook-title": "Webhook Name",
+  "webhook-token": "Token (Optional for Authentication)",
   "outgoing-webhooks": "Outgoing Webhooks",
+  "bidirectional-webhooks": "Two-Way Webhooks",
   "outgoingWebhooksPopup-title": "Outgoing Webhooks",
   "boardCardTitlePopup-title": "Card Title Filter",
+  "disable-webhook": "Disable This Webhook",
+  "global-webhook": "Global Webhooks",
   "new-outgoing-webhook": "New Outgoing Webhook",
   "no-name": "(Unknown)",
   "Node_version": "Node version",

i18n/th.i18n.json

@@ -510,9 +510,14 @@
   "email-smtp-test-text": "You have successfully sent an email",
   "error-invitation-code-not-exist": "Invitation code doesn't exist",
   "error-notAuthorized": "You are not authorized to view this page.",
+  "webhook-title": "Webhook Name",
+  "webhook-token": "Token (Optional for Authentication)",
   "outgoing-webhooks": "Outgoing Webhooks",
+  "bidirectional-webhooks": "Two-Way Webhooks",
   "outgoingWebhooksPopup-title": "Outgoing Webhooks",
   "boardCardTitlePopup-title": "Card Title Filter",
+  "disable-webhook": "Disable This Webhook",
+  "global-webhook": "Global Webhooks",
   "new-outgoing-webhook": "New Outgoing Webhook",
   "no-name": "(Unknown)",
   "Node_version": "Node version",

i18n/tr.i18n.json

@@ -510,9 +510,14 @@
   "email-smtp-test-text": "E-Posta başarıyla gönderildi",
   "error-invitation-code-not-exist": "Davetiye kodu bulunamadı",
   "error-notAuthorized": "Bu sayfayı görmek için yetkiniz yok.",
+  "webhook-title": "Webhook Name",
+  "webhook-token": "Token (Optional for Authentication)",
   "outgoing-webhooks": "Dışarı giden bağlantılar",
+  "bidirectional-webhooks": "Two-Way Webhooks",
   "outgoingWebhooksPopup-title": "Dışarı giden bağlantılar",
   "boardCardTitlePopup-title": "Kart Başlığı Filtresi",
+  "disable-webhook": "Disable This Webhook",
+  "global-webhook": "Global Webhooks",
   "new-outgoing-webhook": "Yeni Dışarı Giden Web Bağlantısı",
   "no-name": "(Bilinmeyen)",
   "Node_version": "Node sürümü",

i18n/uk.i18n.json

@@ -510,9 +510,14 @@
   "email-smtp-test-text": "You have successfully sent an email",
   "error-invitation-code-not-exist": "Invitation code doesn't exist",
   "error-notAuthorized": "You are not authorized to view this page.",
+  "webhook-title": "Webhook Name",
+  "webhook-token": "Token (Optional for Authentication)",
   "outgoing-webhooks": "Outgoing Webhooks",
+  "bidirectional-webhooks": "Two-Way Webhooks",
   "outgoingWebhooksPopup-title": "Outgoing Webhooks",
   "boardCardTitlePopup-title": "Card Title Filter",
+  "disable-webhook": "Disable This Webhook",
+  "global-webhook": "Global Webhooks",
   "new-outgoing-webhook": "New Outgoing Webhook",
   "no-name": "(Unknown)",
   "Node_version": "Node version",

i18n/vi.i18n.json

@@ -510,9 +510,14 @@
   "email-smtp-test-text": "You have successfully sent an email",
   "error-invitation-code-not-exist": "Invitation code doesn't exist",
   "error-notAuthorized": "You are not authorized to view this page.",
+  "webhook-title": "Webhook Name",
+  "webhook-token": "Token (Optional for Authentication)",
   "outgoing-webhooks": "Outgoing Webhooks",
+  "bidirectional-webhooks": "Two-Way Webhooks",
   "outgoingWebhooksPopup-title": "Outgoing Webhooks",
   "boardCardTitlePopup-title": "Card Title Filter",
+  "disable-webhook": "Disable This Webhook",
+  "global-webhook": "Global Webhooks",
   "new-outgoing-webhook": "New Outgoing Webhook",
   "no-name": "(Unknown)",
   "Node_version": "Node version",

i18n/zh-CN.i18n.json

@@ -510,9 +510,14 @@
   "email-smtp-test-text": "你已成功发送邮件",
   "error-invitation-code-not-exist": "邀请码不存在",
   "error-notAuthorized": "您无权查看此页面。",
+  "webhook-title": "Webhook名称",
+  "webhook-token": "Token(认证选项)",
   "outgoing-webhooks": "外部Web挂钩",
+  "bidirectional-webhooks": "双向Webhook",
   "outgoingWebhooksPopup-title": "外部Web挂钩",
   "boardCardTitlePopup-title": "卡片标题过滤",
+  "disable-webhook": "禁用Webhook",
+  "global-webhook": "全局Webhook",
   "new-outgoing-webhook": "新建外部Web挂钩",
   "no-name": "(未知)",
   "Node_version": "Node.js版本",

i18n/zh-HK.i18n.json

@@ -510,9 +510,14 @@
   "email-smtp-test-text": "You have successfully sent an email",
   "error-invitation-code-not-exist": "Invitation code doesn't exist",
   "error-notAuthorized": "You are not authorized to view this page.",
+  "webhook-title": "Webhook Name",
+  "webhook-token": "Token (Optional for Authentication)",
   "outgoing-webhooks": "Outgoing Webhooks",
+  "bidirectional-webhooks": "Two-Way Webhooks",
   "outgoingWebhooksPopup-title": "Outgoing Webhooks",
   "boardCardTitlePopup-title": "Card Title Filter",
+  "disable-webhook": "Disable This Webhook",
+  "global-webhook": "Global Webhooks",
   "new-outgoing-webhook": "New Outgoing Webhook",
   "no-name": "(Unknown)",
   "Node_version": "Node version",

i18n/zh-TW.i18n.json

@@ -510,9 +510,14 @@
   "email-smtp-test-text": "您已成功寄送郵件",
   "error-invitation-code-not-exist": "邀請碼不存在",
   "error-notAuthorized": "沒有適合的權限觀看",
+  "webhook-title": "Webhook Name",
+  "webhook-token": "Token (Optional for Authentication)",
   "outgoing-webhooks": "設定 Webhooks",
+  "bidirectional-webhooks": "Two-Way Webhooks",
   "outgoingWebhooksPopup-title": "設定 Webhooks",
   "boardCardTitlePopup-title": "卡片標題過濾器",
+  "disable-webhook": "Disable This Webhook",
+  "global-webhook": "Global Webhooks",
   "new-outgoing-webhook": "New Outgoing Webhook",
   "no-name": "(未知)",
   "Node_version": "Node 版本",

models/accountSettings.js

@@ -20,6 +20,8 @@ AccountSettings.attachSchema(
       autoValue() {
         if (this.isInsert) {
           return new Date();
+        } else if (this.isUpsert) {
+          return { $setOnInsert: new Date() };
         } else {
           this.unset();
         }

models/actions.js

@@ -14,6 +14,16 @@ Actions.allow({
   },
 });
 
+Actions.before.insert((userId, doc) => {
+  doc.createdAt = new Date();
+  doc.modifiedAt = doc.createdAt;
+});
+
+Actions.before.update((userId, doc, fieldNames, modifier) => {
+  modifier.$set = modifier.$set || {};
+  modifier.$set.modifiedAt = new Date();
+});
+
 Actions.helpers({
   description() {
     return this.desc;

models/activities.js

@@ -62,8 +62,14 @@ Activities.helpers({
   //},
 });
 
+Activities.before.update((userId, doc, fieldNames, modifier) => {
+  modifier.$set = modifier.$set || {};
+  modifier.$set.modifiedAt = new Date();
+});
+
 Activities.before.insert((userId, doc) => {
   doc.createdAt = new Date();
+  doc.modifiedAt = doc.createdAt;
 });
 
 Activities.after.insert((userId, doc) => {
@@ -184,10 +190,11 @@ if (Meteor.isServer) {
               // it's person at himself, ignore it?
               continue;
             }
-            const user = Users.findOne(username) || Users.findOne({ username });
-            const uid = user && user._id;
+            const atUser =
+              Users.findOne(username) || Users.findOne({ username });
+            const uid = atUser && atUser._id;
             params.atUsername = username;
-            params.atEmails = user.emails;
+            params.atEmails = atUser.emails;
             if (board.hasMember(uid)) {
               title = 'act-atUserComment';
               watchers = _.union(watchers, [uid]);
@@ -268,13 +275,23 @@ if (Meteor.isServer) {
     });
 
     const integrations = Integrations.find({
-      boardId: board._id,
-      type: 'outgoing-webhooks',
+      boardId: { $in: [board._id, Integrations.Const.GLOBAL_WEBHOOK_ID] },
+      // type: 'outgoing-webhooks', // all types
       enabled: true,
       activities: { $in: [description, 'all'] },
     }).fetch();
     if (integrations.length > 0) {
-      Meteor.call('outgoingWebhooks', integrations, description, params);
+      integrations.forEach(integration => {
+        Meteor.call(
+          'outgoingWebhooks',
+          integration,
+          description,
+          params,
+          () => {
+            return;
+          },
+        );
+      });
     }
   });
 }

models/announcements.js

@@ -25,6 +25,8 @@ Announcements.attachSchema(
       autoValue() {
         if (this.isInsert) {
           return new Date();
+        } else if (this.isUpsert) {
+          return { $setOnInsert: new Date() };
         } else {
           this.unset();
         }

models/boards.js

@@ -55,6 +55,8 @@ Boards.attachSchema(
       autoValue() {
         if (this.isInsert) {
           return new Date();
+        } else if (this.isUpsert) {
+          return { $setOnInsert: new Date() };
         } else {
           this.unset();
         }

models/cardComments.js

@@ -34,6 +34,8 @@ CardComments.attachSchema(
       autoValue() {
         if (this.isInsert) {
           return new Date();
+        } else if (this.isUpsert) {
+          return { $setOnInsert: new Date() };
         } else {
           this.unset();
         }

models/cards.js

@@ -107,6 +107,8 @@ Cards.attachSchema(
       autoValue() {
         if (this.isInsert) {
           return new Date();
+        } else if (this.isUpsert) {
+          return { $setOnInsert: new Date() };
         } else {
           this.unset();
         }

models/checklistItems.js

@@ -44,6 +44,8 @@ ChecklistItems.attachSchema(
       autoValue() {
         if (this.isInsert) {
           return new Date();
+        } else if (this.isUpsert) {
+          return { $setOnInsert: new Date() };
         } else {
           this.unset();
         }

models/checklists.js

@@ -35,6 +35,8 @@ Checklists.attachSchema(
       autoValue() {
         if (this.isInsert) {
           return new Date();
+        } else if (this.isUpsert) {
+          return { $setOnInsert: new Date() };
         } else {
           this.unset();
         }

models/customFields.js

@@ -78,6 +78,8 @@ CustomFields.attachSchema(
       autoValue() {
         if (this.isInsert) {
           return new Date();
+        } else if (this.isUpsert) {
+          return { $setOnInsert: new Date() };
         } else {
           this.unset();
         }

models/integrations.js

@@ -63,6 +63,8 @@ Integrations.attachSchema(
       autoValue() {
         if (this.isInsert) {
           return new Date();
+        } else if (this.isUpsert) {
+          return { $setOnInsert: new Date() };
         } else {
           this.unset();
         }
@@ -88,16 +90,30 @@ Integrations.attachSchema(
     },
   }),
 );
-
+Integrations.Const = {
+  GLOBAL_WEBHOOK_ID: '_global',
+  ONEWAY: 'outgoing-webhooks',
+  TWOWAY: 'bidirectional-webhooks',
+  get WEBHOOK_TYPES() {
+    return [this.ONEWAY, this.TWOWAY];
+  },
+};
+const permissionHelper = {
+  allow(userId, doc) {
+    const user = Users.findOne(userId);
+    const isAdmin = user && Meteor.user().isAdmin;
+    return isAdmin || allowIsBoardAdmin(userId, Boards.findOne(doc.boardId));
+  },
+};
 Integrations.allow({
   insert(userId, doc) {
-    return allowIsBoardAdmin(userId, Boards.findOne(doc.boardId));
+    return permissionHelper.allow(userId, doc);
   },
   update(userId, doc) {
-    return allowIsBoardAdmin(userId, Boards.findOne(doc.boardId));
+    return permissionHelper.allow(userId, doc);
   },
   remove(userId, doc) {
-    return allowIsBoardAdmin(userId, Boards.findOne(doc.boardId));
+    return permissionHelper.allow(userId, doc);
   },
   fetch: ['boardId'],
 });

models/invitationCodes.js

@@ -18,6 +18,8 @@ InvitationCodes.attachSchema(
       autoValue() {
         if (this.isInsert) {
           return new Date();
+        } else if (this.isUpsert) {
+          return { $setOnInsert: new Date() };
         } else {
           this.unset();
         }

models/lists.js

@@ -45,6 +45,8 @@ Lists.attachSchema(
       autoValue() {
         if (this.isInsert) {
           return new Date();
+        } else if (this.isUpsert) {
+          return { $setOnInsert: new Date() };
         } else {
           this.unset();
         }

models/org.js

@@ -98,6 +98,8 @@ Org.attachSchema(
       autoValue() {
         if (this.isInsert) {
           return new Date();
+        } else if (this.isUpsert) {
+          return { $setOnInsert: new Date() };
         } else {
           this.unset();
         }

models/orgUser.js

@@ -49,6 +49,8 @@ OrgUser.attachSchema(
       autoValue() {
         if (this.isInsert) {
           return new Date();
+        } else if (this.isUpsert) {
+          return { $setOnInsert: new Date() };
         } else {
           this.unset();
         }

models/rules.js

@@ -27,6 +27,8 @@ Rules.attachSchema(
       autoValue() {
         if (this.isInsert) {
           return new Date();
+        } else if (this.isUpsert) {
+          return { $setOnInsert: new Date() };
         } else {
           this.unset();
         }

models/settings.js

@@ -60,6 +60,8 @@ Settings.attachSchema(
       autoValue() {
         if (this.isInsert) {
           return new Date();
+        } else if (this.isUpsert) {
+          return { $setOnInsert: new Date() };
         } else {
           this.unset();
         }

models/swimlanes.js

@@ -38,6 +38,8 @@ Swimlanes.attachSchema(
       autoValue() {
         if (this.isInsert) {
           return new Date();
+        } else if (this.isUpsert) {
+          return { $setOnInsert: new Date() };
         } else {
           this.unset();
         }

models/triggers.js

@@ -12,6 +12,16 @@ Triggers.mutations({
   },
 });
 
+Triggers.before.insert((userId, doc) => {
+  doc.createdAt = new Date();
+  doc.updatedAt = doc.createdAt;
+});
+
+Triggers.before.update((userId, doc, fieldNames, modifier) => {
+  modifier.$set = modifier.$set || {};
+  modifier.$set.updatedAt = new Date();
+});
+
 Triggers.allow({
   insert(userId, doc) {
     return allowIsBoardAdmin(userId, Boards.findOne(doc.boardId));

models/unsavedEdits.js

@@ -29,6 +29,8 @@ UnsavedEditCollection.attachSchema(
       autoValue() {
         if (this.isInsert) {
           return new Date();
+        } else if (this.isUpsert) {
+          return { $setOnInsert: new Date() };
         } else {
           this.unset();
         }

models/users.js

@@ -54,6 +54,8 @@ Users.attachSchema(
       autoValue() {
         if (this.isInsert) {
           return new Date();
+        } else if (this.isUpsert) {
+          return { $setOnInsert: new Date() };
         } else {
           this.unset();
         }

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "v3.27.0",
+  "version": "v3.36.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -1392,14 +1392,6 @@
       "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
       "dev": true
     },
-    "fibers": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/fibers/-/fibers-4.0.1.tgz",
-      "integrity": "sha512-H79EJn7DMWXk48ygmC82bMP8KNcFBZF1CPfwBpYF6cO85hGWoIrlu7eyX9ayxfjP9Nsl0JXxdI6fpYU4DWVw2w==",
-      "requires": {
-        "detect-libc": "^1.0.3"
-      }
-    },
     "figures": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/figures/-/figures-3.0.0.tgz",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "v3.27.0",
+  "version": "v3.36.0",
   "description": "Open-Source kanban",
   "private": true,
   "scripts": {
@@ -60,7 +60,6 @@
     "bson": "^4.0.0",
     "bunyan": "^1.8.12",
     "es6-promise": "^4.2.4",
-    "fibers": "^4.0.1",
     "gridfs-stream": "^0.5.3",
     "ldapjs": "^1.0.2",
     "meteor-node-stubs": "^0.4.1",

public/api/wekan.html

@@ -1524,7 +1524,7 @@ var n=this.pipeline.run(e.tokenizer(t)),r=new e.Vector,i=[],o=this._fields.reduc
 	  	<ul class="toc-list-h1">
         
           <li>
-            <a href="#wekan-rest-api" class="toc-h1 toc-link" data-title="Wekan REST API v3.26">Wekan REST API v3.26</a>
+            <a href="#wekan-rest-api" class="toc-h1 toc-link" data-title="Wekan REST API v3.35">Wekan REST API v3.35</a>
             
           </li>
         
@@ -2017,7 +2017,7 @@ var n=this.pipeline.run(e.tokenizer(t)),r=new e.Vector,i=[],o=this._fields.reduc
     <div class="page-wrapper">
       <div class="dark-box"></div>
       <div class="content">
-        <h1 id="wekan-rest-api">Wekan REST API v3.26</h1>
+        <h1 id="wekan-rest-api">Wekan REST API v3.35</h1>
 <blockquote>
 <p>Scroll down for code samples, example requests and responses. Select a language for code samples from the tabs above or the mobile navigation menu.</p>
 </blockquote>

public/api/wekan.yml

@@ -1,7 +1,7 @@
 swagger: '2.0'
 info:
   title: Wekan REST API
-  version: v3.26
+  version: v3.35
   description: |
     The REST API allows you to control and extend Wekan with ease.
 

rebuild-wekan.sh

@@ -143,8 +143,8 @@ do
 		#fi
 		#cd ..
 		sudo chown -R $(id -u):$(id -g) $HOME/.npm $HOME/.meteor
-		rm -rf node_modules
-		meteor npm install
+		rm -rf node_modules .meteor/local
+		npm install
 		rm -rf .build
 		meteor build .build --directory
 		cp -f fix-download-unicode/cfs_access-point.txt .build/bundle/programs/server/packages/cfs_access-point.js
@@ -156,7 +156,7 @@ do
 		#meteor npm install bcrypt
 		cd .build/bundle/programs/server
 		rm -rf node_modules
-		meteor npm install
+		npm install
 		#meteor npm install bcrypt
 		cd ../../../..
 		echo Done.

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 = 329,
+    appVersion = 338,
     # Increment this for every release.
 
-    appMarketingVersion = (defaultText = "3.27.0~2019-08-29"),
+    appMarketingVersion = (defaultText = "3.36.0~2019-09-05"),
     # Human-readable presentation of the app version.
 
     minUpgradableAppVersion = 0,

server/migrations.js

@@ -684,39 +684,6 @@ Migrations.add('mutate-boardIds-in-customfields', () => {
   });
 });
 
-const firstBatchOfDbsToAddCreatedAndUpdated = [
-  AccountSettings,
-  Actions,
-  Activities,
-  Announcements,
-  Boards,
-  CardComments,
-  Cards,
-  ChecklistItems,
-  Checklists,
-  CustomFields,
-  Integrations,
-  InvitationCodes,
-  Lists,
-  Rules,
-  Settings,
-  Swimlanes,
-  Triggers,
-  UnsavedEdits,
-];
-
-firstBatchOfDbsToAddCreatedAndUpdated.forEach(db => {
-  db.before.insert((userId, doc) => {
-    doc.createdAt = Date.now();
-    doc.updatedAt = doc.createdAt;
-  });
-
-  db.before.update((userId, doc, fieldNames, modifier) => {
-    modifier.$set = modifier.$set || {};
-    modifier.$set.updatedAt = new Date();
-  });
-});
-
 const modifiedAtTables = [
   AccountSettings,
   Actions,
@@ -769,3 +736,44 @@ Migrations.add('add-missing-created-and-modified', () => {
       console.error(e);
     });
 });
+
+Migrations.add('fix-incorrect-dates', () => {
+  const tables = [
+    AccountSettings,
+    Actions,
+    Activities,
+    Announcements,
+    Boards,
+    CardComments,
+    Cards,
+    ChecklistItems,
+    Checklists,
+    CustomFields,
+    Integrations,
+    InvitationCodes,
+    Lists,
+    Rules,
+    Settings,
+    Swimlanes,
+    Triggers,
+    UnsavedEdits,
+  ];
+
+  // Dates were previously created with Date.now() which is a number, not a date
+  tables.forEach(t =>
+    t
+      .rawCollection()
+      .find({ $or: [{ createdAt: { $type: 1 } }, { updatedAt: { $type: 1 } }] })
+      .forEach(({ _id, createdAt, updatedAt }) => {
+        t.rawCollection().update(
+          { _id },
+          {
+            $set: {
+              createdAt: new Date(createdAt),
+              updatedAt: new Date(updatedAt),
+            },
+          },
+        );
+      }),
+  );
+});

server/notifications/outgoing.js

@@ -8,6 +8,19 @@ const postCatchError = Meteor.wrapAsync((url, options, resolve) => {
   });
 });
 
+const Lock = {
+  _lock: {},
+  has(id) {
+    return !!this._lock[id];
+  },
+  set(id) {
+    this._lock[id] = 1;
+  },
+  unset(id) {
+    delete this._lock[id];
+  },
+};
+
 const webhooksAtbts = (process.env.WEBHOOKS_ATTRIBUTES &&
   process.env.WEBHOOKS_ATTRIBUTES.split(',')) || [
   'cardId',
@@ -20,15 +33,49 @@ const webhooksAtbts = (process.env.WEBHOOKS_ATTRIBUTES &&
   'commentId',
   'swimlaneId',
 ];
-
+const responseFunc = 'reactOnHookResponse';
 Meteor.methods({
-  outgoingWebhooks(integrations, description, params) {
-    check(integrations, Array);
+  [responseFunc](data) {
+    check(data, Object);
+    const paramCommentId = data.commentId;
+    const paramCardId = data.cardId;
+    const paramBoardId = data.boardId;
+    const newComment = data.comment;
+    if (paramCardId && paramBoardId && newComment) {
+      // only process data with the cardid, boardid and comment text, TODO can expand other functions here to react on returned data
+      const comment = CardComments.findOne({
+        _id: paramCommentId,
+        cardId: paramCardId,
+        boardId: paramBoardId,
+      });
+      if (comment) {
+        CardComments.update(comment._id, {
+          $set: {
+            text: newComment,
+          },
+        });
+      } else {
+        const userId = data.userId;
+        if (userId) {
+          CardComments.insert({
+            text: newComment,
+            userId,
+            cardId,
+            boardId,
+          });
+        }
+      }
+    }
+  },
+  outgoingWebhooks(integration, description, params) {
+    check(integration, Object);
     check(description, String);
     check(params, Object);
+    this.unblock();
 
     // label activity did not work yet, see wekan/models/activities.js
     const quoteParams = _.clone(params);
+    const clonedParams = _.clone(params);
     [
       'card',
       'list',
@@ -63,23 +110,44 @@ Meteor.methods({
       if (params[key]) value[key] = params[key];
     });
     value.description = description;
-
-    const options = {
-      headers: {
-        // 'Content-Type': 'application/json',
-        // 'X-Wekan-Activities-Token': 'Random.Id()',
-      },
-      data: value,
+    //integrations.forEach(integration => {
+    const is2way = integration.type === Integrations.Const.TWOWAY;
+    const token = integration.token || '';
+    const headers = {
+      'Content-Type': 'application/json',
     };
+    if (token) headers['X-Wekan-Token'] = token;
+    const options = {
+      headers,
+      data: is2way ? clonedParams : value,
+    };
+    const url = integration.url;
+    const response = postCatchError(url, options);
 
-    integrations.forEach(integration => {
-      const response = postCatchError(integration.url, options);
-
-      if (response && response.statusCode && response.statusCode === 200) {
-        return true; // eslint-disable-line consistent-return
-      } else {
-        throw new Meteor.Error('error-invalid-webhook-response');
+    if (response && response.statusCode && response.statusCode === 200) {
+      if (is2way) {
+        const cid = params.commentId;
+        const tooSoon = Lock.has(cid); // if an activity happens to fast, notification shouldn't fire with the same id
+        if (!tooSoon) {
+          let clearNotification = () => {};
+          if (cid) {
+            Lock.set(cid);
+            const clearNotificationFlagTimeout = 1000;
+            clearNotification = () => Lock.unset(cid);
+            Meteor.setTimeout(clearNotification, clearNotificationFlagTimeout);
+          }
+          const data = response.data; // only an JSON encoded response will be actioned
+          if (data) {
+            Meteor.call(responseFunc, data, () => {
+              clearNotification();
+            });
+          }
+        }
       }
-    });
+      return response; // eslint-disable-line consistent-return
+    } else {
+      throw new Meteor.Error('error-invalid-webhook-response');
+    }
+    //});
   },
 });

server/publications/people.js

@@ -1,4 +1,5 @@
-Meteor.publish('people', function(limit) {
+Meteor.publish('people', function(query, limit) {
+  check(query, Match.OneOf(Object, null));
   check(limit, Number);
 
   if (!Match.test(this.userId, String)) {
@@ -7,23 +8,20 @@ Meteor.publish('people', function(limit) {
 
   const user = Users.findOne(this.userId);
   if (user && user.isAdmin) {
-    return Users.find(
-      {},
-      {
-        limit,
-        sort: { createdAt: -1 },
-        fields: {
-          username: 1,
-          'profile.fullname': 1,
-          isAdmin: 1,
-          emails: 1,
-          createdAt: 1,
-          loginDisabled: 1,
-          authenticationMethod: 1,
-        },
+    return Users.find(query, {
+      limit,
+      sort: { createdAt: -1 },
+      fields: {
+        username: 1,
+        'profile.fullname': 1,
+        isAdmin: 1,
+        emails: 1,
+        createdAt: 1,
+        loginDisabled: 1,
+        authenticationMethod: 1,
       },
-    );
-  } else {
-    return [];
+    });
   }
+
+  return [];
 });

server/publications/settings.js

@@ -1,3 +1,9 @@
+Meteor.publish('globalwebhooks', () => {
+  const boardId = Integrations.Const.GLOBAL_WEBHOOK_ID;
+  return Integrations.find({
+    boardId,
+  });
+});
 Meteor.publish('setting', () => {
   return Settings.find(
     {},

snapcraft.yaml

@@ -1,6 +1,6 @@
 name: wekan
 version: 0
-version-script: git describe --dirty --tags |  cut -c 2-
+version-script: git describe --tags |  cut -c 2-
 summary: The open-source kanban
 description: |
    Wekan is an open-source and collaborative kanban board application.
@@ -85,7 +85,7 @@ parts:
         node-packages:
             - node-gyp
             - node-pre-gyp
-            - fibers
+            - fibers@2.0.0
         build-packages:
             - ca-certificates
             - apt-utils
@@ -190,7 +190,7 @@ parts:
             #  git clone --depth 1 -b master --recurse-submodules https://github.com/wekan/markdown.git
             #  cd ..
             #fi
-            rm -rf package-lock.json .build
+            rm -rf .build
             meteor add standard-minifier-js --allow-superuser
             meteor npm install --allow-superuser
             meteor npm install --allow-superuser --save babel-runtime