Răsfoiți Sursa

Merge remote-tracking branch 'upstream/master'

Sam X. Chen 5 ani în urmă
părinte
comite
f3147af2f7
69 a modificat fișierele cu 269 adăugiri și 61 ștergeri
  1. 1 1
      .meteor/versions
  2. 50 0
      CHANGELOG.md
  3. 1 0
      Dockerfile
  4. 1 1
      Stackerfile.yml
  5. 2 2
      client/components/boards/boardBody.jade
  6. 31 0
      client/components/cards/cardDetails.js
  7. 4 0
      docker-compose.yml
  8. 2 0
      i18n/ar.i18n.json
  9. 2 0
      i18n/bg.i18n.json
  10. 2 0
      i18n/br.i18n.json
  11. 2 0
      i18n/ca.i18n.json
  12. 2 0
      i18n/cs.i18n.json
  13. 2 0
      i18n/da.i18n.json
  14. 2 0
      i18n/de.i18n.json
  15. 2 0
      i18n/el.i18n.json
  16. 2 0
      i18n/en-GB.i18n.json
  17. 2 0
      i18n/eo.i18n.json
  18. 2 0
      i18n/es-AR.i18n.json
  19. 2 0
      i18n/es.i18n.json
  20. 2 0
      i18n/eu.i18n.json
  21. 2 0
      i18n/fa.i18n.json
  22. 2 0
      i18n/fi.i18n.json
  23. 2 0
      i18n/fr.i18n.json
  24. 2 0
      i18n/gl.i18n.json
  25. 6 4
      i18n/he.i18n.json
  26. 2 0
      i18n/hi.i18n.json
  27. 2 0
      i18n/hu.i18n.json
  28. 2 0
      i18n/hy.i18n.json
  29. 2 0
      i18n/id.i18n.json
  30. 2 0
      i18n/ig.i18n.json
  31. 2 0
      i18n/it.i18n.json
  32. 2 0
      i18n/ja.i18n.json
  33. 2 0
      i18n/ka.i18n.json
  34. 2 0
      i18n/km.i18n.json
  35. 2 0
      i18n/ko.i18n.json
  36. 2 0
      i18n/lv.i18n.json
  37. 2 0
      i18n/mk.i18n.json
  38. 2 0
      i18n/mn.i18n.json
  39. 2 0
      i18n/nb.i18n.json
  40. 2 0
      i18n/nl.i18n.json
  41. 2 0
      i18n/oc.i18n.json
  42. 6 4
      i18n/pl.i18n.json
  43. 6 4
      i18n/pt-BR.i18n.json
  44. 2 0
      i18n/pt.i18n.json
  45. 2 0
      i18n/ro.i18n.json
  46. 28 26
      i18n/ru.i18n.json
  47. 2 0
      i18n/sr.i18n.json
  48. 9 7
      i18n/sv.i18n.json
  49. 2 0
      i18n/sw.i18n.json
  50. 2 0
      i18n/ta.i18n.json
  51. 2 0
      i18n/th.i18n.json
  52. 2 0
      i18n/tr.i18n.json
  53. 2 0
      i18n/uk.i18n.json
  54. 2 0
      i18n/vi.i18n.json
  55. 2 0
      i18n/zh-CN.i18n.json
  56. 2 0
      i18n/zh-HK.i18n.json
  57. 2 0
      i18n/zh-TW.i18n.json
  58. 4 3
      models/users.js
  59. 1 1
      package.json
  60. 2 2
      public/api/wekan.html
  61. 1 1
      public/api/wekan.yml
  62. 1 1
      releases/release-sandstorm.sh
  63. 3 0
      releases/virtualbox/start-wekan.sh
  64. 5 4
      sandstorm-pkgdef.capnp
  65. 5 0
      server/card-opened-webhook.js
  66. 0 0
      snap-src/bin/config
  67. 6 0
      snap-src/bin/wekan-help
  68. 3 0
      start-wekan.bat
  69. 3 0
      start-wekan.sh

+ 1 - 1
.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

+ 50 - 0
CHANGELOG.md

