From 43d14f8b2b25c2b4b536f747a151b92a7bb014f0 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Tue, 13 Aug 2019 16:32:52 +0300 Subject: Update translations. --- i18n/he.i18n.json | 8 ++++---- i18n/pl.i18n.json | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/i18n/he.i18n.json b/i18n/he.i18n.json index aca91853..6dbc92a2 100644 --- a/i18n/he.i18n.json +++ b/i18n/he.i18n.json @@ -512,10 +512,10 @@ "new-outgoing-webhook": "קרסי רשת יוצאים חדשים", "no-name": "(לא ידוע)", "Node_version": "גרסת Node", - "Meteor_version": "Meteor version", - "MongoDB_version": "MongoDB version", - "MongoDB_storage_engine": "MongoDB storage engine", - "MongoDB_Oplog_enabled": "MongoDB Oplog enabled", + "Meteor_version": "גרסת Meteor", + "MongoDB_version": "גרסת MongoDB", + "MongoDB_storage_engine": "מנוע אחסון MongoDB", + "MongoDB_Oplog_enabled": "יומן הפעילות (Oplog) של MongoDB פעיל", "OS_Arch": "ארכיטקטורת מערכת הפעלה", "OS_Cpus": "מספר מעבדים", "OS_Freemem": "זיכרון (RAM) פנוי", diff --git a/i18n/pl.i18n.json b/i18n/pl.i18n.json index 957ea469..4be843a7 100644 --- a/i18n/pl.i18n.json +++ b/i18n/pl.i18n.json @@ -512,10 +512,10 @@ "new-outgoing-webhook": "Nowy wychodzący webhook", "no-name": "(nieznany)", "Node_version": "Wersja Node", - "Meteor_version": "Meteor version", - "MongoDB_version": "MongoDB version", - "MongoDB_storage_engine": "MongoDB storage engine", - "MongoDB_Oplog_enabled": "MongoDB Oplog enabled", + "Meteor_version": "Wersja Meteor", + "MongoDB_version": "Wersja MongoDB", + "MongoDB_storage_engine": "Silnik MongoDB", + "MongoDB_Oplog_enabled": "MongoDB - włączony Oplog", "OS_Arch": "Architektura systemu", "OS_Cpus": "Ilość rdzeni systemu", "OS_Freemem": "Wolna pamięć RAM", -- cgit v1.2.3-1-g7c22 From 843478ac40b7718f1096a75295522487f0ca6dbe Mon Sep 17 00:00:00 2001 From: jymcheong Date: Wed, 14 Aug 2019 15:44:47 +0800 Subject: Webhook cardDetails onRendered Send webhook when cardDetails is rendered. --- client/components/cards/cardDetails.js | 29 +++++++++++++++++++++++++++++ server/statistics.js | 10 +++++----- 2 files changed, 34 insertions(+), 5 deletions(-) diff --git a/client/components/cards/cardDetails.js b/client/components/cards/cardDetails.js index 781967ae..f52661b7 100644 --- a/client/components/cards/cardDetails.js +++ b/client/components/cards/cardDetails.js @@ -117,6 +117,35 @@ BlazeComponent.extendComponent({ }, onRendered() { + // Send Webhook but not create Activities records --- + const card = this.currentData(); + const userId = Meteor.userId(); + //console.log(`userId: ${userId}`); + //console.log(`cardId: ${card._id}`); + //console.log(`boardId: ${card.boardId}`); + //console.log(`listId: ${card.listId}`); + //console.log(`swimlaneId: ${card.swimlaneId}`); + const params = { + userId, + cardId: card._id, + boardId: card.boardId, + listId: card.listId, + user: Meteor.user().username, + url: '', + }; + //console.log('looking for integrations...'); + const integrations = Integrations.find({ + boardId: card.boardId, + type: 'outgoing-webhooks', + enabled: true, + activities: { $in: ['CardDetailsRendered', 'all'] }, + }).fetch(); + //console.log(`Investigation length: ${integrations.length}`); + if (integrations.length > 0) { + Meteor.call('outgoingWebhooks', integrations, 'CardSelected', params); + } + //------------- + if (!Utils.isMiniScreen()) { Meteor.setTimeout(() => { $('.card-details').mCustomScrollbar({ diff --git a/server/statistics.js b/server/statistics.js index 288a5089..997fd86f 100644 --- a/server/statistics.js +++ b/server/statistics.js @@ -22,7 +22,7 @@ Meteor.methods({ let nodeVersion = process.version; nodeVersion = nodeVersion.replace('v', ''); statistics.process = { - nodeVersion: nodeVersion, + nodeVersion, pid: process.pid, uptime: process.uptime(), }; @@ -30,7 +30,7 @@ Meteor.methods({ let meteorVersion = Meteor.release; meteorVersion = meteorVersion.replace('METEOR@', ''); statistics.meteor = { - meteorVersion: meteorVersion, + meteorVersion, }; // Thanks to RocketChat for MongoDB version detection ! // https://github.com/RocketChat/Rocket.Chat/blob/develop/app/utils/server/functions/getMongoInfo.js @@ -59,9 +59,9 @@ Meteor.methods({ } } statistics.mongo = { - mongoVersion: mongoVersion, - mongoStorageEngine: mongoStorageEngine, - mongoOplogEnabled: mongoOplogEnabled, + mongoVersion, + mongoStorageEngine, + mongoOplogEnabled, }; return statistics; }, -- cgit v1.2.3-1-g7c22 From 16adcb7e5afc24d5e641e9016f33edecb043816d Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Wed, 14 Aug 2019 20:13:35 +0300 Subject: In Sandstorm release script, after release, delete temp files. --- releases/release-sandstorm.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/releases/release-sandstorm.sh b/releases/release-sandstorm.sh index 8b5efb8a..30b4ccc2 100755 --- a/releases/release-sandstorm.sh +++ b/releases/release-sandstorm.sh @@ -14,7 +14,7 @@ meteor-spk pack wekan-$1.spk spk publish wekan-$1.spk scp wekan-$1.spk x2:/var/snap/wekan/common/releases.wekan.team/ mv wekan-$1.spk .. - +sudo rm -rf .meteor-spk # Delete old stuff #cd ~/repos/wekan #./releases/release-cleanup.sh -- cgit v1.2.3-1-g7c22 From c9118c21d10957ddfe70c2a3b099cf99c84a0e1f Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Wed, 14 Aug 2019 20:26:47 +0300 Subject: Update ChangeLog. --- CHANGELOG.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d56396bc..0d766a84 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,18 @@ +# Upcoming Wekan release + +This release adds the following new features: + +- [Send webhook when cardDetails is rendered](https://github.com/wekan/wekan/pull/2620). + Thanks to jymcheong. + +and fixes the following bugs: + +- [Time line is missing delete/edit comments, add English i18n for these two activities, + For html email msg needs](https://github.com/wekan/wekan/pull/2615). + Thanks to whowillcare. + +Thanks to above GitHub users for their contributions and translators for their translations. + # v3.17 2019-08-13 Wekan release This release fixes the following bugs: -- cgit v1.2.3-1-g7c22 From a8ab7b15d80c252f7d4838828a8505a290f23809 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Wed, 14 Aug 2019 20:38:18 +0300 Subject: Update translations. --- i18n/ar.i18n.json | 2 ++ i18n/bg.i18n.json | 2 ++ i18n/br.i18n.json | 2 ++ i18n/ca.i18n.json | 2 ++ i18n/cs.i18n.json | 2 ++ i18n/da.i18n.json | 2 ++ i18n/de.i18n.json | 2 ++ i18n/el.i18n.json | 2 ++ i18n/en-GB.i18n.json | 2 ++ i18n/eo.i18n.json | 2 ++ i18n/es-AR.i18n.json | 2 ++ i18n/es.i18n.json | 2 ++ i18n/eu.i18n.json | 2 ++ i18n/fa.i18n.json | 2 ++ i18n/fi.i18n.json | 2 ++ i18n/fr.i18n.json | 2 ++ i18n/gl.i18n.json | 2 ++ i18n/he.i18n.json | 2 ++ i18n/hi.i18n.json | 2 ++ i18n/hu.i18n.json | 2 ++ i18n/hy.i18n.json | 2 ++ i18n/id.i18n.json | 2 ++ i18n/ig.i18n.json | 2 ++ i18n/it.i18n.json | 2 ++ i18n/ja.i18n.json | 2 ++ i18n/ka.i18n.json | 2 ++ i18n/km.i18n.json | 2 ++ i18n/ko.i18n.json | 2 ++ i18n/lv.i18n.json | 2 ++ i18n/mk.i18n.json | 2 ++ i18n/mn.i18n.json | 2 ++ i18n/nb.i18n.json | 2 ++ i18n/nl.i18n.json | 2 ++ i18n/oc.i18n.json | 2 ++ i18n/pl.i18n.json | 2 ++ i18n/pt-BR.i18n.json | 10 ++++++---- i18n/pt.i18n.json | 2 ++ i18n/ro.i18n.json | 2 ++ i18n/ru.i18n.json | 2 ++ i18n/sr.i18n.json | 2 ++ i18n/sv.i18n.json | 16 +++++++++------- i18n/sw.i18n.json | 2 ++ i18n/ta.i18n.json | 2 ++ i18n/th.i18n.json | 2 ++ i18n/tr.i18n.json | 2 ++ i18n/uk.i18n.json | 2 ++ i18n/vi.i18n.json | 2 ++ i18n/zh-CN.i18n.json | 2 ++ i18n/zh-HK.i18n.json | 2 ++ i18n/zh-TW.i18n.json | 2 ++ 50 files changed, 111 insertions(+), 11 deletions(-) diff --git a/i18n/ar.i18n.json b/i18n/ar.i18n.json index bc4c046f..2acb839c 100644 --- a/i18n/ar.i18n.json +++ b/i18n/ar.i18n.json @@ -73,6 +73,8 @@ "activity-unchecked-item-card": "unchecked %s in checklist %s", "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__", "activity-checklist-uncompleted-card": "uncompleted the checklist %s", + "activity-editComment": "edited comment %s", + "activity-deleteComment": "deleted comment %s", "add-attachment": "إضافة مرفق", "add-board": "إضافة لوحة", "add-card": "إضافة بطاقة", diff --git a/i18n/bg.i18n.json b/i18n/bg.i18n.json index 22970e4d..2caa38b9 100644 --- a/i18n/bg.i18n.json +++ b/i18n/bg.i18n.json @@ -73,6 +73,8 @@ "activity-unchecked-item-card": "размаркира %s в чеклист %s", "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__", "activity-checklist-uncompleted-card": "\"отзавърши\" чеклистта %s", + "activity-editComment": "edited comment %s", + "activity-deleteComment": "deleted comment %s", "add-attachment": "Добави прикачен файл", "add-board": "Добави Табло", "add-card": "Добави карта", diff --git a/i18n/br.i18n.json b/i18n/br.i18n.json index 2db45c3f..ef236bb9 100644 --- a/i18n/br.i18n.json +++ b/i18n/br.i18n.json @@ -73,6 +73,8 @@ "activity-unchecked-item-card": "unchecked %s in checklist %s", "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__", "activity-checklist-uncompleted-card": "uncompleted the checklist %s", + "activity-editComment": "edited comment %s", + "activity-deleteComment": "deleted comment %s", "add-attachment": "Add Attachment", "add-board": "Add Board", "add-card": "Add Card", diff --git a/i18n/ca.i18n.json b/i18n/ca.i18n.json index 379c54d0..d03421ba 100644 --- a/i18n/ca.i18n.json +++ b/i18n/ca.i18n.json @@ -73,6 +73,8 @@ "activity-unchecked-item-card": "unchecked %s in checklist %s", "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__", "activity-checklist-uncompleted-card": "uncompleted the checklist %s", + "activity-editComment": "edited comment %s", + "activity-deleteComment": "deleted comment %s", "add-attachment": "Afegeix adjunt", "add-board": "Afegeix Tauler", "add-card": "Afegeix Fitxa", diff --git a/i18n/cs.i18n.json b/i18n/cs.i18n.json index 1e96bb7b..14bb88cd 100644 --- a/i18n/cs.i18n.json +++ b/i18n/cs.i18n.json @@ -73,6 +73,8 @@ "activity-unchecked-item-card": "nedokončen %s v seznamu %s", "activity-checklist-completed-card": "dokončil(a) zaškrtávací seznam __checklist__ na kartě __card__ ve sloupci __list__ ve swimlane __swimlane__ na tablu __board__", "activity-checklist-uncompleted-card": "nedokončený seznam %s", + "activity-editComment": "edited comment %s", + "activity-deleteComment": "deleted comment %s", "add-attachment": "Přidat přílohu", "add-board": "Přidat tablo", "add-card": "Přidat kartu", diff --git a/i18n/da.i18n.json b/i18n/da.i18n.json index 24387a11..9eead31f 100644 --- a/i18n/da.i18n.json +++ b/i18n/da.i18n.json @@ -73,6 +73,8 @@ "activity-unchecked-item-card": "unchecked %s in checklist %s", "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__", "activity-checklist-uncompleted-card": "uncompleted the checklist %s", + "activity-editComment": "edited comment %s", + "activity-deleteComment": "deleted comment %s", "add-attachment": "Add Attachment", "add-board": "Add Board", "add-card": "Add Card", diff --git a/i18n/de.i18n.json b/i18n/de.i18n.json index a8b90485..81877a22 100644 --- a/i18n/de.i18n.json +++ b/i18n/de.i18n.json @@ -73,6 +73,8 @@ "activity-unchecked-item-card": "hat %s in Checkliste %s abgewählt", "activity-checklist-completed-card": "hat Checkliste __checklist__ der Karte __card__ auf der Liste __list__ in Swimlane __swimlane__ in Board __board__ vervollständigt", "activity-checklist-uncompleted-card": "unvervollständigte die Checkliste %s", + "activity-editComment": "edited comment %s", + "activity-deleteComment": "deleted comment %s", "add-attachment": "Datei anhängen", "add-board": "neues Board", "add-card": "Karte hinzufügen", diff --git a/i18n/el.i18n.json b/i18n/el.i18n.json index c549efc0..e459a95a 100644 --- a/i18n/el.i18n.json +++ b/i18n/el.i18n.json @@ -73,6 +73,8 @@ "activity-unchecked-item-card": "unchecked %s in checklist %s", "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__", "activity-checklist-uncompleted-card": "uncompleted the checklist %s", + "activity-editComment": "edited comment %s", + "activity-deleteComment": "deleted comment %s", "add-attachment": "Add Attachment", "add-board": "Add Board", "add-card": "Προσθήκη Κάρτας", diff --git a/i18n/en-GB.i18n.json b/i18n/en-GB.i18n.json index 2edf460e..933f4ad4 100644 --- a/i18n/en-GB.i18n.json +++ b/i18n/en-GB.i18n.json @@ -73,6 +73,8 @@ "activity-unchecked-item-card": "unchecked %s in checklist %s", "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__", "activity-checklist-uncompleted-card": "uncompleted the checklist %s", + "activity-editComment": "edited comment %s", + "activity-deleteComment": "deleted comment %s", "add-attachment": "Add Attachment", "add-board": "Add Board", "add-card": "Add Card", diff --git a/i18n/eo.i18n.json b/i18n/eo.i18n.json index 9a5194a4..f8a43148 100644 --- a/i18n/eo.i18n.json +++ b/i18n/eo.i18n.json @@ -73,6 +73,8 @@ "activity-unchecked-item-card": "unchecked %s in checklist %s", "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__", "activity-checklist-uncompleted-card": "uncompleted the checklist %s", + "activity-editComment": "edited comment %s", + "activity-deleteComment": "deleted comment %s", "add-attachment": "Add Attachment", "add-board": "Add Board", "add-card": "Add Card", diff --git a/i18n/es-AR.i18n.json b/i18n/es-AR.i18n.json index 38c1c431..ced17a19 100644 --- a/i18n/es-AR.i18n.json +++ b/i18n/es-AR.i18n.json @@ -73,6 +73,8 @@ "activity-unchecked-item-card": "unchecked %s in checklist %s", "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__", "activity-checklist-uncompleted-card": "uncompleted the checklist %s", + "activity-editComment": "edited comment %s", + "activity-deleteComment": "deleted comment %s", "add-attachment": "Agregar Adjunto", "add-board": "Agregar Tablero", "add-card": "Agregar Tarjeta", diff --git a/i18n/es.i18n.json b/i18n/es.i18n.json index fb3934fc..4e9a5ea3 100644 --- a/i18n/es.i18n.json +++ b/i18n/es.i18n.json @@ -73,6 +73,8 @@ "activity-unchecked-item-card": "desmarcado %s en la lista de verificación %s", "activity-checklist-completed-card": "completada la lista de verificación __checklist__ de la tarjeta __card__ de la lista __list__ del carril __swimlane__ del tablero __board__", "activity-checklist-uncompleted-card": "no completó la lista de verificación %s", + "activity-editComment": "edited comment %s", + "activity-deleteComment": "deleted comment %s", "add-attachment": "Añadir adjunto", "add-board": "Añadir tablero", "add-card": "Añadir una tarjeta", diff --git a/i18n/eu.i18n.json b/i18n/eu.i18n.json index 4a7b589d..e5e38542 100644 --- a/i18n/eu.i18n.json +++ b/i18n/eu.i18n.json @@ -73,6 +73,8 @@ "activity-unchecked-item-card": "unchecked %s in checklist %s", "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__", "activity-checklist-uncompleted-card": "uncompleted the checklist %s", + "activity-editComment": "edited comment %s", + "activity-deleteComment": "deleted comment %s", "add-attachment": "Gehitu eranskina", "add-board": "Gehitu arbela", "add-card": "Gehitu txartela", diff --git a/i18n/fa.i18n.json b/i18n/fa.i18n.json index d83e0e5e..0cf993bd 100644 --- a/i18n/fa.i18n.json +++ b/i18n/fa.i18n.json @@ -73,6 +73,8 @@ "activity-unchecked-item-card": "چک نشده %s در چک لیست %s", "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__", "activity-checklist-uncompleted-card": "چک لیست تمام نشده %s", + "activity-editComment": "edited comment %s", + "activity-deleteComment": "deleted comment %s", "add-attachment": "افزودن ضمیمه", "add-board": "افزودن برد", "add-card": "افزودن کارت", diff --git a/i18n/fi.i18n.json b/i18n/fi.i18n.json index dc12d968..3c461e1b 100644 --- a/i18n/fi.i18n.json +++ b/i18n/fi.i18n.json @@ -73,6 +73,8 @@ "activity-unchecked-item-card": "poistettu ruksi %s tarkistuslistassa %s", "activity-checklist-completed-card": "valmistui tarkistuslista __checklist__ kortilla __card__ listalla __list__ swimlanella __swimlane__ taululla __board__", "activity-checklist-uncompleted-card": "ei valmistunut tarkistuslista %s", + "activity-editComment": "muokkasi kommenttia %s", + "activity-deleteComment": "poisti kommentin %s", "add-attachment": "Lisää liite", "add-board": "Lisää taulu", "add-card": "Lisää kortti", diff --git a/i18n/fr.i18n.json b/i18n/fr.i18n.json index 10ca6a8c..d38e298f 100644 --- a/i18n/fr.i18n.json +++ b/i18n/fr.i18n.json @@ -73,6 +73,8 @@ "activity-unchecked-item-card": "a décoché %s dans la checklist %s", "activity-checklist-completed-card": "a complété la checklist __checklist__ de la carte __card__ de la liste __list__ du couloir __swimlane__ du tableau __board__", "activity-checklist-uncompleted-card": "a rendu incomplète la checklist %s", + "activity-editComment": "edited comment %s", + "activity-deleteComment": "deleted comment %s", "add-attachment": "Ajouter une pièce jointe", "add-board": "Ajouter un tableau", "add-card": "Ajouter une carte", diff --git a/i18n/gl.i18n.json b/i18n/gl.i18n.json index 69087900..0da00a33 100644 --- a/i18n/gl.i18n.json +++ b/i18n/gl.i18n.json @@ -73,6 +73,8 @@ "activity-unchecked-item-card": "unchecked %s in checklist %s", "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__", "activity-checklist-uncompleted-card": "uncompleted the checklist %s", + "activity-editComment": "edited comment %s", + "activity-deleteComment": "deleted comment %s", "add-attachment": "Engadir anexo", "add-board": "Engadir taboleiro", "add-card": "Engadir tarxeta", diff --git a/i18n/he.i18n.json b/i18n/he.i18n.json index 6dbc92a2..3af65f51 100644 --- a/i18n/he.i18n.json +++ b/i18n/he.i18n.json @@ -73,6 +73,8 @@ "activity-unchecked-item-card": "הסימון של %s בוטל ברשימת המשימות %s", "activity-checklist-completed-card": "רשימת המטלות __checklist__ בכרטיס __card__ שברשימה __list__ תחת המסלול __swimlane__ בלוח __board__ הושלמה", "activity-checklist-uncompleted-card": "רשימת המשימות %s סומנה כבלתי מושלמת", + "activity-editComment": "edited comment %s", + "activity-deleteComment": "deleted comment %s", "add-attachment": "הוספת קובץ מצורף", "add-board": "הוספת לוח", "add-card": "הוספת כרטיס", diff --git a/i18n/hi.i18n.json b/i18n/hi.i18n.json index 0fb2f89d..8bf8a57d 100644 --- a/i18n/hi.i18n.json +++ b/i18n/hi.i18n.json @@ -73,6 +73,8 @@ "activity-unchecked-item-card": "अचिह्नित %s अंदर में चिह्नांकन-सूची %s", "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__", "activity-checklist-uncompleted-card": "अपूर्ण चिह्नांकन-सूची %s", + "activity-editComment": "edited comment %s", + "activity-deleteComment": "deleted comment %s", "add-attachment": "संलग्न करें", "add-board": "बोर्ड जोड़ें", "add-card": "कार्ड जोड़ें", diff --git a/i18n/hu.i18n.json b/i18n/hu.i18n.json index 63b9ab0b..78882bf7 100644 --- a/i18n/hu.i18n.json +++ b/i18n/hu.i18n.json @@ -73,6 +73,8 @@ "activity-unchecked-item-card": "unchecked %s in checklist %s", "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__", "activity-checklist-uncompleted-card": "uncompleted the checklist %s", + "activity-editComment": "edited comment %s", + "activity-deleteComment": "deleted comment %s", "add-attachment": "Melléklet hozzáadása", "add-board": "Tábla hozzáadása", "add-card": "Kártya hozzáadása", diff --git a/i18n/hy.i18n.json b/i18n/hy.i18n.json index 8eeeaca6..eb67c051 100644 --- a/i18n/hy.i18n.json +++ b/i18n/hy.i18n.json @@ -73,6 +73,8 @@ "activity-unchecked-item-card": "unchecked %s in checklist %s", "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__", "activity-checklist-uncompleted-card": "uncompleted the checklist %s", + "activity-editComment": "edited comment %s", + "activity-deleteComment": "deleted comment %s", "add-attachment": "Add Attachment", "add-board": "Add Board", "add-card": "Add Card", diff --git a/i18n/id.i18n.json b/i18n/id.i18n.json index 32d4f889..ee7b140c 100644 --- a/i18n/id.i18n.json +++ b/i18n/id.i18n.json @@ -73,6 +73,8 @@ "activity-unchecked-item-card": "unchecked %s in checklist %s", "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__", "activity-checklist-uncompleted-card": "uncompleted the checklist %s", + "activity-editComment": "edited comment %s", + "activity-deleteComment": "deleted comment %s", "add-attachment": "Add Attachment", "add-board": "Add Board", "add-card": "Add Card", diff --git a/i18n/ig.i18n.json b/i18n/ig.i18n.json index fdc51522..5ddd5249 100644 --- a/i18n/ig.i18n.json +++ b/i18n/ig.i18n.json @@ -73,6 +73,8 @@ "activity-unchecked-item-card": "unchecked %s in checklist %s", "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__", "activity-checklist-uncompleted-card": "uncompleted the checklist %s", + "activity-editComment": "edited comment %s", + "activity-deleteComment": "deleted comment %s", "add-attachment": "Add Attachment", "add-board": "Add Board", "add-card": "Add Card", diff --git a/i18n/it.i18n.json b/i18n/it.i18n.json index db493890..b15c8ace 100644 --- a/i18n/it.i18n.json +++ b/i18n/it.i18n.json @@ -73,6 +73,8 @@ "activity-unchecked-item-card": "%s è stato deselezionato nella checklist %s", "activity-checklist-completed-card": "checklist __label__ completata nella scheda __card__ della lista __list__ della corsia __swimlane__  nella bacheca __board__", "activity-checklist-uncompleted-card": "La checklist %s non è completa", + "activity-editComment": "edited comment %s", + "activity-deleteComment": "deleted comment %s", "add-attachment": "Aggiungi Allegato", "add-board": "Aggiungi Bacheca", "add-card": "Aggiungi Scheda", diff --git a/i18n/ja.i18n.json b/i18n/ja.i18n.json index 4b210268..18a8b1a9 100644 --- a/i18n/ja.i18n.json +++ b/i18n/ja.i18n.json @@ -73,6 +73,8 @@ "activity-unchecked-item-card": "unchecked %s in checklist %s", "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__", "activity-checklist-uncompleted-card": "uncompleted the checklist %s", + "activity-editComment": "edited comment %s", + "activity-deleteComment": "deleted comment %s", "add-attachment": "添付ファイルを追加", "add-board": "ボードを追加", "add-card": "カードを追加", diff --git a/i18n/ka.i18n.json b/i18n/ka.i18n.json index eb22ba97..2f80c02b 100644 --- a/i18n/ka.i18n.json +++ b/i18n/ka.i18n.json @@ -73,6 +73,8 @@ "activity-unchecked-item-card": "unchecked %s in checklist %s", "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__", "activity-checklist-uncompleted-card": "uncompleted the checklist %s", + "activity-editComment": "edited comment %s", + "activity-deleteComment": "deleted comment %s", "add-attachment": "მიბმული ფაილის დამატება", "add-board": "დაფის დამატება", "add-card": "ბარათის დამატება", diff --git a/i18n/km.i18n.json b/i18n/km.i18n.json index 13824180..e7ae70ee 100644 --- a/i18n/km.i18n.json +++ b/i18n/km.i18n.json @@ -73,6 +73,8 @@ "activity-unchecked-item-card": "unchecked %s in checklist %s", "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__", "activity-checklist-uncompleted-card": "uncompleted the checklist %s", + "activity-editComment": "edited comment %s", + "activity-deleteComment": "deleted comment %s", "add-attachment": "Add Attachment", "add-board": "Add Board", "add-card": "Add Card", diff --git a/i18n/ko.i18n.json b/i18n/ko.i18n.json index ea9f8469..466afac6 100644 --- a/i18n/ko.i18n.json +++ b/i18n/ko.i18n.json @@ -73,6 +73,8 @@ "activity-unchecked-item-card": "unchecked %s in checklist %s", "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__", "activity-checklist-uncompleted-card": "uncompleted the checklist %s", + "activity-editComment": "edited comment %s", + "activity-deleteComment": "deleted comment %s", "add-attachment": "첨부파일 추가", "add-board": "보드 추가", "add-card": "카드 추가", diff --git a/i18n/lv.i18n.json b/i18n/lv.i18n.json index f8660c7b..19e5e0b9 100644 --- a/i18n/lv.i18n.json +++ b/i18n/lv.i18n.json @@ -73,6 +73,8 @@ "activity-unchecked-item-card": "unchecked %s in checklist %s", "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__", "activity-checklist-uncompleted-card": "uncompleted the checklist %s", + "activity-editComment": "edited comment %s", + "activity-deleteComment": "deleted comment %s", "add-attachment": "Add Attachment", "add-board": "Add Board", "add-card": "Add Card", diff --git a/i18n/mk.i18n.json b/i18n/mk.i18n.json index 328f8f62..2309fbe7 100644 --- a/i18n/mk.i18n.json +++ b/i18n/mk.i18n.json @@ -73,6 +73,8 @@ "activity-unchecked-item-card": "размаркира %s в чеклист %s", "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__", "activity-checklist-uncompleted-card": "\"отзавърши\" чеклистта %s", + "activity-editComment": "edited comment %s", + "activity-deleteComment": "deleted comment %s", "add-attachment": "Додај прилог", "add-board": "Додади Табла", "add-card": "Додади Картичка", diff --git a/i18n/mn.i18n.json b/i18n/mn.i18n.json index 5e47fcd4..b532d235 100644 --- a/i18n/mn.i18n.json +++ b/i18n/mn.i18n.json @@ -73,6 +73,8 @@ "activity-unchecked-item-card": "unchecked %s in checklist %s", "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__", "activity-checklist-uncompleted-card": "uncompleted the checklist %s", + "activity-editComment": "edited comment %s", + "activity-deleteComment": "deleted comment %s", "add-attachment": "Хавсралт нэмэх", "add-board": "Самбар нэмэх", "add-card": "Карт нэмэх", diff --git a/i18n/nb.i18n.json b/i18n/nb.i18n.json index 0c7fa211..92be0049 100644 --- a/i18n/nb.i18n.json +++ b/i18n/nb.i18n.json @@ -73,6 +73,8 @@ "activity-unchecked-item-card": "unchecked %s in checklist %s", "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__", "activity-checklist-uncompleted-card": "uncompleted the checklist %s", + "activity-editComment": "edited comment %s", + "activity-deleteComment": "deleted comment %s", "add-attachment": "Add Attachment", "add-board": "Add Board", "add-card": "Add Card", diff --git a/i18n/nl.i18n.json b/i18n/nl.i18n.json index 7d846021..a7a2bb66 100644 --- a/i18n/nl.i18n.json +++ b/i18n/nl.i18n.json @@ -73,6 +73,8 @@ "activity-unchecked-item-card": "unchecked %s in checklist %s", "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__", "activity-checklist-uncompleted-card": "uncompleted the checklist %s", + "activity-editComment": "edited comment %s", + "activity-deleteComment": "deleted comment %s", "add-attachment": "Voeg Bijlage Toe", "add-board": "Voeg Bord Toe", "add-card": "Voeg Kaart Toe", diff --git a/i18n/oc.i18n.json b/i18n/oc.i18n.json index 1aadb396..50393748 100644 --- a/i18n/oc.i18n.json +++ b/i18n/oc.i18n.json @@ -73,6 +73,8 @@ "activity-unchecked-item-card": "as descroiat %s dins la checklist %s", "activity-checklist-completed-card": "as acabat la checklist__checklist__ de la carta __card__ de la tièra __list__ del corredor __swimlane__ del tablèu __board__", "activity-checklist-uncompleted-card": "as rendut incomplet la checklist %s", + "activity-editComment": "edited comment %s", + "activity-deleteComment": "deleted comment %s", "add-attachment": "Apondre una pèça joncha", "add-board": "Apondre un tablèu", "add-card": "Apondre una carta", diff --git a/i18n/pl.i18n.json b/i18n/pl.i18n.json index 4be843a7..2f3f363d 100644 --- a/i18n/pl.i18n.json +++ b/i18n/pl.i18n.json @@ -73,6 +73,8 @@ "activity-unchecked-item-card": "odznaczono %s w liście zadań %s", "activity-checklist-completed-card": "wykonał(a) wszystkie zadania z listy __checklist__ na karcie __card__ na liście __list__ na diagramie czynności __swimlane__ na tablicy __board__", "activity-checklist-uncompleted-card": "wycofano ukończenie listy zadań %s", + "activity-editComment": "edited comment %s", + "activity-deleteComment": "deleted comment %s", "add-attachment": "Dodaj załącznik", "add-board": "Dodaj tablicę", "add-card": "Dodaj kartę", diff --git a/i18n/pt-BR.i18n.json b/i18n/pt-BR.i18n.json index 2a8620cb..1deea4a0 100644 --- a/i18n/pt-BR.i18n.json +++ b/i18n/pt-BR.i18n.json @@ -73,6 +73,8 @@ "activity-unchecked-item-card": "desmarcado %s na lista de verificação %s", "activity-checklist-completed-card": "completada a lista de verificação __checklist__ no cartão __card__ na lista __list__ em raia __swimlane__ no quadro __board__", "activity-checklist-uncompleted-card": "não-completada a lista de verificação %s", + "activity-editComment": "edited comment %s", + "activity-deleteComment": "deleted comment %s", "add-attachment": "Adicionar Anexos", "add-board": "Adicionar Quadro", "add-card": "Adicionar Cartão", @@ -512,10 +514,10 @@ "new-outgoing-webhook": "Novo Webhook de saída", "no-name": "(Desconhecido)", "Node_version": "Versão do Node", - "Meteor_version": "Meteor version", - "MongoDB_version": "MongoDB version", - "MongoDB_storage_engine": "MongoDB storage engine", - "MongoDB_Oplog_enabled": "MongoDB Oplog enabled", + "Meteor_version": "Versão do Meteor", + "MongoDB_version": "Versão do MongoDB", + "MongoDB_storage_engine": "Motor de armazenamento do MongoDB", + "MongoDB_Oplog_enabled": "MongoDB Oplog habilitado", "OS_Arch": "Arquitetura do SO", "OS_Cpus": "Quantidade de CPUS do SO", "OS_Freemem": "Memória Disponível do SO", diff --git a/i18n/pt.i18n.json b/i18n/pt.i18n.json index f4b27310..32eef24b 100644 --- a/i18n/pt.i18n.json +++ b/i18n/pt.i18n.json @@ -73,6 +73,8 @@ "activity-unchecked-item-card": "desmarcou %s na lista de verificação %s", "activity-checklist-completed-card": "completou a lista de verificação __checklist__ no cartão __card__ na lista __list__ na pista __swimlane__ no quadro __board__", "activity-checklist-uncompleted-card": "descompletou a lista de verificação %s", + "activity-editComment": "edited comment %s", + "activity-deleteComment": "deleted comment %s", "add-attachment": "Adicionar Anexo", "add-board": "Adicionar Quadro", "add-card": "Adicionar Cartão", diff --git a/i18n/ro.i18n.json b/i18n/ro.i18n.json index 492c9c78..b411c984 100644 --- a/i18n/ro.i18n.json +++ b/i18n/ro.i18n.json @@ -73,6 +73,8 @@ "activity-unchecked-item-card": "unchecked %s in checklist %s", "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__", "activity-checklist-uncompleted-card": "uncompleted the checklist %s", + "activity-editComment": "edited comment %s", + "activity-deleteComment": "deleted comment %s", "add-attachment": "Add Attachment", "add-board": "Add Board", "add-card": "Add Card", diff --git a/i18n/ru.i18n.json b/i18n/ru.i18n.json index ef33f5fa..102ab43e 100644 --- a/i18n/ru.i18n.json +++ b/i18n/ru.i18n.json @@ -73,6 +73,8 @@ "activity-unchecked-item-card": "снял %s в контрольном списке %s", "activity-checklist-completed-card": "завершил контрольный список __checklist__ в карточку __card__ в списке __list__ на дорожке __swimlane__ доски __board__", "activity-checklist-uncompleted-card": "вновь открыл контрольный список %s", + "activity-editComment": "edited comment %s", + "activity-deleteComment": "deleted comment %s", "add-attachment": "Добавить вложение", "add-board": "Добавить доску", "add-card": "Добавить карточку", diff --git a/i18n/sr.i18n.json b/i18n/sr.i18n.json index 1d8bcb72..1297dd08 100644 --- a/i18n/sr.i18n.json +++ b/i18n/sr.i18n.json @@ -73,6 +73,8 @@ "activity-unchecked-item-card": "unchecked %s in checklist %s", "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__", "activity-checklist-uncompleted-card": "uncompleted the checklist %s", + "activity-editComment": "edited comment %s", + "activity-deleteComment": "deleted comment %s", "add-attachment": "Add Attachment", "add-board": "Add Board", "add-card": "Add Card", diff --git a/i18n/sv.i18n.json b/i18n/sv.i18n.json index e3294edd..9fa064a0 100644 --- a/i18n/sv.i18n.json +++ b/i18n/sv.i18n.json @@ -22,7 +22,7 @@ "act-createBoard": "skapade anslagstavla __board__", "act-createSwimlane": "skapade simbana __swimlane__ till anslagstavla __board__", "act-createCard": "skapade kort __card__ i lista __list__ i simbana __swimlane__ på anslagstavla __board__", - "act-createCustomField": "created custom field __customField__ at board __board__", + "act-createCustomField": "skapade anpassat fält __customField__ på anslagstavlan __board__", "act-deleteCustomField": "deleted custom field __customField__ at board __board__", "act-setCustomField": "edited custom field __customField__: __customFieldValue__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__", "act-createList": "lade till lista __list__ på anslagstavla __board__", @@ -73,6 +73,8 @@ "activity-unchecked-item-card": "okryssad %s i checklistan %s", "activity-checklist-completed-card": "slutförde checklista __checklist__ i kort __card__ i lista __list__ i simbana __swimlane__ på anslagstavla __board__", "activity-checklist-uncompleted-card": "icke slutfört checklistan %s", + "activity-editComment": "edited comment %s", + "activity-deleteComment": "deleted comment %s", "add-attachment": "Lägg till bilaga", "add-board": "Lägg till anslagstavla", "add-card": "Lägg till kort", @@ -512,10 +514,10 @@ "new-outgoing-webhook": "Ny utgående webhook", "no-name": "(Okänd)", "Node_version": "Nodversion", - "Meteor_version": "Meteor version", - "MongoDB_version": "MongoDB version", - "MongoDB_storage_engine": "MongoDB storage engine", - "MongoDB_Oplog_enabled": "MongoDB Oplog enabled", + "Meteor_version": "Meteor-version", + "MongoDB_version": "MongoDB-version", + "MongoDB_storage_engine": "MongoDB-lagringsmotor", + "MongoDB_Oplog_enabled": "MongoDB Oplog aktiverad", "OS_Arch": "OS Arch", "OS_Cpus": "OS CPU-räkning", "OS_Freemem": "OS ledigt minne", @@ -724,7 +726,7 @@ "act-pastdue": "påminde om den aktuella förfallotiden (__timeValue__) av __card__ är förbi", "act-duenow": "påminde om den aktuella förfallotiden (__timeValue__) av __card__ är nu", "act-atUserComment": "Du nämndes i [__board__] __card__", - "delete-user-confirm-popup": "Are you sure you want to delete this account? There is no undo.", - "accounts-allowUserDelete": "Allow users to self delete their account", + "delete-user-confirm-popup": "Är du säker på att du vill ta bort det här kontot? Det går inte att ångra sig.", + "accounts-allowUserDelete": "Tillåt användare att själv ta bort sina konton", "hide-minicard-label-text": "Hide minicard label text" } diff --git a/i18n/sw.i18n.json b/i18n/sw.i18n.json index 20db5d9d..38d13009 100644 --- a/i18n/sw.i18n.json +++ b/i18n/sw.i18n.json @@ -73,6 +73,8 @@ "activity-unchecked-item-card": "unchecked %s in checklist %s", "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__", "activity-checklist-uncompleted-card": "uncompleted the checklist %s", + "activity-editComment": "edited comment %s", + "activity-deleteComment": "deleted comment %s", "add-attachment": "Add Attachment", "add-board": "Add Board", "add-card": "Add Card", diff --git a/i18n/ta.i18n.json b/i18n/ta.i18n.json index 0f329824..cc4223b5 100644 --- a/i18n/ta.i18n.json +++ b/i18n/ta.i18n.json @@ -73,6 +73,8 @@ "activity-unchecked-item-card": "unchecked %s in checklist %s", "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__", "activity-checklist-uncompleted-card": "uncompleted the checklist %s", + "activity-editComment": "edited comment %s", + "activity-deleteComment": "deleted comment %s", "add-attachment": "Add Attachment", "add-board": "Add Board", "add-card": "Add Card", diff --git a/i18n/th.i18n.json b/i18n/th.i18n.json index 758f6b0f..19d1f4cd 100644 --- a/i18n/th.i18n.json +++ b/i18n/th.i18n.json @@ -73,6 +73,8 @@ "activity-unchecked-item-card": "unchecked %s in checklist %s", "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__", "activity-checklist-uncompleted-card": "uncompleted the checklist %s", + "activity-editComment": "edited comment %s", + "activity-deleteComment": "deleted comment %s", "add-attachment": "Add Attachment", "add-board": "Add Board", "add-card": "Add Card", diff --git a/i18n/tr.i18n.json b/i18n/tr.i18n.json index fc3084c1..4cbe1d41 100644 --- a/i18n/tr.i18n.json +++ b/i18n/tr.i18n.json @@ -73,6 +73,8 @@ "activity-unchecked-item-card": "unchecked %s in checklist %s", "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__", "activity-checklist-uncompleted-card": "uncompleted the checklist %s", + "activity-editComment": "edited comment %s", + "activity-deleteComment": "deleted comment %s", "add-attachment": "Ek Ekle", "add-board": "Pano Ekle", "add-card": "Kart Ekle", diff --git a/i18n/uk.i18n.json b/i18n/uk.i18n.json index 0b22e639..6b790732 100644 --- a/i18n/uk.i18n.json +++ b/i18n/uk.i18n.json @@ -73,6 +73,8 @@ "activity-unchecked-item-card": "unchecked %s in checklist %s", "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__", "activity-checklist-uncompleted-card": "uncompleted the checklist %s", + "activity-editComment": "edited comment %s", + "activity-deleteComment": "deleted comment %s", "add-attachment": "Add Attachment", "add-board": "Додати дошку", "add-card": "Додати картку", diff --git a/i18n/vi.i18n.json b/i18n/vi.i18n.json index ca075a81..bbd0dfbc 100644 --- a/i18n/vi.i18n.json +++ b/i18n/vi.i18n.json @@ -73,6 +73,8 @@ "activity-unchecked-item-card": "unchecked %s in checklist %s", "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__", "activity-checklist-uncompleted-card": "uncompleted the checklist %s", + "activity-editComment": "edited comment %s", + "activity-deleteComment": "deleted comment %s", "add-attachment": "Thêm Bản Đính Kèm", "add-board": "Thêm Bảng", "add-card": "Thêm Thẻ", diff --git a/i18n/zh-CN.i18n.json b/i18n/zh-CN.i18n.json index 4fef1880..02b7e3bc 100644 --- a/i18n/zh-CN.i18n.json +++ b/i18n/zh-CN.i18n.json @@ -73,6 +73,8 @@ "activity-unchecked-item-card": "取消勾选 %s 于清单 %s中", "activity-checklist-completed-card": "完成检查列表 __checklist__ 卡片 __card__ 列表 __list__ 泳道 __swimlane__ 看板 __board__", "activity-checklist-uncompleted-card": "未完成清单 %s", + "activity-editComment": "edited comment %s", + "activity-deleteComment": "deleted comment %s", "add-attachment": "添加附件", "add-board": "添加看板", "add-card": "添加卡片", diff --git a/i18n/zh-HK.i18n.json b/i18n/zh-HK.i18n.json index e2179ae5..f962a765 100644 --- a/i18n/zh-HK.i18n.json +++ b/i18n/zh-HK.i18n.json @@ -73,6 +73,8 @@ "activity-unchecked-item-card": "unchecked %s in checklist %s", "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__", "activity-checklist-uncompleted-card": "uncompleted the checklist %s", + "activity-editComment": "edited comment %s", + "activity-deleteComment": "deleted comment %s", "add-attachment": "Add Attachment", "add-board": "Add Board", "add-card": "Add Card", diff --git a/i18n/zh-TW.i18n.json b/i18n/zh-TW.i18n.json index dcf8e52d..5b1fefd1 100644 --- a/i18n/zh-TW.i18n.json +++ b/i18n/zh-TW.i18n.json @@ -73,6 +73,8 @@ "activity-unchecked-item-card": "unchecked %s in checklist %s", "activity-checklist-completed-card": "completed checklist __checklist__ at card __card__ at list __list__ at swimlane __swimlane__ at board __board__", "activity-checklist-uncompleted-card": "uncompleted the checklist %s", + "activity-editComment": "edited comment %s", + "activity-deleteComment": "deleted comment %s", "add-attachment": "新增附件", "add-board": "新增看板", "add-card": "新增卡片", -- cgit v1.2.3-1-g7c22 From b8c527d52bec7272c890385f11e26acec65822ae Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 15 Aug 2019 00:29:00 +0300 Subject: Add setting CARD_OPENED_WEBHOOK_ENABLED=false as default. Thanks to xet7 ! Related https://github.com/wekan/wekan/commit/843478ac40b7718f1096a75295522487f0ca6dbe , related #2518 --- Dockerfile | 1 + client/components/cards/cardDetails.js | 56 ++++++++++++++++++---------------- docker-compose.yml | 4 +++ releases/virtualbox/start-wekan.sh | 3 ++ server/card-opened-webhook.js | 5 +++ snap-src/bin/config | 6 +++- snap-src/bin/wekan-help | 6 ++++ start-wekan.bat | 3 ++ start-wekan.sh | 3 ++ 9 files changed, 59 insertions(+), 28 deletions(-) create mode 100644 server/card-opened-webhook.js diff --git a/Dockerfile b/Dockerfile index d2a8040d..2b74eb2d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,6 +22,7 @@ ENV BUILD_DEPS="apt-utils bsdtar gnupg gosu wget curl bzip2 g++ build-essential ACCOUNTS_LOCKOUT_UNKNOWN_USERS_LOCKOUT_PERIOD=60 \ ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURE_WINDOW=15 \ RICHER_CARD_COMMENT_EDITOR=true \ + CARD_OPENED_WEBHOOK_ENABLED=false \ ATTACHMENTS_STORE_PATH="" \ MAX_IMAGE_PIXEL="" \ IMAGE_COMPRESS_RATIO="" \ diff --git a/client/components/cards/cardDetails.js b/client/components/cards/cardDetails.js index f52661b7..cd8813f5 100644 --- a/client/components/cards/cardDetails.js +++ b/client/components/cards/cardDetails.js @@ -117,34 +117,36 @@ BlazeComponent.extendComponent({ }, onRendered() { - // Send Webhook but not create Activities records --- - const card = this.currentData(); - const userId = Meteor.userId(); - //console.log(`userId: ${userId}`); - //console.log(`cardId: ${card._id}`); - //console.log(`boardId: ${card.boardId}`); - //console.log(`listId: ${card.listId}`); - //console.log(`swimlaneId: ${card.swimlaneId}`); - const params = { - userId, - cardId: card._id, - boardId: card.boardId, - listId: card.listId, - user: Meteor.user().username, - url: '', - }; - //console.log('looking for integrations...'); - const integrations = Integrations.find({ - boardId: card.boardId, - type: 'outgoing-webhooks', - enabled: true, - activities: { $in: ['CardDetailsRendered', 'all'] }, - }).fetch(); - //console.log(`Investigation length: ${integrations.length}`); - if (integrations.length > 0) { - Meteor.call('outgoingWebhooks', integrations, 'CardSelected', params); + if (Meteor.settings.public.CARD_OPENED_WEBHOOK_ENABLED) { + // Send Webhook but not create Activities records --- + const card = this.currentData(); + const userId = Meteor.userId(); + //console.log(`userId: ${userId}`); + //console.log(`cardId: ${card._id}`); + //console.log(`boardId: ${card.boardId}`); + //console.log(`listId: ${card.listId}`); + //console.log(`swimlaneId: ${card.swimlaneId}`); + const params = { + userId, + cardId: card._id, + boardId: card.boardId, + listId: card.listId, + user: Meteor.user().username, + url: '', + }; + //console.log('looking for integrations...'); + const integrations = Integrations.find({ + boardId: card.boardId, + type: 'outgoing-webhooks', + enabled: true, + activities: { $in: ['CardDetailsRendered', 'all'] }, + }).fetch(); + //console.log(`Investigation length: ${integrations.length}`); + if (integrations.length > 0) { + Meteor.call('outgoingWebhooks', integrations, 'CardSelected', params); + } + //------------- } - //------------- if (!Utils.isMiniScreen()) { Meteor.setTimeout(() => { diff --git a/docker-compose.yml b/docker-compose.yml index e436f806..48c4870e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -240,6 +240,10 @@ services: # https://github.com/wekan/wekan/pull/2560 - RICHER_CARD_COMMENT_EDITOR=true #--------------------------------------------------------------- + # ==== CARD OPENED, SEND WEBHOOK MESSAGE ==== + # https://github.com/wekan/wekan/issues/2518 + - CARD_OPENED_WEBHOOK_ENABLED=false + #--------------------------------------------------------------- # ==== Allow to shrink attached/pasted image ==== # https://github.com/wekan/wekan/pull/2544 #-MAX_IMAGE_PIXEL=1024 diff --git a/releases/virtualbox/start-wekan.sh b/releases/virtualbox/start-wekan.sh index 8ade2f7f..733b6b67 100755 --- a/releases/virtualbox/start-wekan.sh +++ b/releases/virtualbox/start-wekan.sh @@ -40,6 +40,9 @@ # https://github.com/wekan/wekan/pull/2560 export RICHER_CARD_COMMENT_EDITOR=true #--------------------------------------------------------------- + # ==== CARD OPENED, SEND WEBHOOK MESSAGE ==== + export CARD_OPENED_WEBHOOK_ENABLED=false + #--------------------------------------------------------------- # ==== Allow to shrink attached/pasted image ==== # https://github.com/wekan/wekan/pull/2544 #export MAX_IMAGE_PIXEL=1024 diff --git a/server/card-opened-webhook.js b/server/card-opened-webhook.js new file mode 100644 index 00000000..242ae7ca --- /dev/null +++ b/server/card-opened-webhook.js @@ -0,0 +1,5 @@ +Meteor.startup(() => { + if (process.env.CARD_OPENED_WEBHOOK_ENABLED) { + Meteor.settings.public.CARD_OPENED_WEBHOOK_ENABLED = true; + } +}); diff --git a/snap-src/bin/config b/snap-src/bin/config index f71492cf..aba15f63 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="DEBUG MONGO_URL MONGODB_BIND_UNIX_SOCKET MONGO_URL MONGODB_BIND_IP MONGODB_PORT MAIL_URL MAIL_FROM ROOT_URL PORT DISABLE_MONGODB CADDY_ENABLED CADDY_BIND_PORT WITH_API RICHER_CARD_COMMENT_EDITOR ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURES_BEFORE ACCOUNTS_LOCKOUT_KNOWN_USERS_PERIOD ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURE_WINDOW ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURES_BERORE ACCOUNTS_LOCKOUT_UNKNOWN_USERS_LOCKOUT_PERIOD ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURE_WINDOW MAX_IMAGE_PIXEL IMAGE_COMPRESS_RATIO BIGEVENTS_PATTERN NOTIFY_DUE_DAYS_BEFORE_AND_AFTER NOTIFY_DUE_AT_HOUR_OF_DAY EMAIL_NOTIFICATION_TIMEOUT CORS CORS_ALLOW_HEADERS CORS_EXPOSE_HEADERS MATOMO_ADDRESS MATOMO_SITE_ID MATOMO_DO_NOT_TRACK MATOMO_WITH_USERNAME BROWSER_POLICY_ENABLED TRUSTED_URL WEBHOOKS_ATTRIBUTES OAUTH2_ENABLED OAUTH2_LOGIN_STYLE OAUTH2_CLIENT_ID OAUTH2_SECRET OAUTH2_SERVER_URL OAUTH2_AUTH_ENDPOINT OAUTH2_USERINFO_ENDPOINT OAUTH2_TOKEN_ENDPOINT OAUTH2_ID_MAP OAUTH2_USERNAME_MAP OAUTH2_FULLNAME_MAP OAUTH2_ID_TOKEN_WHITELIST_FIELDS OAUTH2_EMAIL_MAP OAUTH2_REQUEST_PERMISSIONS LDAP_ENABLE LDAP_PORT LDAP_HOST LDAP_BASEDN LDAP_LOGIN_FALLBACK LDAP_RECONNECT LDAP_TIMEOUT LDAP_IDLE_TIMEOUT LDAP_CONNECT_TIMEOUT LDAP_AUTHENTIFICATION LDAP_AUTHENTIFICATION_USERDN LDAP_AUTHENTIFICATION_PASSWORD LDAP_LOG_ENABLED LDAP_BACKGROUND_SYNC LDAP_BACKGROUND_SYNC_INTERVAL LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS LDAP_ENCRYPTION LDAP_CA_CERT LDAP_REJECT_UNAUTHORIZED LDAP_USER_AUTHENTICATION LDAP_USER_AUTHENTICATION_FIELD LDAP_USER_SEARCH_FILTER LDAP_USER_SEARCH_SCOPE LDAP_USER_SEARCH_FIELD LDAP_SEARCH_PAGE_SIZE LDAP_SEARCH_SIZE_LIMIT LDAP_GROUP_FILTER_ENABLE LDAP_GROUP_FILTER_OBJECTCLASS LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE LDAP_GROUP_FILTER_GROUP_MEMBER_ATTRIBUTE LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT LDAP_GROUP_FILTER_GROUP_NAME LDAP_UNIQUE_IDENTIFIER_FIELD LDAP_UTF8_NAMES_SLUGIFY LDAP_USERNAME_FIELD LDAP_FULLNAME_FIELD LDAP_MERGE_EXISTING_USERS LDAP_SYNC_USER_DATA LDAP_SYNC_USER_DATA_FIELDMAP LDAP_SYNC_GROUP_ROLES LDAP_DEFAULT_DOMAIN LDAP_EMAIL_MATCH_ENABLE LDAP_EMAIL_MATCH_REQUIRE LDAP_EMAIL_MATCH_VERIFIED LDAP_EMAIL_FIELD LDAP_SYNC_ADMIN_STATUS LDAP_SYNC_ADMIN_GROUPS HEADER_LOGIN_ID HEADER_LOGIN_FIRSTNAME HEADER_LOGIN_LASTNAME HEADER_LOGIN_EMAIL LOGOUT_WITH_TIMER LOGOUT_IN LOGOUT_ON_HOURS LOGOUT_ON_MINUTES DEFAULT_AUTHENTICATION_METHOD ATTACHMENTS_STORE_PATH" +keys="DEBUG MONGO_URL MONGODB_BIND_UNIX_SOCKET MONGO_URL MONGODB_BIND_IP MONGODB_PORT MAIL_URL MAIL_FROM ROOT_URL PORT DISABLE_MONGODB CADDY_ENABLED CADDY_BIND_PORT WITH_API RICHER_CARD_COMMENT_EDITOR CARD_OPENED_WEBHOOK_ENABLED ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURES_BEFORE ACCOUNTS_LOCKOUT_KNOWN_USERS_PERIOD ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURE_WINDOW ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURES_BERORE ACCOUNTS_LOCKOUT_UNKNOWN_USERS_LOCKOUT_PERIOD ACCOUNTS_LOCKOUT_UNKNOWN_USERS_FAILURE_WINDOW MAX_IMAGE_PIXEL IMAGE_COMPRESS_RATIO BIGEVENTS_PATTERN NOTIFY_DUE_DAYS_BEFORE_AND_AFTER NOTIFY_DUE_AT_HOUR_OF_DAY EMAIL_NOTIFICATION_TIMEOUT CORS CORS_ALLOW_HEADERS CORS_EXPOSE_HEADERS MATOMO_ADDRESS MATOMO_SITE_ID MATOMO_DO_NOT_TRACK MATOMO_WITH_USERNAME BROWSER_POLICY_ENABLED TRUSTED_URL WEBHOOKS_ATTRIBUTES OAUTH2_ENABLED OAUTH2_LOGIN_STYLE OAUTH2_CLIENT_ID OAUTH2_SECRET OAUTH2_SERVER_URL OAUTH2_AUTH_ENDPOINT OAUTH2_USERINFO_ENDPOINT OAUTH2_TOKEN_ENDPOINT OAUTH2_ID_MAP OAUTH2_USERNAME_MAP OAUTH2_FULLNAME_MAP OAUTH2_ID_TOKEN_WHITELIST_FIELDS OAUTH2_EMAIL_MAP OAUTH2_REQUEST_PERMISSIONS LDAP_ENABLE LDAP_PORT LDAP_HOST LDAP_BASEDN LDAP_LOGIN_FALLBACK LDAP_RECONNECT LDAP_TIMEOUT LDAP_IDLE_TIMEOUT LDAP_CONNECT_TIMEOUT LDAP_AUTHENTIFICATION LDAP_AUTHENTIFICATION_USERDN LDAP_AUTHENTIFICATION_PASSWORD LDAP_LOG_ENABLED LDAP_BACKGROUND_SYNC LDAP_BACKGROUND_SYNC_INTERVAL LDAP_BACKGROUND_SYNC_KEEP_EXISTANT_USERS_UPDATED LDAP_BACKGROUND_SYNC_IMPORT_NEW_USERS LDAP_ENCRYPTION LDAP_CA_CERT LDAP_REJECT_UNAUTHORIZED LDAP_USER_AUTHENTICATION LDAP_USER_AUTHENTICATION_FIELD LDAP_USER_SEARCH_FILTER LDAP_USER_SEARCH_SCOPE LDAP_USER_SEARCH_FIELD LDAP_SEARCH_PAGE_SIZE LDAP_SEARCH_SIZE_LIMIT LDAP_GROUP_FILTER_ENABLE LDAP_GROUP_FILTER_OBJECTCLASS LDAP_GROUP_FILTER_GROUP_ID_ATTRIBUTE LDAP_GROUP_FILTER_GROUP_MEMBER_ATTRIBUTE LDAP_GROUP_FILTER_GROUP_MEMBER_FORMAT LDAP_GROUP_FILTER_GROUP_NAME LDAP_UNIQUE_IDENTIFIER_FIELD LDAP_UTF8_NAMES_SLUGIFY LDAP_USERNAME_FIELD LDAP_FULLNAME_FIELD LDAP_MERGE_EXISTING_USERS LDAP_SYNC_USER_DATA LDAP_SYNC_USER_DATA_FIELDMAP LDAP_SYNC_GROUP_ROLES LDAP_DEFAULT_DOMAIN LDAP_EMAIL_MATCH_ENABLE LDAP_EMAIL_MATCH_REQUIRE LDAP_EMAIL_MATCH_VERIFIED LDAP_EMAIL_FIELD LDAP_SYNC_ADMIN_STATUS LDAP_SYNC_ADMIN_GROUPS HEADER_LOGIN_ID HEADER_LOGIN_FIRSTNAME HEADER_LOGIN_LASTNAME HEADER_LOGIN_EMAIL LOGOUT_WITH_TIMER LOGOUT_IN LOGOUT_ON_HOURS LOGOUT_ON_MINUTES DEFAULT_AUTHENTICATION_METHOD ATTACHMENTS_STORE_PATH" # default values DESCRIPTION_DEBUG="Debug OIDC OAuth2 etc. Example: sudo snap set wekan debug='true'" @@ -64,6 +64,10 @@ DESCRIPTION_RICHER_CARD_COMMENT_EDITOR="Rich text editor in card comments. Defau DEFAULT_RICHER_CARD_COMMENT_EDITOR="true" KEY_RICHER_CARD_COMMENT_EDITOR="richer-card-comment-editor" +DESCRIPTION_CARD_OPENED_WEBHOOK_ENABLED="Card opened, send webhook message. Default: false https://github.com/wekan/wekan/issues/2518" +DEFAULT_CARD_OPENED_WEBHOOK_ENABLED="false" +KEY_CARD_OPENED_WEBHOOK_ENABLED="card-opened-webhook-enabled" + DESCRIPTION_ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURES_BEFORE="Accounts lockout known users failures before, greater than 0. Default: 3" DEFAULT_ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURES_BEFORE="3" KEY_ACCOUNTS_LOCKOUT_KNOWN_USERS_FAILURES_BEFORE="accounts-lockout-known-users-failures-before" diff --git a/snap-src/bin/wekan-help b/snap-src/bin/wekan-help index 479aefdf..f1e8ce28 100755 --- a/snap-src/bin/wekan-help +++ b/snap-src/bin/wekan-help @@ -69,6 +69,12 @@ echo -e "\t$ snap set $SNAP_NAME richer-card-comment-editor='true'" echo -e "Disabled:" echo -e "\t$ snap set $SNAP_NAME richer-card-comment-editor='false'" echo -e "\n" +echo -e "Card opened, send webhook message. Default: false https://github.com/wekan/wekan/issues/2518" +echo -e "Enable:" +echo -e "\t$ snap set $SNAP_NAME card-opened-webhook-enabled='true'" +echo -e "Disable, default:" +echo -e "\t$ snap set $SNAP_NAME card-opened-webhook-enabled='false'" +echo -e "\n" echo -e "Max image pixel: Allow to shrink attached/pasted image https://github.com/wekan/wekan/pull/2544" echo -e "Example:" echo -e "\t$ snap set $SNAP_NAME max-image-pixel='1024'" diff --git a/start-wekan.bat b/start-wekan.bat index f6b0d1dd..d4628ee7 100755 --- a/start-wekan.bat +++ b/start-wekan.bat @@ -25,6 +25,9 @@ REM # ==== RICH TEXT EDITOR IN CARD COMMENTS ==== REM # https://github.com/wekan/wekan/pull/2560 SET RICHER_CARD_COMMENT_EDITOR=true +REM # ==== CARD OPENED, SEND WEBHOOK MESSAGE ==== +SET CARD_OPENED_WEBHOOK_ENABLED=false + REM # ==== Allow to shrink attached/pasted image ==== REM # https://github.com/wekan/wekan/pull/2544 REM SET MAX_IMAGE_PIXEL=1024 diff --git a/start-wekan.sh b/start-wekan.sh index 4516e28b..41d41208 100755 --- a/start-wekan.sh +++ b/start-wekan.sh @@ -41,6 +41,9 @@ # https://github.com/wekan/wekan/pull/2560 export RICHER_CARD_COMMENT_EDITOR=true #--------------------------------------------------------------- + # ==== CARD OPENED, SEND WEBHOOK MESSAGE ==== + export CARD_OPENED_WEBHOOK_ENABLED=false + #--------------------------------------------------------------- # ==== Allow to shrink attached/pasted image ==== # https://github.com/wekan/wekan/pull/2544 #export MAX_IMAGE_PIXEL=1024 -- cgit v1.2.3-1-g7c22 From e2e35655c3787856b52a878d2cb66ad008b75615 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 15 Aug 2019 00:39:02 +0300 Subject: Update ChangeLog. --- CHANGELOG.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0d766a84..d2953df8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,8 +2,13 @@ This release adds the following new features: -- [Send webhook when cardDetails is rendered](https://github.com/wekan/wekan/pull/2620). +- [Send webhook](https://github.com/wekan/wekan/issues/2518) when + [cardDetails is rendered](https://github.com/wekan/wekan/pull/2620). Thanks to jymcheong. +- Related to [above new feature](https://github.com/wekan/wekan/issues/2518), + Add [setting CARD_OPENED_WEBHOOK_ENABLED=false as + default](https://github.com/wekan/wekan/commit/b8c527d52bec7272c890385f11e26acec65822ae). + Thanks to xet7. and fixes the following bugs: -- cgit v1.2.3-1-g7c22 From 8fdb126a9950bd0452fc3d78811d002626598bd2 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 15 Aug 2019 00:41:26 +0300 Subject: Update translations. --- i18n/he.i18n.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/i18n/he.i18n.json b/i18n/he.i18n.json index 3af65f51..389e106c 100644 --- a/i18n/he.i18n.json +++ b/i18n/he.i18n.json @@ -73,8 +73,8 @@ "activity-unchecked-item-card": "הסימון של %s בוטל ברשימת המשימות %s", "activity-checklist-completed-card": "רשימת המטלות __checklist__ בכרטיס __card__ שברשימה __list__ תחת המסלול __swimlane__ בלוח __board__ הושלמה", "activity-checklist-uncompleted-card": "רשימת המשימות %s סומנה כבלתי מושלמת", - "activity-editComment": "edited comment %s", - "activity-deleteComment": "deleted comment %s", + "activity-editComment": "התגובה %s נערכה", + "activity-deleteComment": "התגובה %s נמחקה", "add-attachment": "הוספת קובץ מצורף", "add-board": "הוספת לוח", "add-card": "הוספת כרטיס", -- cgit v1.2.3-1-g7c22 From c87001fa9f8d1fa13640ae604b1ba46556c7813c Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 15 Aug 2019 00:45:35 +0300 Subject: Update base64 dependency. --- .meteor/versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.meteor/versions b/.meteor/versions index d1a869ee..dbfe84ae 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -14,7 +14,7 @@ audit-argument-checks@1.0.7 autoupdate@1.6.0 babel-compiler@7.3.4 babel-runtime@1.3.0 -base64@1.0.11 +base64@1.0.12 binary-heap@1.0.11 blaze@2.3.3 blaze-tools@1.0.10 -- cgit v1.2.3-1-g7c22 From a282384ab058cb6a118a9fa6c822e050607fb8e9 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 15 Aug 2019 00:52:40 +0300 Subject: v3.18 --- CHANGELOG.md | 9 +++++++-- Stackerfile.yml | 2 +- package.json | 2 +- public/api/wekan.html | 4 ++-- public/api/wekan.yml | 2 +- sandstorm-pkgdef.capnp | 9 +++++---- 6 files changed, 17 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d2953df8..cf8c7e8c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,8 @@ -# Upcoming Wekan release +# v3.18 2019-08-15 Wekan release This release adds the following new features: -- [Send webhook](https://github.com/wekan/wekan/issues/2518) when +- [Send webhook message](https://github.com/wekan/wekan/issues/2518) when [cardDetails is rendered](https://github.com/wekan/wekan/pull/2620). Thanks to jymcheong. - Related to [above new feature](https://github.com/wekan/wekan/issues/2518), @@ -10,6 +10,11 @@ This release adds the following new features: default](https://github.com/wekan/wekan/commit/b8c527d52bec7272c890385f11e26acec65822ae). Thanks to xet7. +and adds the following updates: + +- [Update base64 dependency](https://github.com/wekan/wekan/commit/c87001fa9f8d1fa13640ae604b1ba46556c7813c). + Thanks to xet7. + and fixes the following bugs: - [Time line is missing delete/edit comments, add English i18n for these two activities, diff --git a/Stackerfile.yml b/Stackerfile.yml index f3f798a7..c4e6a392 100644 --- a/Stackerfile.yml +++ b/Stackerfile.yml @@ -1,5 +1,5 @@ appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928 -appVersion: "v3.17.0" +appVersion: "v3.18.0" files: userUploads: - README.md diff --git a/package.json b/package.json index 4b65ad98..f007fc64 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "v3.17.0", + "version": "v3.18.0", "description": "Open-Source kanban", "private": true, "scripts": { diff --git a/public/api/wekan.html b/public/api/wekan.html index d19dac6c..961cee77 100644 --- a/public/api/wekan.html +++ b/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
  • - Wekan REST API v3.16 + Wekan REST API v3.17
  • @@ -2017,7 +2017,7 @@ var n=this.pipeline.run(e.tokenizer(t)),r=new e.Vector,i=[],o=this._fields.reduc
    -

    Wekan REST API v3.16

    +

    Wekan REST API v3.17

    Scroll down for code samples, example requests and responses. Select a language for code samples from the tabs above or the mobile navigation menu.

    diff --git a/public/api/wekan.yml b/public/api/wekan.yml index 891f7f85..0f684881 100644 --- a/public/api/wekan.yml +++ b/public/api/wekan.yml @@ -1,7 +1,7 @@ swagger: '2.0' info: title: Wekan REST API - version: v3.16 + version: v3.17 description: | The REST API allows you to control and extend Wekan with ease. diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index 59dca6d8..1e8de549 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 = 319, + appVersion = 320, # Increment this for every release. - appMarketingVersion = (defaultText = "3.17.0~2019-08-13"), + appMarketingVersion = (defaultText = "3.18.0~2019-08-15"), # Human-readable presentation of the app version. minUpgradableAppVersion = 0, @@ -238,7 +238,8 @@ const myCommand :Spk.Manifest.Command = ( # Note that this defines the *entire* environment seen by your app. (key = "PATH", value = "/usr/local/bin:/usr/bin:/bin"), (key = "WITH_API", value = "true"), - (key = "RICHER_CARD_COMMENT_EDITOR", value = "true"), + (key = "RICHER_CARD_COMMENT_EDITOR", value="true"), + (key = "CARD_OPENED_WEBHOOK_ENABLED", value="false"), (key = "MATOMO_ADDRESS", value=""), (key = "MATOMO_SITE_ID", value=""), (key = "MATOMO_DO_NOT_TRACK", value="true"), @@ -254,7 +255,7 @@ const myCommand :Spk.Manifest.Command = ( (key = "OAUTH2_USERINFO_ENDPOINT", value=""), (key = "OAUTH2_TOKEN_ENDPOINT", value=""), (key = "LDAP_ENABLE", value="false"), - (key = "SANDSTORM", value = "1"), + (key = "SANDSTORM", value="1"), (key = "METEOR_SETTINGS", value = "{\"public\": {\"sandstorm\": true}}") ] ); -- cgit v1.2.3-1-g7c22 From d302d6f857657ada229f78d9fcd32f63753d9779 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 15 Aug 2019 13:08:03 +0300 Subject: Fix bug: When on board, clicking Admin Panel redirects to All Boards page, so it did require to click Admin Panel again. Thanks to xet7 ! --- client/components/boards/boardBody.jade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/components/boards/boardBody.jade b/client/components/boards/boardBody.jade index fd094a93..76a85d87 100644 --- a/client/components/boards/boardBody.jade +++ b/client/components/boards/boardBody.jade @@ -7,8 +7,8 @@ template(name="board") +boardBody else //-- XXX We need a better error message in case the board has been archived - //-- +message(label="board-not-found") - | {{goHome}} + +message(label="board-not-found") + //-- | {{goHome}} else +spinner -- cgit v1.2.3-1-g7c22 From ebf3e2e65b4576824982516e2140f96f195c3a93 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 15 Aug 2019 13:11:46 +0300 Subject: Update ChangeLog. --- CHANGELOG.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cf8c7e8c..d2438b9f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +# Upcoming Wekan release + +This release fixes the following bugs: + +- [Fix bug: When on board, clicking Admin Panel redirects to All Boards page, so it did require + to click Admin Panel again](https://github.com/wekan/wekan/commit/d302d6f857657ada229f78d9fcd32f63753d9779). + Thanks to xet7. + +Thanks to above GitHub users for their contributions and translators for their translations. + # v3.18 2019-08-15 Wekan release This release adds the following new features: -- cgit v1.2.3-1-g7c22 From 5c696e5a3c70d31a7af6e47cbcf691f6c18eb384 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 15 Aug 2019 13:16:34 +0300 Subject: On board, BoardAdmin and normal user can now invite new user directly with email address, without using Admin Panel or registering at /sign-up. Closes #2060 Revert permission change. Related https://github.com/wekan/wekan/commit/9f6d615ee5bbdb7552e6bdcae75a76a7f74fef7a#commitcomment-34636513 Opens #2590 Thanks to xet7 ! --- models/users.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/models/users.js b/models/users.js index 870e8fe9..d497d5a5 100644 --- a/models/users.js +++ b/models/users.js @@ -260,7 +260,7 @@ Users.attachSchema( Users.allow({ update(userId) { const user = Users.findOne(userId); - return user; // && Meteor.user().isAdmin; // GitHub issue #2590 + return user && Meteor.user().isAdmin; // GitHub issue #2590 }, remove(userId, doc) { const adminsNumber = Users.find({ isAdmin: true }).count(); @@ -610,8 +610,9 @@ if (Meteor.isServer) { board && board.members && _.contains(_.pluck(board.members, 'userId'), inviter._id) && - _.where(board.members, { userId: inviter._id })[0].isActive && - _.where(board.members, { userId: inviter._id })[0].isAdmin; + _.where(board.members, { userId: inviter._id })[0].isActive; + // GitHub issue 2060 + //_.where(board.members, { userId: inviter._id })[0].isAdmin; if (!allowInvite) throw new Meteor.Error('error-board-notAMember'); this.unblock(); -- cgit v1.2.3-1-g7c22 From 692138c40b255c678869f75ec5cbc7a1e8a60efc Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 15 Aug 2019 13:28:30 +0300 Subject: Update translations. --- i18n/de.i18n.json | 4 ++-- i18n/pt-BR.i18n.json | 4 ++-- i18n/ru.i18n.json | 56 ++++++++++++++++++++++++++-------------------------- i18n/zh-CN.i18n.json | 4 ++-- 4 files changed, 34 insertions(+), 34 deletions(-) diff --git a/i18n/de.i18n.json b/i18n/de.i18n.json index 81877a22..514e2470 100644 --- a/i18n/de.i18n.json +++ b/i18n/de.i18n.json @@ -73,8 +73,8 @@ "activity-unchecked-item-card": "hat %s in Checkliste %s abgewählt", "activity-checklist-completed-card": "hat Checkliste __checklist__ der Karte __card__ auf der Liste __list__ in Swimlane __swimlane__ in Board __board__ vervollständigt", "activity-checklist-uncompleted-card": "unvervollständigte die Checkliste %s", - "activity-editComment": "edited comment %s", - "activity-deleteComment": "deleted comment %s", + "activity-editComment": "editierte Kommentar", + "activity-deleteComment": "löschte Kommentar", "add-attachment": "Datei anhängen", "add-board": "neues Board", "add-card": "Karte hinzufügen", diff --git a/i18n/pt-BR.i18n.json b/i18n/pt-BR.i18n.json index 1deea4a0..32b7e72a 100644 --- a/i18n/pt-BR.i18n.json +++ b/i18n/pt-BR.i18n.json @@ -73,8 +73,8 @@ "activity-unchecked-item-card": "desmarcado %s na lista de verificação %s", "activity-checklist-completed-card": "completada a lista de verificação __checklist__ no cartão __card__ na lista __list__ em raia __swimlane__ no quadro __board__", "activity-checklist-uncompleted-card": "não-completada a lista de verificação %s", - "activity-editComment": "edited comment %s", - "activity-deleteComment": "deleted comment %s", + "activity-editComment": "comentário editado %s", + "activity-deleteComment": "comentário excluído %s", "add-attachment": "Adicionar Anexos", "add-board": "Adicionar Quadro", "add-card": "Adicionar Cartão", diff --git a/i18n/ru.i18n.json b/i18n/ru.i18n.json index 102ab43e..6cd676b4 100644 --- a/i18n/ru.i18n.json +++ b/i18n/ru.i18n.json @@ -73,8 +73,8 @@ "activity-unchecked-item-card": "снял %s в контрольном списке %s", "activity-checklist-completed-card": "завершил контрольный список __checklist__ в карточку __card__ в списке __list__ на дорожке __swimlane__ доски __board__", "activity-checklist-uncompleted-card": "вновь открыл контрольный список %s", - "activity-editComment": "edited comment %s", - "activity-deleteComment": "deleted comment %s", + "activity-editComment": "отредактировал комментарий %s", + "activity-deleteComment": "удалил комментарий %s", "add-attachment": "Добавить вложение", "add-board": "Добавить доску", "add-card": "Добавить карточку", @@ -498,7 +498,7 @@ "smtp-port": "SMTP Порт", "smtp-username": "Имя пользователя", "smtp-password": "Пароль", - "smtp-tls": "поддержка TLS", + "smtp-tls": "Поддержка TLS", "send-from": "От", "send-smtp-test": "Отправьте тестовое письмо себе", "invitation-code": "Код приглашения", @@ -514,10 +514,10 @@ "new-outgoing-webhook": "Новый исходящий Веб-хук", "no-name": "(Неизвестный)", "Node_version": "Версия NodeJS", - "Meteor_version": "Meteor version", - "MongoDB_version": "MongoDB version", - "MongoDB_storage_engine": "MongoDB storage engine", - "MongoDB_Oplog_enabled": "MongoDB Oplog enabled", + "Meteor_version": "Версия Meteor", + "MongoDB_version": "Версия MongoDB", + "MongoDB_storage_engine": "Движок хранилища MongoDB", + "MongoDB_Oplog_enabled": "MongoDB Oplog включен", "OS_Arch": "Архитектура", "OS_Cpus": "Количество процессоров", "OS_Freemem": "Свободная память", @@ -679,15 +679,15 @@ "r-board-note": "Примечание: пустое поле соответствует любым возможным значениям.", "r-checklist-note": "Примечание: пункты контрольных списков при перечислении разделяются запятыми.", "r-when-a-card-is-moved": "Когда карточка перемещена в другой список", - "r-set": "Set", - "r-update": "Update", - "r-datefield": "date field", - "r-df-start-at": "start", - "r-df-due-at": "due", - "r-df-end-at": "end", - "r-df-received-at": "received", - "r-to-current-datetime": "to current date/time", - "r-remove-value-from": "Remove value from", + "r-set": "Установить", + "r-update": "Обновить", + "r-datefield": "поле даты", + "r-df-start-at": "в работе с", + "r-df-due-at": "выполнить к", + "r-df-end-at": "завершено", + "r-df-received-at": "получено", + "r-to-current-datetime": "в соответствии с текущей датой/временем", + "r-remove-value-from": "Очистить", "ldap": "LDAP", "oauth2": "OAuth2", "cas": "CAS", @@ -709,24 +709,24 @@ "restore-all": "Восстановить все", "delete-all": "Удалить все", "loading": "Идет загрузка, пожалуйста подождите", - "previous_as": "last time was", + "previous_as": "в прошлый раз был", "act-a-dueAt": "modified due time to \nWhen: __timeValue__\nWhere: __card__\n previous due was __timeOldValue__", "act-a-endAt": "modified ending time to __timeValue__ from (__timeOldValue__)", "act-a-startAt": "modified starting time to __timeValue__ from (__timeOldValue__)", "act-a-receivedAt": "modified received time to __timeValue__ from (__timeOldValue__)", - "a-dueAt": "modified due time to be", - "a-endAt": "modified ending time to be", - "a-startAt": "modified starting time to be", - "a-receivedAt": "modified received time to be", - "almostdue": "current due time %s is approaching", - "pastdue": "current due time %s is past", - "duenow": "current due time %s is today", + "a-dueAt": "изменил срок выполнения на", + "a-endAt": "изменил время завершения на", + "a-startAt": "изменил время начала работы на", + "a-receivedAt": "изменил время получения на", + "almostdue": "текущий срок выполнения %s приближается", + "pastdue": "текущий срок выполнения %s прошел", + "duenow": "текущий срок выполнения %s сегодня", "act-withDue": "__card__ due reminders [__board__]", "act-almostdue": "was reminding the current due (__timeValue__) of __card__ is approaching", "act-pastdue": "was reminding the current due (__timeValue__) of __card__ is past", "act-duenow": "was reminding the current due (__timeValue__) of __card__ is now", - "act-atUserComment": "You were mentioned in [__board__] __card__", - "delete-user-confirm-popup": "Are you sure you want to delete this account? There is no undo.", - "accounts-allowUserDelete": "Allow users to self delete their account", - "hide-minicard-label-text": "Hide minicard label text" + "act-atUserComment": "Вас упомянули в [__board__] __card__", + "delete-user-confirm-popup": "Вы уверены, что хотите удалить аккаунт? Данное действие необратимо.", + "accounts-allowUserDelete": "Разрешить пользователям удалять собственные аккаунты", + "hide-minicard-label-text": "Скрыть текст меток на карточках" } diff --git a/i18n/zh-CN.i18n.json b/i18n/zh-CN.i18n.json index 02b7e3bc..32462096 100644 --- a/i18n/zh-CN.i18n.json +++ b/i18n/zh-CN.i18n.json @@ -73,8 +73,8 @@ "activity-unchecked-item-card": "取消勾选 %s 于清单 %s中", "activity-checklist-completed-card": "完成检查列表 __checklist__ 卡片 __card__ 列表 __list__ 泳道 __swimlane__ 看板 __board__", "activity-checklist-uncompleted-card": "未完成清单 %s", - "activity-editComment": "edited comment %s", - "activity-deleteComment": "deleted comment %s", + "activity-editComment": "评论已编辑", + "activity-deleteComment": "评论已删除", "add-attachment": "添加附件", "add-board": "添加看板", "add-card": "添加卡片", -- cgit v1.2.3-1-g7c22 From 315b5bad4665ba567f7b7d0d1cb1e682a7205df7 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 15 Aug 2019 13:29:37 +0300 Subject: Fix formatting. --- models/users.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/models/users.js b/models/users.js index d497d5a5..1adb4a57 100644 --- a/models/users.js +++ b/models/users.js @@ -611,8 +611,8 @@ if (Meteor.isServer) { board.members && _.contains(_.pluck(board.members, 'userId'), inviter._id) && _.where(board.members, { userId: inviter._id })[0].isActive; - // GitHub issue 2060 - //_.where(board.members, { userId: inviter._id })[0].isAdmin; + // GitHub issue 2060 + //_.where(board.members, { userId: inviter._id })[0].isAdmin; if (!allowInvite) throw new Meteor.Error('error-board-notAMember'); this.unblock(); -- cgit v1.2.3-1-g7c22 From 65769f3726ff5c272ee4184c201e50fa3d4248e2 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 15 Aug 2019 13:29:57 +0300 Subject: Update ChangeLog. --- CHANGELOG.md | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d2438b9f..906fa6c8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,21 @@ # Upcoming Wekan release -This release fixes the following bugs: +This release fixes the following security issues: + +- [Revert permission change](https://github.com/wekan/wekan/commit/d302d6f857657ada229f78d9fcd32f63753d9779), + related [#2590](https://github.com/wekan/wekan/issues/2590) and + [these comments](https://github.com/wekan/wekan/commit/9f6d615ee5bbdb7552e6bdcae75a76a7f74fef7a#commitcomment-34636513). + Thanks to road42, justinr1234 and xet7. + +and adds the following new features: + +- On board, BoardAdmin and normal user can now [invite new user directly + with email address](https://github.com/wekan/wekan/issues/2060), + [without using Admin Panel or registering + at /sign-up](https://github.com/wekan/wekan/commit/5c696e5a3c70d31a7af6e47cbcf691f6c18eb384). + Thanks to xet7. + +and fixes the following bugs: - [Fix bug: When on board, clicking Admin Panel redirects to All Boards page, so it did require to click Admin Panel again](https://github.com/wekan/wekan/commit/d302d6f857657ada229f78d9fcd32f63753d9779). -- cgit v1.2.3-1-g7c22 From 96d0447df065242c362823970627d06f693ef2b5 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 15 Aug 2019 13:33:01 +0300 Subject: v3.19 --- CHANGELOG.md | 2 +- Stackerfile.yml | 2 +- package.json | 2 +- public/api/wekan.html | 4 ++-- public/api/wekan.yml | 2 +- sandstorm-pkgdef.capnp | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 906fa6c8..2b9c9ae6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Upcoming Wekan release +# v3.19 2019-08-15 Upcoming Wekan release This release fixes the following security issues: diff --git a/Stackerfile.yml b/Stackerfile.yml index c4e6a392..d50cc46a 100644 --- a/Stackerfile.yml +++ b/Stackerfile.yml @@ -1,5 +1,5 @@ appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928 -appVersion: "v3.18.0" +appVersion: "v3.19.0" files: userUploads: - README.md diff --git a/package.json b/package.json index f007fc64..89abf867 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "v3.18.0", + "version": "v3.19.0", "description": "Open-Source kanban", "private": true, "scripts": { diff --git a/public/api/wekan.html b/public/api/wekan.html index 961cee77..5503fcdd 100644 --- a/public/api/wekan.html +++ b/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
    • - Wekan REST API v3.17 + Wekan REST API v3.18
    • @@ -2017,7 +2017,7 @@ var n=this.pipeline.run(e.tokenizer(t)),r=new e.Vector,i=[],o=this._fields.reduc
      -

      Wekan REST API v3.17

      +

      Wekan REST API v3.18

      Scroll down for code samples, example requests and responses. Select a language for code samples from the tabs above or the mobile navigation menu.

      diff --git a/public/api/wekan.yml b/public/api/wekan.yml index 0f684881..9a02e959 100644 --- a/public/api/wekan.yml +++ b/public/api/wekan.yml @@ -1,7 +1,7 @@ swagger: '2.0' info: title: Wekan REST API - version: v3.17 + version: v3.18 description: | The REST API allows you to control and extend Wekan with ease. diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index 1e8de549..49ee3091 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 = 320, + appVersion = 321, # Increment this for every release. - appMarketingVersion = (defaultText = "3.18.0~2019-08-15"), + appMarketingVersion = (defaultText = "3.19.0~2019-08-15"), # Human-readable presentation of the app version. minUpgradableAppVersion = 0, -- cgit v1.2.3-1-g7c22 From d80a258c8b10e1224d540447ad4d319950f0ef05 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Thu, 15 Aug 2019 13:39:24 +0300 Subject: v3.20 --- CHANGELOG.md | 2 +- Stackerfile.yml | 2 +- package.json | 2 +- public/api/wekan.html | 4 ++-- public/api/wekan.yml | 2 +- sandstorm-pkgdef.capnp | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b9c9ae6..4a724f3e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# v3.19 2019-08-15 Upcoming Wekan release +# v3.20 2019-08-15 Wekan release This release fixes the following security issues: diff --git a/Stackerfile.yml b/Stackerfile.yml index d50cc46a..b9293cde 100644 --- a/Stackerfile.yml +++ b/Stackerfile.yml @@ -1,5 +1,5 @@ appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928 -appVersion: "v3.19.0" +appVersion: "v3.20.0" files: userUploads: - README.md diff --git a/package.json b/package.json index 89abf867..d58a95d8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "v3.19.0", + "version": "v3.20.0", "description": "Open-Source kanban", "private": true, "scripts": { diff --git a/public/api/wekan.html b/public/api/wekan.html index 5503fcdd..0b717ae7 100644 --- a/public/api/wekan.html +++ b/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
      • - Wekan REST API v3.18 + Wekan REST API v3.19
      • @@ -2017,7 +2017,7 @@ var n=this.pipeline.run(e.tokenizer(t)),r=new e.Vector,i=[],o=this._fields.reduc
        -

        Wekan REST API v3.18

        +

        Wekan REST API v3.19

        Scroll down for code samples, example requests and responses. Select a language for code samples from the tabs above or the mobile navigation menu.

        diff --git a/public/api/wekan.yml b/public/api/wekan.yml index 9a02e959..6e388450 100644 --- a/public/api/wekan.yml +++ b/public/api/wekan.yml @@ -1,7 +1,7 @@ swagger: '2.0' info: title: Wekan REST API - version: v3.18 + version: v3.19 description: | The REST API allows you to control and extend Wekan with ease. diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index 49ee3091..5c81d519 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 = 321, + appVersion = 322, # Increment this for every release. - appMarketingVersion = (defaultText = "3.19.0~2019-08-15"), + appMarketingVersion = (defaultText = "3.20.0~2019-08-15"), # Human-readable presentation of the app version. minUpgradableAppVersion = 0, -- cgit v1.2.3-1-g7c22 -- cgit v1.2.3-1-g7c22