From 8e29a52d710bb70b80af0b7c271f784d1836269e Mon Sep 17 00:00:00 2001 From: n8ores Date: Fri, 26 Feb 2021 20:44:03 +1300 Subject: [PATCH 1/4] Correct typo --- models/activities.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/activities.js b/models/activities.js index c059daa54..5fb01bd68 100644 --- a/models/activities.js +++ b/models/activities.js @@ -250,7 +250,7 @@ if (Meteor.isServer) { if (customField.name) { params.customField = customField.name; } - if (actitivy.value) { + if (activity.value) { params.customFieldValue = activity.value; } } From 3453690fc2555450481c9463ea143ca9b10bfbf6 Mon Sep 17 00:00:00 2001 From: n8ores Date: Mon, 1 Mar 2021 10:56:51 +1300 Subject: [PATCH 2/4] Add startup script etc --- .vscode/launch.json | 23 ++++++----------------- Start WeKan.bat | 4 ++++ settings.json | 2 +- 3 files changed, 11 insertions(+), 18 deletions(-) create mode 100644 Start WeKan.bat diff --git a/.vscode/launch.json b/.vscode/launch.json index 243eeb203..0a3efcf13 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -1,23 +1,12 @@ { "version": "0.2.0", "configurations": [ - { - "type": "chrome", - "request": "launch", - "name": "Meteor: Chrome", - "url": "http://localhost:3000", - "webRoot": "${workspaceFolder}" - }, - { - "type": "node", - "request": "launch", - "name": "Meteor: Node", - "runtimeExecutable": "/home/wekan/.meteor/meteor", - "runtimeArgs": ["run", "--inspect-brk=9229"], - "outputCapture": "std", - "port": 9229, - "timeout": 60000 - } + { + "name" : "Attach to meteor", + "type" : "node", + "request" : "attach", + "port" : 9229 + } ], "compounds": [ { diff --git a/Start WeKan.bat b/Start WeKan.bat new file mode 100644 index 000000000..38c75fca0 --- /dev/null +++ b/Start WeKan.bat @@ -0,0 +1,4 @@ +SET ROOT_URL=http://localhost +SET WITH_API=true +SET PORT=80 +meteor --port 80 debug \ No newline at end of file diff --git a/settings.json b/settings.json index 9e26dfeeb..0967ef424 100644 --- a/settings.json +++ b/settings.json @@ -1 +1 @@ -{} \ No newline at end of file +{} From 73f36bcf33caedc1aec1ac49b7cb36e20572e8f8 Mon Sep 17 00:00:00 2001 From: n8ores Date: Mon, 1 Mar 2021 18:12:09 +1300 Subject: [PATCH 3/4] Add AttachmentId to webhook data --- server/notifications/outgoing.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/notifications/outgoing.js b/server/notifications/outgoing.js index 1f543ad52..5855e005e 100644 --- a/server/notifications/outgoing.js +++ b/server/notifications/outgoing.js @@ -63,6 +63,7 @@ if (Meteor.isServer) { 'swimlaneId', 'customField', 'customFieldValue', + 'attachmentId' ]; const responseFunc = data => { const paramCommentId = data.commentId; @@ -124,6 +125,7 @@ if (Meteor.isServer) { 'oldSwimlane', 'label', 'attachment', + 'attachmentId' ].forEach(key => { if (quoteParams[key]) quoteParams[key] = `"${params[key]}"`; }); From d296918fcd8254cc34109d88210748307c5406c0 Mon Sep 17 00:00:00 2001 From: n8ores Date: Mon, 1 Mar 2021 18:19:09 +1300 Subject: [PATCH 4/4] Revert "Add startup script etc" This reverts commit 3453690fc2555450481c9463ea143ca9b10bfbf6. --- .vscode/launch.json | 23 +++++++++++++++++------ Start WeKan.bat | 4 ---- settings.json | 2 +- 3 files changed, 18 insertions(+), 11 deletions(-) delete mode 100644 Start WeKan.bat diff --git a/.vscode/launch.json b/.vscode/launch.json index 0a3efcf13..243eeb203 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -1,12 +1,23 @@ { "version": "0.2.0", "configurations": [ - { - "name" : "Attach to meteor", - "type" : "node", - "request" : "attach", - "port" : 9229 - } + { + "type": "chrome", + "request": "launch", + "name": "Meteor: Chrome", + "url": "http://localhost:3000", + "webRoot": "${workspaceFolder}" + }, + { + "type": "node", + "request": "launch", + "name": "Meteor: Node", + "runtimeExecutable": "/home/wekan/.meteor/meteor", + "runtimeArgs": ["run", "--inspect-brk=9229"], + "outputCapture": "std", + "port": 9229, + "timeout": 60000 + } ], "compounds": [ { diff --git a/Start WeKan.bat b/Start WeKan.bat deleted file mode 100644 index 38c75fca0..000000000 --- a/Start WeKan.bat +++ /dev/null @@ -1,4 +0,0 @@ -SET ROOT_URL=http://localhost -SET WITH_API=true -SET PORT=80 -meteor --port 80 debug \ No newline at end of file diff --git a/settings.json b/settings.json index 0967ef424..9e26dfeeb 100644 --- a/settings.json +++ b/settings.json @@ -1 +1 @@ -{} +{} \ No newline at end of file