@@ -1,3 +1,53 @@
+# v3.20 2019-08-15 Wekan release
+
+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).
+  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:
+
+- [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),
+  Add [setting CARD_OPENED_WEBHOOK_ENABLED=false as
+  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,
+  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:

+ 1 - 0
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="" \

+ 1 - 1
Stackerfile.yml

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

+ 2 - 2
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
 

+ 31 - 0
client/components/cards/cardDetails.js

@@ -117,6 +117,37 @@ BlazeComponent.extendComponent({
   },
 
   onRendered() {
+    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(() => {
         $('.card-details').mCustomScrollbar({

+ 4 - 0
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

+ 2 - 0
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": "إضافة بطاقة",

+ 2 - 0
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": "Добави карта",

+ 2 - 0
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",

+ 2 - 0
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",

+ 2 - 0
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",

+ 2 - 0
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",

+ 2 - 0
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": "editierte Kommentar",
+  "activity-deleteComment": "löschte Kommentar",
   "add-attachment": "Datei anhängen",
   "add-board": "neues Board",
   "add-card": "Karte hinzufügen",

+ 2 - 0
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": "Προσθήκη Κάρτας",

+ 2 - 0
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",

+ 2 - 0
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",

+ 2 - 0
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",

+ 2 - 0
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",

+ 2 - 0
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",

+ 2 - 0
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": "افزودن کارت",

+ 2 - 0
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",

+ 2 - 0
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",

+ 2 - 0
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",

+ 6 - 4
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": "התגובה %s נערכה",
+  "activity-deleteComment": "התגובה %s נמחקה",
   "add-attachment": "הוספת קובץ מצורף",
   "add-board": "הוספת לוח",
   "add-card": "הוספת כרטיס",
@@ -512,10 +514,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) פנוי",

+ 2 - 0
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": "कार्ड जोड़ें",

+ 2 - 0
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",

+ 2 - 0
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",

+ 2 - 0
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",

+ 2 - 0
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",

+ 2 - 0
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",

+ 2 - 0
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": "カードを追加",

+ 2 - 0
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": "ბარათის დამატება",

+ 2 - 0
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",

+ 2 - 0
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": "카드 추가",

+ 2 - 0
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",

+ 2 - 0
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": "Додади Картичка",

+ 2 - 0
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": "Карт нэмэх",

+ 2 - 0
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",

+ 2 - 0
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",

+ 2 - 0
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",

+ 6 - 4
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ę",
@@ -512,10 +514,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",

+ 6 - 4
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": "comentário editado %s",
+  "activity-deleteComment": "comentário excluído %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",

+ 2 - 0
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",

+ 2 - 0
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",

+ 28 - 26
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": "отредактировал комментарий %s",
+  "activity-deleteComment": "удалил комментарий %s",
   "add-attachment": "Добавить вложение",
   "add-board": "Добавить доску",
   "add-card": "Добавить карточку",
@@ -496,7 +498,7 @@
   "smtp-port": "SMTP Порт",
   "smtp-username": "Имя пользователя",
   "smtp-password": "Пароль",
-  "smtp-tls": "поддержка TLS",
+  "smtp-tls": "Поддержка TLS",
   "send-from": "От",
   "send-smtp-test": "Отправьте тестовое письмо себе",
   "invitation-code": "Код приглашения",
@@ -512,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": "Свободная память",
@@ -677,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",
@@ -707,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": "Скрыть текст меток на карточках"
 }

+ 2 - 0
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",

+ 9 - 7
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"
 }

+ 2 - 0
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",

+ 2 - 0
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",

+ 2 - 0
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",

+ 2 - 0
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",

+ 2 - 0
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": "Додати картку",

+ 2 - 0
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ẻ",

+ 2 - 0
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": "评论已编辑",
+  "activity-deleteComment": "评论已删除",
   "add-attachment": "添加附件",
   "add-board": "添加看板",
   "add-card": "添加卡片",

+ 2 - 0
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",

+ 2 - 0
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": "新增卡片",

+ 4 - 3
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();

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "v3.17.0",
+  "version": "v3.20.0",
   "description": "Open-Source kanban",
   "private": true,
   "scripts": {

+ 2 - 2
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.16">Wekan REST API v3.16</a>
+            <a href="#wekan-rest-api" class="toc-h1 toc-link" data-title="Wekan REST API v3.19">Wekan REST API v3.19</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.16</h1>
+        <h1 id="wekan-rest-api">Wekan REST API v3.19</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>

+ 1 - 1
public/api/wekan.yml

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

+ 1 - 1
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

+ 3 - 0
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

+ 5 - 4
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 = 322,
     # Increment this for every release.
 
-    appMarketingVersion = (defaultText = "3.17.0~2019-08-13"),
+    appMarketingVersion = (defaultText = "3.20.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}}")
   ]
 );

+ 5 - 0
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;
+  }
+});

Fișier diff suprimat deoarece este prea mare
+ 0 - 0
snap-src/bin/config


+ 6 - 0
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'"

+ 3 - 0
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

+ 3 - 0
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

Unele fișiere nu au fost afișate deoarece prea multe fișiere au fost modificate în acest diff