From 0bbfa632f77cf52333af312a4694bbcce6de92b7 Mon Sep 17 00:00:00 2001 From: Felix Michels Date: Fri, 22 Sep 2017 09:50:40 +0200 Subject: [PATCH 01/21] add translation (en/de) for email notifications regarding checklists and checklist items --- i18n/de.i18n.json | 4 +++- i18n/en.i18n.json | 2 ++ models/activities.js | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/i18n/de.i18n.json b/i18n/de.i18n.json index bf1004c34..01e721764 100644 --- a/i18n/de.i18n.json +++ b/i18n/de.i18n.json @@ -2,6 +2,8 @@ "accept": "Akzeptieren", "act-activity-notify": "[Wekan] Aktivitätsbenachrichtigung", "act-addAttachment": "hat __attachment__ an __card__ angehängt", + "act-addChecklist": "hat die Checklist __checklist__ zu __card__ hinzugefügt", + "act-addChecklistItem": "hat __checklistItem__ zur Checkliste __checklist__ in __card__ hinzugefügt", "act-addComment": "hat __card__ kommentiert: __comment__", "act-createBoard": "hat __board__ erstellt", "act-createCard": "hat __card__ zu __list__ hinzugefügt", @@ -389,4 +391,4 @@ "no": "Nein", "accounts": "Konten", "accounts-allowEmailChange": "Zulassen E-Mail ändern" -} \ No newline at end of file +} diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json index 62b9cc675..64a720db0 100644 --- a/i18n/en.i18n.json +++ b/i18n/en.i18n.json @@ -2,6 +2,8 @@ "accept": "Accept", "act-activity-notify": "[Wekan] Activity Notification", "act-addAttachment": "attached __attachment__ to __card__", + "act-addChecklist": "added checklist __checklist__ to __card__", + "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__", "act-addComment": "commented on __card__: __comment__", "act-createBoard": "created __board__", "act-createCard": "added __card__ to __list__", diff --git a/models/activities.js b/models/activities.js index c732a940c..4ddcfa72c 100644 --- a/models/activities.js +++ b/models/activities.js @@ -119,6 +119,10 @@ if (Meteor.isServer) { const checklist = activity.checklist(); params.checklist = checklist.title; } + if (activity.checklistItemId) { + const checklistItem = activity.checklistItem(); + params.checklistItem = checklistItem.title; + } if (board) { const watchingUsers = _.pluck(_.where(board.watchers, {level: 'watching'}), 'userId'); const trackingUsers = _.pluck(_.where(board.watchers, {level: 'tracking'}), 'userId'); From fdf25a274f6629e7c254389cf68c340667c055a2 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Fri, 22 Sep 2017 22:12:55 +0300 Subject: [PATCH 02/21] Update translations. --- i18n/ar.i18n.json | 2 ++ i18n/br.i18n.json | 2 ++ i18n/ca.i18n.json | 2 ++ i18n/cs.i18n.json | 2 ++ i18n/de.i18n.json | 2 +- i18n/en-GB.i18n.json | 2 ++ i18n/eo.i18n.json | 2 ++ i18n/es.i18n.json | 6 ++++-- 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/hu.i18n.json | 2 ++ i18n/id.i18n.json | 2 ++ i18n/it.i18n.json | 2 ++ i18n/ja.i18n.json | 2 ++ i18n/ko.i18n.json | 2 ++ i18n/nb.i18n.json | 2 ++ i18n/nl.i18n.json | 2 ++ i18n/pl.i18n.json | 2 ++ i18n/pt-BR.i18n.json | 2 ++ i18n/ro.i18n.json | 2 ++ i18n/ru.i18n.json | 2 ++ i18n/sr.i18n.json | 2 ++ i18n/sv.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-TW.i18n.json | 2 ++ 34 files changed, 69 insertions(+), 3 deletions(-) diff --git a/i18n/ar.i18n.json b/i18n/ar.i18n.json index 0d8fd7df4..ebf743d8d 100644 --- a/i18n/ar.i18n.json +++ b/i18n/ar.i18n.json @@ -2,6 +2,8 @@ "accept": "اقبلboard", "act-activity-notify": "[Wekan] اشعار عن نشاط", "act-addAttachment": "ربط __attachment__ الى __card__", + "act-addChecklist": "added checklist __checklist__ to __card__", + "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__", "act-addComment": "علق على __comment__ : __card__", "act-createBoard": "احدث __board__", "act-createCard": "اضاف __card__ الى __list__", diff --git a/i18n/br.i18n.json b/i18n/br.i18n.json index f757ac286..c6882ba15 100644 --- a/i18n/br.i18n.json +++ b/i18n/br.i18n.json @@ -2,6 +2,8 @@ "accept": "Asantiñ", "act-activity-notify": "[Wekan] Activity Notification", "act-addAttachment": "attached __attachment__ to __card__", + "act-addChecklist": "added checklist __checklist__ to __card__", + "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__", "act-addComment": "commented on __card__: __comment__", "act-createBoard": "created __board__", "act-createCard": "added __card__ to __list__", diff --git a/i18n/ca.i18n.json b/i18n/ca.i18n.json index f6f3de74c..a3a0e7aa7 100644 --- a/i18n/ca.i18n.json +++ b/i18n/ca.i18n.json @@ -2,6 +2,8 @@ "accept": "Accepta", "act-activity-notify": "[Wekan] Notificació d'activitat", "act-addAttachment": "adjuntat __attachment__ a __card__", + "act-addChecklist": "added checklist __checklist__ to __card__", + "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__", "act-addComment": "comentat a __card__: __comment__", "act-createBoard": "creat __board__", "act-createCard": "afegit/da __card__ a __list__", diff --git a/i18n/cs.i18n.json b/i18n/cs.i18n.json index c8f3f74d0..ca2cf7efb 100644 --- a/i18n/cs.i18n.json +++ b/i18n/cs.i18n.json @@ -2,6 +2,8 @@ "accept": "Přijmout", "act-activity-notify": "[Wekan] Notifikace aktivit", "act-addAttachment": "přiložen __attachment__ do __card__", + "act-addChecklist": "added checklist __checklist__ to __card__", + "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__", "act-addComment": "komentář k __card__: __comment__", "act-createBoard": "přidání __board__", "act-createCard": "přidání __card__ do __list__", diff --git a/i18n/de.i18n.json b/i18n/de.i18n.json index 01e721764..bc1120edd 100644 --- a/i18n/de.i18n.json +++ b/i18n/de.i18n.json @@ -391,4 +391,4 @@ "no": "Nein", "accounts": "Konten", "accounts-allowEmailChange": "Zulassen E-Mail ändern" -} +} \ No newline at end of file diff --git a/i18n/en-GB.i18n.json b/i18n/en-GB.i18n.json index 7d53a1eb7..8db041a5a 100644 --- a/i18n/en-GB.i18n.json +++ b/i18n/en-GB.i18n.json @@ -2,6 +2,8 @@ "accept": "Accept", "act-activity-notify": "[Wekan] Activity Notification", "act-addAttachment": "attached _ attachment _ to _ card _", + "act-addChecklist": "added checklist __checklist__ to __card__", + "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__", "act-addComment": "commented on __card__: __comment__", "act-createBoard": "created __board__", "act-createCard": "added __card__ to __list__", diff --git a/i18n/eo.i18n.json b/i18n/eo.i18n.json index 8143516b6..5da9e81ae 100644 --- a/i18n/eo.i18n.json +++ b/i18n/eo.i18n.json @@ -2,6 +2,8 @@ "accept": "Akcepti", "act-activity-notify": "[Wekan] Activity Notification", "act-addAttachment": "attached __attachment__ to __card__", + "act-addChecklist": "added checklist __checklist__ to __card__", + "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__", "act-addComment": "commented on __card__: __comment__", "act-createBoard": "kreiis __board__", "act-createCard": "aldonis __card__ al __list__", diff --git a/i18n/es.i18n.json b/i18n/es.i18n.json index 3d1ba84ad..5dca2df54 100644 --- a/i18n/es.i18n.json +++ b/i18n/es.i18n.json @@ -2,6 +2,8 @@ "accept": "Aceptar", "act-activity-notify": "[Wekan] Notificación de Actividad", "act-addAttachment": "adjuntado __attachment__ a __card__", + "act-addChecklist": "added checklist __checklist__ to __card__", + "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__", "act-addComment": "comentado en __card__: __comment__", "act-createBoard": "creado __board__", "act-createCard": "añadido __card__ a __list__", @@ -60,7 +62,7 @@ "archive": "Guardar", "archive-all": "Guardar Todo", "archive-board": "Archive Board", - "archive-card": "Archive Card", + "archive-card": "Archivo Tarjeta", "archive-list": "Archivar Lista", "archive-selection": "Archive selection", "archiveBoardPopup-title": "Archive Board?", @@ -111,7 +113,7 @@ "cardLabelsPopup-title": "Etiquetas", "cardMembersPopup-title": "Miembros", "cardMorePopup-title": "Más", - "cards": "Cards", + "cards": "Tarjetas", "change": "Change", "change-avatar": "Cambiar Avatar", "change-password": "Cambiar la clave", diff --git a/i18n/eu.i18n.json b/i18n/eu.i18n.json index 63d75b692..edf7e09a6 100644 --- a/i18n/eu.i18n.json +++ b/i18n/eu.i18n.json @@ -2,6 +2,8 @@ "accept": "Onartu", "act-activity-notify": "[Wekan] Jarduera-jakinarazpena", "act-addAttachment": "__attachment__ __card__ txartelera erantsita", + "act-addChecklist": "added checklist __checklist__ to __card__", + "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__", "act-addComment": "__card__ txartelean iruzkina: __comment__", "act-createBoard": "__board__ sortuta", "act-createCard": "__card__ __list__ zerrrendara gehituta", diff --git a/i18n/fa.i18n.json b/i18n/fa.i18n.json index 50fb2afd9..c7c05a2b6 100644 --- a/i18n/fa.i18n.json +++ b/i18n/fa.i18n.json @@ -2,6 +2,8 @@ "accept": "تایید", "act-activity-notify": "[wekan]اطلاع فعالیت", "act-addAttachment": "پیوست __attachment__ به __card__", + "act-addChecklist": "added checklist __checklist__ to __card__", + "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__", "act-addComment": "یادداشت بر __card__: __comment__", "act-createBoard": " __board__ ایجادشد", "act-createCard": " __card__ به __list__ اضافه شد", diff --git a/i18n/fi.i18n.json b/i18n/fi.i18n.json index 4f6c0c3c7..0a8349968 100644 --- a/i18n/fi.i18n.json +++ b/i18n/fi.i18n.json @@ -2,6 +2,8 @@ "accept": "Hyväksy", "act-activity-notify": "[Wekan] Toimintailmoitus", "act-addAttachment": "liitetty __attachment__ kortille __card__", + "act-addChecklist": "lisätty tarkistuslista __checklist__ kortille __card__", + "act-addChecklistItem": "lisätty kohta __checklistItem__ tarkistuslistaan __checklist__ kortilla __card__", "act-addComment": "kommentoitu __card__: __comment__", "act-createBoard": "luotu __board__", "act-createCard": "lisätty __card__ listalle __list__", diff --git a/i18n/fr.i18n.json b/i18n/fr.i18n.json index e4b689484..4f4319611 100644 --- a/i18n/fr.i18n.json +++ b/i18n/fr.i18n.json @@ -2,6 +2,8 @@ "accept": "Accepter", "act-activity-notify": "[Wekan] Notification d'activité", "act-addAttachment": "a joint __attachment__ à __card__", + "act-addChecklist": "added checklist __checklist__ to __card__", + "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__", "act-addComment": "a commenté __card__ : __comment__", "act-createBoard": "a créé __board__", "act-createCard": "a ajouté __card__ à __list__", diff --git a/i18n/gl.i18n.json b/i18n/gl.i18n.json index 37d19b1a7..6b2dd9b64 100644 --- a/i18n/gl.i18n.json +++ b/i18n/gl.i18n.json @@ -2,6 +2,8 @@ "accept": "Aceptar", "act-activity-notify": "[Wekan] Activity Notification", "act-addAttachment": "attached __attachment__ to __card__", + "act-addChecklist": "added checklist __checklist__ to __card__", + "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__", "act-addComment": "commented on __card__: __comment__", "act-createBoard": "created __board__", "act-createCard": "added __card__ to __list__", diff --git a/i18n/he.i18n.json b/i18n/he.i18n.json index e23ffdf8c..17eb1ea13 100644 --- a/i18n/he.i18n.json +++ b/i18n/he.i18n.json @@ -2,6 +2,8 @@ "accept": "אישור", "act-activity-notify": "[Wekan] הודעת פעילות", "act-addAttachment": " __attachment__ צורף לכרטיס __card__", + "act-addChecklist": "added checklist __checklist__ to __card__", + "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__", "act-addComment": "התקבלה תגובה על הכרטיס __card__:‏ __comment__", "act-createBoard": "הלוח __board__ נוצר", "act-createCard": "הכרטיס __card__ התווסף לרשימה __list__", diff --git a/i18n/hu.i18n.json b/i18n/hu.i18n.json index 858268ca2..65bed443d 100644 --- a/i18n/hu.i18n.json +++ b/i18n/hu.i18n.json @@ -2,6 +2,8 @@ "accept": "Elfogad", "act-activity-notify": "[Wekan] Tevékenység értesítés", "act-addAttachment": "attached __attachment__ to __card__", + "act-addChecklist": "added checklist __checklist__ to __card__", + "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__", "act-addComment": "commented on __card__: __comment__", "act-createBoard": "created __board__", "act-createCard": "added __card__ to __list__", diff --git a/i18n/id.i18n.json b/i18n/id.i18n.json index 655ae2436..a8bb170fd 100644 --- a/i18n/id.i18n.json +++ b/i18n/id.i18n.json @@ -2,6 +2,8 @@ "accept": "Terima", "act-activity-notify": "[Wekan] Pemberitahuan Kegiatan", "act-addAttachment": "Lampirkan__attachment__ke__kartu__", + "act-addChecklist": "added checklist __checklist__ to __card__", + "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__", "act-addComment": "Dikomentari di__kartu__:__comment__", "act-createBoard": "Panel__dibuat__", "act-createCard": "Kartu__dilampirkan__ke__Daftar", diff --git a/i18n/it.i18n.json b/i18n/it.i18n.json index 0072f2e6d..72963a0f1 100644 --- a/i18n/it.i18n.json +++ b/i18n/it.i18n.json @@ -2,6 +2,8 @@ "accept": "Accetta", "act-activity-notify": "[Wekan] Notifiche attività", "act-addAttachment": "ha allegato __attachment__ a __card__", + "act-addChecklist": "added checklist __checklist__ to __card__", + "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__", "act-addComment": "ha commentato su __card__: __comment__", "act-createBoard": "ha creato __board__", "act-createCard": "ha aggiunto __card__ a __list__", diff --git a/i18n/ja.i18n.json b/i18n/ja.i18n.json index 0b9330b9c..f5c38263a 100644 --- a/i18n/ja.i18n.json +++ b/i18n/ja.i18n.json @@ -2,6 +2,8 @@ "accept": "受け入れ", "act-activity-notify": "[Wekan] アクティビティ通知", "act-addAttachment": "__card__ に __attachment__ を添付しました", + "act-addChecklist": "added checklist __checklist__ to __card__", + "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__", "act-addComment": "__card__: __comment__ をコメントしました", "act-createBoard": "__board__ を作成しました", "act-createCard": "__list__ に __card__ を追加しました", diff --git a/i18n/ko.i18n.json b/i18n/ko.i18n.json index 43970449b..1842be0a9 100644 --- a/i18n/ko.i18n.json +++ b/i18n/ko.i18n.json @@ -2,6 +2,8 @@ "accept": "확인", "act-activity-notify": "[Wekan] 활동 알림", "act-addAttachment": "__attachment__를 __card__에 첨부", + "act-addChecklist": "added checklist __checklist__ to __card__", + "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__", "act-addComment": "__card__에 내용 추가 : __comment__", "act-createBoard": "__board__ 생성", "act-createCard": "__list__에 __card__ 추가", diff --git a/i18n/nb.i18n.json b/i18n/nb.i18n.json index 0983c6f35..e8cbed4db 100644 --- a/i18n/nb.i18n.json +++ b/i18n/nb.i18n.json @@ -2,6 +2,8 @@ "accept": "Godta", "act-activity-notify": "[Wekan] Aktivitetsvarsel", "act-addAttachment": "la ved __attachment__ til __card__", + "act-addChecklist": "added checklist __checklist__ to __card__", + "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__", "act-addComment": "kommenterte til __card__: __comment__", "act-createBoard": "opprettet __board__", "act-createCard": "la __card__ til __list__", diff --git a/i18n/nl.i18n.json b/i18n/nl.i18n.json index 71d4194f1..6cbcca6b2 100644 --- a/i18n/nl.i18n.json +++ b/i18n/nl.i18n.json @@ -2,6 +2,8 @@ "accept": "Accepteren", "act-activity-notify": "[Wekan] Activiteit Notificatie", "act-addAttachment": "__attachment__ als bijlage toegevoegd aan __card__", + "act-addChecklist": "added checklist __checklist__ to __card__", + "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__", "act-addComment": "gereageerd op __card__:__comment__", "act-createBoard": "aangemaakte__bord__", "act-createCard": "toegevoegd__kaart__aan__lijst__", diff --git a/i18n/pl.i18n.json b/i18n/pl.i18n.json index 137144f0d..024382ffb 100644 --- a/i18n/pl.i18n.json +++ b/i18n/pl.i18n.json @@ -2,6 +2,8 @@ "accept": "Akceptuj", "act-activity-notify": "[Wekan] Activity Notification", "act-addAttachment": "attached __attachment__ to __card__", + "act-addChecklist": "added checklist __checklist__ to __card__", + "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__", "act-addComment": "commented on __card__: __comment__", "act-createBoard": "created __board__", "act-createCard": "added __card__ to __list__", diff --git a/i18n/pt-BR.i18n.json b/i18n/pt-BR.i18n.json index 2aaa5c6c0..1ea99b76c 100644 --- a/i18n/pt-BR.i18n.json +++ b/i18n/pt-BR.i18n.json @@ -2,6 +2,8 @@ "accept": "Aceitar", "act-activity-notify": "[Wekan] Notificação de Atividade", "act-addAttachment": "anexo __attachment__ de __card__", + "act-addChecklist": "added checklist __checklist__ to __card__", + "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__", "act-addComment": "comentou em __card__: __comment__", "act-createBoard": "criou __board__", "act-createCard": "__card__ adicionado à __list__", diff --git a/i18n/ro.i18n.json b/i18n/ro.i18n.json index 0f6a3ee1e..926d63dc9 100644 --- a/i18n/ro.i18n.json +++ b/i18n/ro.i18n.json @@ -2,6 +2,8 @@ "accept": "Accept", "act-activity-notify": "[Wekan] Activity Notification", "act-addAttachment": "attached __attachment__ to __card__", + "act-addChecklist": "added checklist __checklist__ to __card__", + "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__", "act-addComment": "commented on __card__: __comment__", "act-createBoard": "created __board__", "act-createCard": "added __card__ to __list__", diff --git a/i18n/ru.i18n.json b/i18n/ru.i18n.json index 890b268c6..5b26f7c26 100644 --- a/i18n/ru.i18n.json +++ b/i18n/ru.i18n.json @@ -2,6 +2,8 @@ "accept": "Принять", "act-activity-notify": "[Wekan] Уведомления о активности", "act-addAttachment": "вложено __attachment__ в __card__", + "act-addChecklist": "added checklist __checklist__ to __card__", + "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__", "act-addComment": "прокомментировал __card__: __comment__", "act-createBoard": "создана __board__", "act-createCard": "добавлена __card__ в __list__", diff --git a/i18n/sr.i18n.json b/i18n/sr.i18n.json index dadf84726..01b83edb3 100644 --- a/i18n/sr.i18n.json +++ b/i18n/sr.i18n.json @@ -2,6 +2,8 @@ "accept": "Prihvati", "act-activity-notify": "[Wekan] Obaveštenje o aktivnostima", "act-addAttachment": "attached __attachment__ to __card__", + "act-addChecklist": "added checklist __checklist__ to __card__", + "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__", "act-addComment": "commented on __card__: __comment__", "act-createBoard": "created __board__", "act-createCard": "added __card__ to __list__", diff --git a/i18n/sv.i18n.json b/i18n/sv.i18n.json index 50c780eeb..180e6f580 100644 --- a/i18n/sv.i18n.json +++ b/i18n/sv.i18n.json @@ -2,6 +2,8 @@ "accept": "Acceptera", "act-activity-notify": "[Wekan] Aktivitetsavisering", "act-addAttachment": "bifogade __attachment__ to __card__", + "act-addChecklist": "added checklist __checklist__ to __card__", + "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__", "act-addComment": "kommenterade __card__: __comment__", "act-createBoard": "skapade __board__", "act-createCard": "lade till __card__ to __list__", diff --git a/i18n/ta.i18n.json b/i18n/ta.i18n.json index 41dd9a70d..a1f810806 100644 --- a/i18n/ta.i18n.json +++ b/i18n/ta.i18n.json @@ -2,6 +2,8 @@ "accept": "Accept", "act-activity-notify": "[Wekan] Activity Notification", "act-addAttachment": "attached __attachment__ to __card__", + "act-addChecklist": "added checklist __checklist__ to __card__", + "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__", "act-addComment": "commented on __card__: __comment__", "act-createBoard": "created __board__", "act-createCard": "added __card__ to __list__", diff --git a/i18n/th.i18n.json b/i18n/th.i18n.json index 3469d512d..a5cee6929 100644 --- a/i18n/th.i18n.json +++ b/i18n/th.i18n.json @@ -2,6 +2,8 @@ "accept": "ยอมรับ", "act-activity-notify": "[Wekan] แจ้งกิจกรรม", "act-addAttachment": "แนบไฟล์ __attachment__ ไปยัง __card__", + "act-addChecklist": "added checklist __checklist__ to __card__", + "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__", "act-addComment": "ออกความเห็นที่ __card__: __comment__", "act-createBoard": "สร้าง __board__", "act-createCard": "เพิ่ม __card__ ไปยัง __list__", diff --git a/i18n/tr.i18n.json b/i18n/tr.i18n.json index 9c7d5a949..e64510b50 100644 --- a/i18n/tr.i18n.json +++ b/i18n/tr.i18n.json @@ -2,6 +2,8 @@ "accept": "Kabul Et", "act-activity-notify": "[Wekan] Etkinlik Bildirimi", "act-addAttachment": "__card__ kartına __attachment__ dosyasını ekledi", + "act-addChecklist": "added checklist __checklist__ to __card__", + "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__", "act-addComment": "__card__ kartına bir yorum bıraktı: __comment__", "act-createBoard": "__board__ panosunu oluşturdu", "act-createCard": "__card__ kartını ___list__ listesine ekledi.", diff --git a/i18n/uk.i18n.json b/i18n/uk.i18n.json index 1f89763ba..0da6ce1fe 100644 --- a/i18n/uk.i18n.json +++ b/i18n/uk.i18n.json @@ -2,6 +2,8 @@ "accept": "Прийняти", "act-activity-notify": "[Wekan] Сповіщення Діяльності", "act-addAttachment": "__attachment__ додане до __card__", + "act-addChecklist": "added checklist __checklist__ to __card__", + "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__", "act-addComment": "комментар в __card__: __comment__", "act-createBoard": "__board__ створенна", "act-createCard": "__card__ карта додана до __list__ листа", diff --git a/i18n/vi.i18n.json b/i18n/vi.i18n.json index 485a44982..93248d569 100644 --- a/i18n/vi.i18n.json +++ b/i18n/vi.i18n.json @@ -2,6 +2,8 @@ "accept": "Chấp nhận", "act-activity-notify": "[Wekan] Thông Báo Hoạt Động", "act-addAttachment": "đã đính kèm __attachment__ vào __card__", + "act-addChecklist": "added checklist __checklist__ to __card__", + "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__", "act-addComment": "đã bình luận trong __card__: __comment__", "act-createBoard": "đã tạo __board__", "act-createCard": "đã thêm __card__ vào __list__", diff --git a/i18n/zh-CN.i18n.json b/i18n/zh-CN.i18n.json index 298564766..f49f7b267 100644 --- a/i18n/zh-CN.i18n.json +++ b/i18n/zh-CN.i18n.json @@ -2,6 +2,8 @@ "accept": "接受", "act-activity-notify": "[Wekan] 活动通知", "act-addAttachment": "添加附件 __attachment__ 至卡片 __card__", + "act-addChecklist": "added checklist __checklist__ to __card__", + "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__", "act-addComment": "在 __card__ 发布评论: __comment__", "act-createBoard": "创建看板 __board__", "act-createCard": "添加卡片 __card__ 至列表 __list__", diff --git a/i18n/zh-TW.i18n.json b/i18n/zh-TW.i18n.json index 403e56662..23566314d 100644 --- a/i18n/zh-TW.i18n.json +++ b/i18n/zh-TW.i18n.json @@ -2,6 +2,8 @@ "accept": "接受", "act-activity-notify": "[Wekan] 活動通知", "act-addAttachment": "新增附件__attachment__至__card__", + "act-addChecklist": "added checklist __checklist__ to __card__", + "act-addChecklistItem": "added __checklistItem__ to checklist __checklist__ on __card__", "act-addComment": "評論__card__: __comment__", "act-createBoard": "完成新增 __board__", "act-createCard": "將__card__加入__list__", From b8ddef1a23934a9e13b01045ff48ec770a54d5bf Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Fri, 22 Sep 2017 22:23:39 +0300 Subject: [PATCH 03/21] Add translations (en/de/fi) for email notifications regarding checklists and checklist items. Thanks to umbertooo and xet7 ! Closes #1225 --- CHANGELOG.md | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index af0c659d8..8d59528b5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,15 @@ +# Upcoming Wekan release + +* [Add translations (en/de/fi) for email notifications regarding checklists and checklist + items](https://github.com/wekan/wekan/pull/1238). + +Thanks to GitHub users umbertooo and xet7 for their contributions. + # v0.39 2017-09-18 Wekan release This release adds the following new features: -* [Import checklist sort attributes from Wekan and Trello](https://github.com/wekan/wekan/pull/1226) +* [Import checklist sort attributes from Wekan and Trello](https://github.com/wekan/wekan/pull/1226). Thanks to GitHub user GhassenRjab for contributions. @@ -10,7 +17,7 @@ Thanks to GitHub user GhassenRjab for contributions. This release adds the following new features: -* [Reorder checklists. Move checklist item to another checklist.](https://github.com/wekan/wekan/pull/1215) +* [Reorder checklists. Move checklist item to another checklist.](https://github.com/wekan/wekan/pull/1215); * [Card title is now pre-filled in copy card dialog](https://github.com/wekan/wekan/pull/1214). Thanks to GitHub user frmwrk123 for contributions. From 6921452a7d6584b0e9cb1bccb4f0937315c841a8 Mon Sep 17 00:00:00 2001 From: Ghassen Rjab Date: Fri, 22 Sep 2017 22:35:07 +0100 Subject: [PATCH 04/21] Add migration script to add sort field to checklists and their items --- server/migrations.js | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/server/migrations.js b/server/migrations.js index 99125976c..2a99f564b 100644 --- a/server/migrations.js +++ b/server/migrations.js @@ -130,3 +130,29 @@ Migrations.add('add-member-isactive-field', () => { Boards.update(board._id, {$set: {members: newMemberSet}}, noValidate); }); }); + +Migrations.add('add-sort-checklists', () => { + Checklists.find().forEach((checklist, index) => { + if (!checklist.hasOwnProperty('sort')) { + Checklists.direct.update( + checklist._id, + { + $set: { + sort: index, + newItemIndex: checklist.items.length, + } + }, + noValidate + ); + } + checklist.items.forEach(function(item, index) { + if (!item.hasOwnProperty('sort')) { + Checklists.direct.update( + { _id: checklist._id, "items._id": item._id }, + { $set: { "items.$.sort": index } }, + noValidate + ); + } + }); + }); +}); From 20ba743f9b8a480eab963e585fdfa4c9a16fc9f0 Mon Sep 17 00:00:00 2001 From: Ghassen Rjab Date: Sat, 23 Sep 2017 01:02:44 +0100 Subject: [PATCH 05/21] Fix lint errors --- server/migrations.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/migrations.js b/server/migrations.js index 2a99f564b..40420e8ed 100644 --- a/server/migrations.js +++ b/server/migrations.js @@ -140,7 +140,7 @@ Migrations.add('add-sort-checklists', () => { $set: { sort: index, newItemIndex: checklist.items.length, - } + }, }, noValidate ); @@ -148,8 +148,8 @@ Migrations.add('add-sort-checklists', () => { checklist.items.forEach(function(item, index) { if (!item.hasOwnProperty('sort')) { Checklists.direct.update( - { _id: checklist._id, "items._id": item._id }, - { $set: { "items.$.sort": index } }, + { _id: checklist._id, 'items._id': item._id }, + { $set: { 'items.$.sort': index } }, noValidate ); } From e97c2c7bf0ab3213d0ac060af474367effe68af7 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sat, 23 Sep 2017 07:52:43 +0300 Subject: [PATCH 06/21] Add migration script to add sort field to checklists and their items. Thanks to GhassenRjab ! Related #876 --- CHANGELOG.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d59528b5..2c7add5d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,15 @@ # Upcoming Wekan release +This release adds the following new features: + * [Add translations (en/de/fi) for email notifications regarding checklists and checklist items](https://github.com/wekan/wekan/pull/1238). -Thanks to GitHub users umbertooo and xet7 for their contributions. +and fixes the following bugs: + +* [Checklist items are lost when moving items to another checklist](https://github.com/wekan/wekan/pull/1240). + +Thanks to GitHub users GhassenRjab, umbertooo and xet7 for their contributions. # v0.39 2017-09-18 Wekan release From 57d6180a7a432f2429e6deab1da1926ec692fd8e Mon Sep 17 00:00:00 2001 From: none Date: Sat, 23 Sep 2017 15:20:11 +0900 Subject: [PATCH 07/21] Allow admin to create user despite disabling registration throught rest api. --- models/users.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/models/users.js b/models/users.js index c2238cde0..9744d51cb 100644 --- a/models/users.js +++ b/models/users.js @@ -108,6 +108,10 @@ Users.attachSchema(new SimpleSchema({ type: Boolean, optional: true, }, + fromAdmin: { + type: Boolean, + optional: false, + }, })); // Search a user in the complete server database by its name or username. This @@ -435,6 +439,12 @@ if (Meteor.isServer) { user.isAdmin = true; return user; } + + if (options.from == 'admin') { + user.fromAdmin = true; + return user; + } + const disableRegistration = Settings.findOne().disableRegistration; if (!disableRegistration) { return user; @@ -524,6 +534,9 @@ if (Meteor.isServer) { Users.after.insert((userId, doc) => { + if (doc.fromAdmin) + return; + //invite user to corresponding boards const disableRegistration = Settings.findOne().disableRegistration; if (disableRegistration) { @@ -582,6 +595,7 @@ if (Meteor.isServer) { username: req.body.username, email: req.body.email, password: 'default', + from: 'admin' }); JsonRoutes.sendResult(res, { From 6e5d9f9bb656f2d96e2538f58dbd1c3179644e82 Mon Sep 17 00:00:00 2001 From: Ghassen Rjab Date: Sun, 24 Sep 2017 02:09:21 +0100 Subject: [PATCH 08/21] Remove newItemIndex of Checklist Collection from migration script We no longer need this field --- server/migrations.js | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/server/migrations.js b/server/migrations.js index 40420e8ed..767216231 100644 --- a/server/migrations.js +++ b/server/migrations.js @@ -136,12 +136,7 @@ Migrations.add('add-sort-checklists', () => { if (!checklist.hasOwnProperty('sort')) { Checklists.direct.update( checklist._id, - { - $set: { - sort: index, - newItemIndex: checklist.items.length, - }, - }, + { $set: { sort: index } }, noValidate ); } From 28eca2a11fd789b280b140bebf87c61a3e63f4f4 Mon Sep 17 00:00:00 2001 From: Ghassen Rjab Date: Sun, 24 Sep 2017 02:14:23 +0100 Subject: [PATCH 09/21] Update Checklist model to keep checklist item state when moved - Remove newItemIndex field (no longer needed) - Use Underscore.js to sort checklist items - Add helper method to generate new Items Ids so we can use it in model and in client - Add addFullItem method to add an item from object - Update sort when items are being added or removed --- models/checklists.js | 65 ++++++++++++++++++++++++++++++-------------- 1 file changed, 44 insertions(+), 21 deletions(-) diff --git a/models/checklists.js b/models/checklists.js index 35ef8ae15..b90656e45 100644 --- a/models/checklists.js +++ b/models/checklists.js @@ -44,11 +44,6 @@ Checklists.attachSchema(new SimpleSchema({ type: Number, decimal: true, }, - newItemIndex: { - type: Number, - decimal: true, - defaultValue: 0, - }, })); const self = Checklists; @@ -57,16 +52,8 @@ Checklists.helpers({ itemCount() { return this.items.length; }, - getItems() { - return this.items.sort(function (itemA, itemB) { - if (itemA.sort < itemB.sort) { - return -1; - } - if (itemA.sort > itemB.sort) { - return 1; - } - return 0; - }); + getItemsSorted() { + return _.sortBy(this.items, 'sort'); }, finishedCount() { return this.items.filter((item) => { @@ -83,6 +70,16 @@ Checklists.helpers({ const items = self.findOne({_id : this._id}).items; return _.pluck(items, '_id').indexOf(itemId); }, + getNewItemId() { + const itemCount = this.itemCount(); + let idx = 0; + if (itemCount > 0) { + const lastId = this.items[itemCount - 1]._id; + const lastIdSuffix = lastId.substr(this._id.length); + idx = parseInt(lastIdSuffix, 10) + 1; + } + return `${this._id}${idx}`; + }, }); Checklists.allow({ @@ -112,14 +109,40 @@ Checklists.mutations({ }, //for items in checklist addItem(title) { - const itemCount = this.itemCount(); - const _id = `${this._id}${this.newItemIndex}`; + const _id = this.getNewItemId(); return { - $addToSet: { items: { _id, title, isFinished: false, sort: itemCount } }, - $set: { newItemIndex: this.newItemIndex + 1}, + $addToSet: { + items: { + _id, title, + isFinished: false, + sort: this.itemCount(), + }, + }, }; }, + addFullItem(item) { + const itemsUpdate = {}; + this.items.forEach(function(iterItem, index) { + if (iterItem.sort >= item.sort) { + itemsUpdate[`items.${index}.sort`] = iterItem.sort + 1; + } + }); + if (!_.isEmpty(itemsUpdate)) { + self.direct.update({ _id: this._id }, { $set: itemsUpdate }); + } + return { $addToSet: { items: item } }; + }, removeItem(itemId) { + const item = this.getItem(itemId); + const itemsUpdate = {}; + this.items.forEach(function(iterItem, index) { + if (iterItem.sort > item.sort) { + itemsUpdate[`items.${index}.sort`] = iterItem.sort - 1; + } + }); + if (!_.isEmpty(itemsUpdate)) { + self.direct.update({ _id: this._id }, { $set: itemsUpdate }); + } return { $pull: { items: { _id: itemId } } }; }, editItem(itemId, title) { @@ -169,11 +192,11 @@ Checklists.mutations({ }, sortItems(itemIDs) { const validItems = []; - for (const itemID of itemIDs) { + itemIDs.forEach((itemID) => { if (this.getItem(itemID)) { validItems.push(this.itemIndex(itemID)); } - } + }); const modifiedValues = {}; for (let i = 0; i < validItems.length; i++) { modifiedValues[`items.${validItems[i]}.sort`] = i; From c3cccfc66ec4481959941fea25340595280cdfa2 Mon Sep 17 00:00:00 2001 From: Ghassen Rjab Date: Sun, 24 Sep 2017 02:15:33 +0100 Subject: [PATCH 10/21] Update Checklists client Use new methods added in Checklist model --- client/components/cards/checklists.jade | 2 +- client/components/cards/checklists.js | 24 +++++++++++++----------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/client/components/cards/checklists.jade b/client/components/cards/checklists.jade index 7ecc5dd39..e1dd1d147 100644 --- a/client/components/cards/checklists.jade +++ b/client/components/cards/checklists.jade @@ -47,7 +47,7 @@ template(name="editChecklistItemForm") template(name="checklistItems") .checklist-items.js-checklist-items - each item in checklist.getItems + each item in checklist.getItemsSorted +inlinedForm(classNames="js-edit-checklist-item" item = item checklist = checklist) +editChecklistItemForm(type = 'item' item = item checklist = checklist) else diff --git a/client/components/cards/checklists.js b/client/components/cards/checklists.js index bd9d275a0..ba3384a98 100644 --- a/client/components/cards/checklists.js +++ b/client/components/cards/checklists.js @@ -20,24 +20,26 @@ function initSorting(items) { }); items.sortable('cancel'); const formerParent = ui.item.parents('.js-checklist-items'); - let checklist = Blaze.getData(parent.get(0)).checklist; + const checklist = Blaze.getData(parent.get(0)).checklist; const oldChecklist = Blaze.getData(formerParent.get(0)).checklist; if (oldChecklist._id !== checklist._id) { const currentItem = Blaze.getData(ui.item.get(0)).item; for (let i = 0; i < orderedItems.length; i++) { - let itemId = orderedItems[i]; + const itemId = orderedItems[i]; if (itemId !== currentItem._id) continue; - checklist.addItem(currentItem.title); - checklist = Checklists.findOne({_id: checklist._id}); - itemId = checklist._id + (checklist.newItemIndex - 1); - if (currentItem.finished) { - checklist.finishItem(itemId); - } - orderedItems[i] = itemId; - oldChecklist.removeItem(currentItem._id); + const newItem = { + _id: checklist.getNewItemId(), + title: currentItem.title, + sort: i, + isFinished: currentItem.isFinished, + }; + checklist.addFullItem(newItem); + orderedItems[i] = currentItem._id; + oldChecklist.removeItem(itemId); } + } else { + checklist.sortItems(orderedItems); } - checklist.sortItems(orderedItems); }, }); } From 3fa969eb2621e9e92e0267c5098d339eead9d582 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rio=20Orlick=C3=BD?= Date: Sun, 24 Sep 2017 15:17:14 +0200 Subject: [PATCH 11/21] #1233 Added plus button to add card on top of the list --- client/components/lists/list.styl | 5 ++++- client/components/lists/listHeader.jade | 7 ++++--- client/components/lists/listHeader.js | 15 +++++++-------- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/client/components/lists/list.styl b/client/components/lists/list.styl index cf939a6ef..5e20476e3 100644 --- a/client/components/lists/list.styl +++ b/client/components/lists/list.styl @@ -69,13 +69,16 @@ padding-left: 10px color: #a6a6a6 - .list-header-menu-icon + .list-header-menu position: absolute padding: 7px margin-top: 1px top: -@padding right: -@padding + .list-header-plus-icon + color: #a6a6a6 + .list-body flex: 1 display: flex diff --git a/client/components/lists/listHeader.jade b/client/components/lists/listHeader.jade index 119055861..68336320d 100644 --- a/client/components/lists/listHeader.jade +++ b/client/components/lists/listHeader.jade @@ -13,7 +13,9 @@ template(name="listHeader") if currentUser.isBoardMember if isWatching i.list-header-watch-icon.fa.fa-eye - a.list-header-menu-icon.fa.fa-navicon.js-open-list-menu + div.list-header-menu + a.js-add-card.fa.fa-plus.list-header-plus-icon + a.fa.fa-navicon.js-open-list-menu template(name="editListTitleForm") .list-composer @@ -28,10 +30,9 @@ template(name="listActionPopup") unless currentUser.isCommentOnly hr ul.pop-over-list - li: a.js-add-card {{_ 'add-card'}} if cards.count li: a.js-select-cards {{_ 'list-select-cards'}} - hr + hr ul.pop-over-list li: a.js-close-list {{_ 'archive-list'}} hr diff --git a/client/components/lists/listHeader.js b/client/components/lists/listHeader.js index 1ad9f9dd5..7fe42884d 100644 --- a/client/components/lists/listHeader.js +++ b/client/components/lists/listHeader.js @@ -24,6 +24,13 @@ BlazeComponent.extendComponent({ events() { return [{ 'click .js-open-list-menu': Popup.open('listAction'), + 'click .js-add-card' () { + const listDom = document.getElementById(`js-list-${this.currentData()._id}`); + const listComponent = BlazeComponent.getComponentForElement(listDom); + listComponent.openForm({ + position: 'top', + }); + }, submit: this.editTitle, }]; }, @@ -36,14 +43,6 @@ Template.listActionPopup.helpers({ }); Template.listActionPopup.events({ - 'click .js-add-card' () { - const listDom = document.getElementById(`js-list-${this._id}`); - const listComponent = BlazeComponent.getComponentForElement(listDom); - listComponent.openForm({ - position: 'top', - }); - Popup.close(); - }, 'click .js-list-subscribe' () {}, 'click .js-select-cards' () { const cardIds = this.allCards().map((card) => card._id); From 802dc94363ac6e1fed963e1dd82cb3f6aa5166b0 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sun, 24 Sep 2017 16:44:24 +0300 Subject: [PATCH 12/21] Keep state of checklist items when moved to another checklist. Thanks to GhassenRjab ! Related #876 --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c7add5d9..60df23e3f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,8 @@ This release adds the following new features: and fixes the following bugs: -* [Checklist items are lost when moving items to another checklist](https://github.com/wekan/wekan/pull/1240). +* [Checklist items are lost when moving items to another checklist](https://github.com/wekan/wekan/pull/1240); +* [Keep state of checklist items when moved to another checklist](https://github.com/wekan/wekan/pull/1242). Thanks to GitHub users GhassenRjab, umbertooo and xet7 for their contributions. From d0d2406186be79d9a04185a31d616feb1d597f71 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sun, 24 Sep 2017 17:00:40 +0300 Subject: [PATCH 13/21] Added plus button to add card on top of the list. Thanks to mario-orlicky ! Closes #1233 --- CHANGELOG.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 60df23e3f..27470c6e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,14 +3,15 @@ This release adds the following new features: * [Add translations (en/de/fi) for email notifications regarding checklists and checklist - items](https://github.com/wekan/wekan/pull/1238). + items](https://github.com/wekan/wekan/pull/1238); +* [Added plus button to add card on top of the list](https://github.com/wekan/wekan/pull/1244). and fixes the following bugs: * [Checklist items are lost when moving items to another checklist](https://github.com/wekan/wekan/pull/1240); * [Keep state of checklist items when moved to another checklist](https://github.com/wekan/wekan/pull/1242). -Thanks to GitHub users GhassenRjab, umbertooo and xet7 for their contributions. +Thanks to GitHub users GhassenRjab, mario-orlicky, umbertooo and xet7 for their contributions. # v0.39 2017-09-18 Wekan release From f7a1c4896bc9d80a864c71a272827dc6d2cbddaa Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sun, 24 Sep 2017 17:08:28 +0300 Subject: [PATCH 14/21] Fix lint errors. --- models/users.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/models/users.js b/models/users.js index 9744d51cb..505ed93e1 100644 --- a/models/users.js +++ b/models/users.js @@ -440,7 +440,7 @@ if (Meteor.isServer) { return user; } - if (options.from == 'admin') { + if (options.from === 'admin') { user.fromAdmin = true; return user; } @@ -535,7 +535,7 @@ if (Meteor.isServer) { Users.after.insert((userId, doc) => { if (doc.fromAdmin) - return; + return; //invite user to corresponding boards const disableRegistration = Settings.findOne().disableRegistration; @@ -595,7 +595,7 @@ if (Meteor.isServer) { username: req.body.username, email: req.body.email, password: 'default', - from: 'admin' + from: 'admin', }); JsonRoutes.sendResult(res, { From d4d20d2a43a8062f419a33f4ba85977d8c1dd3a0 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Mon, 25 Sep 2017 00:49:07 +0300 Subject: [PATCH 15/21] REST API: Create user despite disabling registration. Thanks to soohwa ! Closes #1232 --- CHANGELOG.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 27470c6e1..8e02ecbcd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,14 +4,15 @@ This release adds the following new features: * [Add translations (en/de/fi) for email notifications regarding checklists and checklist items](https://github.com/wekan/wekan/pull/1238); -* [Added plus button to add card on top of the list](https://github.com/wekan/wekan/pull/1244). +* [Added plus button to add card on top of the list](https://github.com/wekan/wekan/pull/1244); +* [REST API: Create user despite disabling registration](https://github.com/wekan/wekan/issues/1232). and fixes the following bugs: * [Checklist items are lost when moving items to another checklist](https://github.com/wekan/wekan/pull/1240); * [Keep state of checklist items when moved to another checklist](https://github.com/wekan/wekan/pull/1242). -Thanks to GitHub users GhassenRjab, mario-orlicky, umbertooo and xet7 for their contributions. +Thanks to GitHub users GhassenRjab, mario-orlicky, soohwa, umbertooo and xet7 for their contributions. # v0.39 2017-09-18 Wekan release From 415343bbd0184059ab5b4c838e26bc14fa2c7627 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Mon, 25 Sep 2017 01:02:00 +0300 Subject: [PATCH 16/21] v0.40 --- CHANGELOG.md | 2 +- package.json | 2 +- sandstorm-pkgdef.capnp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8e02ecbcd..ae70f8e4a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Upcoming Wekan release +# v0.40 2017-09-25 Wekan release This release adds the following new features: diff --git a/package.json b/package.json index aacb2f90d..8025199bf 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "0.39.0", + "version": "0.40.0", "description": "The open-source Trello-like kanban", "private": true, "scripts": { diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index feb000f10..c8940a94f 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 = 26, + appVersion = 27, # Increment this for every release. - appMarketingVersion = (defaultText = "0.39.0~2017-09-18"), + appMarketingVersion = (defaultText = "0.40.0~2017-09-25"), # Human-readable presentation of the app version. minUpgradableAppVersion = 0, From fb79c8786ae32d6d2d46738815ed2b5f43a3f870 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Mon, 25 Sep 2017 13:16:07 +0300 Subject: [PATCH 17/21] v0.41 --- CHANGELOG.md | 8 ++++++++ models/users.js | 14 -------------- package.json | 2 +- sandstorm-pkgdef.capnp | 4 ++-- 4 files changed, 11 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ae70f8e4a..fc4c12fc9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +# v0.41 2017-09-25 Wekan release + +This release fixes the following bugs: + +* [Can't create user and login after install. Reverting REST API: Create user despite disabling registration](https://github.com/wekan/wekan/issues/1249). + +Thanks to GitHub user xet7 for contributions. + # v0.40 2017-09-25 Wekan release This release adds the following new features: diff --git a/models/users.js b/models/users.js index 505ed93e1..c2238cde0 100644 --- a/models/users.js +++ b/models/users.js @@ -108,10 +108,6 @@ Users.attachSchema(new SimpleSchema({ type: Boolean, optional: true, }, - fromAdmin: { - type: Boolean, - optional: false, - }, })); // Search a user in the complete server database by its name or username. This @@ -439,12 +435,6 @@ if (Meteor.isServer) { user.isAdmin = true; return user; } - - if (options.from === 'admin') { - user.fromAdmin = true; - return user; - } - const disableRegistration = Settings.findOne().disableRegistration; if (!disableRegistration) { return user; @@ -534,9 +524,6 @@ if (Meteor.isServer) { Users.after.insert((userId, doc) => { - if (doc.fromAdmin) - return; - //invite user to corresponding boards const disableRegistration = Settings.findOne().disableRegistration; if (disableRegistration) { @@ -595,7 +582,6 @@ if (Meteor.isServer) { username: req.body.username, email: req.body.email, password: 'default', - from: 'admin', }); JsonRoutes.sendResult(res, { diff --git a/package.json b/package.json index 8025199bf..8a32b28a8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "0.40.0", + "version": "0.41.0", "description": "The open-source Trello-like kanban", "private": true, "scripts": { diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index c8940a94f..aa5fe05d9 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 = 27, + appVersion = 28, # Increment this for every release. - appMarketingVersion = (defaultText = "0.40.0~2017-09-25"), + appMarketingVersion = (defaultText = "0.41.0~2017-09-25"), # Human-readable presentation of the app version. minUpgradableAppVersion = 0, From c4fd729b34910cf247f0a7ddfd473e5040b0b6bf Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Mon, 25 Sep 2017 18:30:26 +0300 Subject: [PATCH 18/21] Remove emoji support, because it breaks MAC addresses, urls, code etc. Thanks to xet7 ! Closes #1248, closes #743, closes #643, closes #323 --- .meteor/packages | 1 - .meteor/versions | 1 - CHANGELOG.md | 6 ++++++ client/components/main/editor.jade | 5 ++--- client/components/main/editor.js | 19 ------------------- 5 files changed, 8 insertions(+), 24 deletions(-) diff --git a/.meteor/packages b/.meteor/packages index 7c04f2075..792efb79c 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -69,7 +69,6 @@ mquandalle:mousetrap-bindglobal mquandalle:perfect-scrollbar peerlibrary:blaze-components@=0.15.1 perak:markdown -seriousm:emoji-continued templates:tabs verron:autosize simple:json-routes diff --git a/.meteor/versions b/.meteor/versions index 416093aa5..14a805916 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -129,7 +129,6 @@ reactive-var@1.0.11 reload@1.1.11 retry@1.0.9 routepolicy@1.0.12 -seriousm:emoji-continued@1.4.0 service-configuration@1.0.11 session@1.1.7 sha@1.0.9 diff --git a/CHANGELOG.md b/CHANGELOG.md index fc4c12fc9..dbd7e981a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# Upcoming Wekan release + +* [Remove emoji support, because it breaks MAC addresses, urls, code etc](https://github.com/wekan/wekan/issues/1248). + +Thanks to GitHub user xet7 for contributions. + # v0.41 2017-09-25 Wekan release This release fixes the following bugs: diff --git a/client/components/main/editor.jade b/client/components/main/editor.jade index f10d64a1d..31f533e69 100644 --- a/client/components/main/editor.jade +++ b/client/components/main/editor.jade @@ -9,6 +9,5 @@ template(name="editor") template(name="viewer") .viewer +mentions - +emoji - +markdown - {{> UI.contentBlock }} + +markdown + {{> UI.contentBlock }} diff --git a/client/components/main/editor.js b/client/components/main/editor.js index 5987b7720..ea24f5189 100755 --- a/client/components/main/editor.js +++ b/client/components/main/editor.js @@ -4,25 +4,6 @@ Template.editor.onRendered(() => { autosize($textarea); $textarea.escapeableTextComplete([ - // Emoji - { - match: /\B:([\-+\w]*)$/, - search(term, callback) { - callback(Emoji.values.map((emoji) => { - return emoji.includes(term) ? emoji : null; - }).filter(Boolean)); - }, - template(value) { - const imgSrc = Emoji.baseImagePath + value; - const image = ``; - return image + value; - }, - replace(value) { - return `:${value}:`; - }, - index: 1, - }, - // User mentions { match: /\B@([\w.]*)$/, From f0b7f349289a6bf573563b6408cc9f66da18a292 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Mon, 25 Sep 2017 18:40:33 +0300 Subject: [PATCH 19/21] v0.42 --- CHANGELOG.md | 4 +++- package.json | 2 +- sandstorm-pkgdef.capnp | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dbd7e981a..402e886d0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,6 @@ -# Upcoming Wekan release +# v0.42 2017-09-25 Wekan release + +This release fixes the following bugs: * [Remove emoji support, because it breaks MAC addresses, urls, code etc](https://github.com/wekan/wekan/issues/1248). diff --git a/package.json b/package.json index 8a32b28a8..733eb1ccf 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "0.41.0", + "version": "0.42.0", "description": "The open-source Trello-like kanban", "private": true, "scripts": { diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index aa5fe05d9..df1b01a38 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 = 28, + appVersion = 29, # Increment this for every release. - appMarketingVersion = (defaultText = "0.41.0~2017-09-25"), + appMarketingVersion = (defaultText = "0.42.0~2017-09-25"), # Human-readable presentation of the app version. minUpgradableAppVersion = 0, From a62c8eb5a02b838e0eed809032cba31f64a122c0 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Mon, 25 Sep 2017 19:40:41 +0300 Subject: [PATCH 20/21] Add emojis back, because removing them broke local dev Sandstorm. Thanks to xet7 ! Opens #1248, opens #743, opens #643, opens #323 --- .meteor/packages | 1 + .meteor/versions | 1 + CHANGELOG.md | 8 ++++++++ client/components/main/editor.jade | 5 +++-- client/components/main/editor.js | 19 +++++++++++++++++++ 5 files changed, 32 insertions(+), 2 deletions(-) diff --git a/.meteor/packages b/.meteor/packages index 792efb79c..7c04f2075 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -69,6 +69,7 @@ mquandalle:mousetrap-bindglobal mquandalle:perfect-scrollbar peerlibrary:blaze-components@=0.15.1 perak:markdown +seriousm:emoji-continued templates:tabs verron:autosize simple:json-routes diff --git a/.meteor/versions b/.meteor/versions index 14a805916..416093aa5 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -129,6 +129,7 @@ reactive-var@1.0.11 reload@1.1.11 retry@1.0.9 routepolicy@1.0.12 +seriousm:emoji-continued@1.4.0 service-configuration@1.0.11 session@1.1.7 sha@1.0.9 diff --git a/CHANGELOG.md b/CHANGELOG.md index 402e886d0..5a22e813b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +# v0.43 2017-09-25 Wekan release + +This release fixes the following bugs: + +* [Add emojis back, because removing them broke local dev Sandstorm](https://github.com/wekan/wekan/issues/1248). + +Thanks to GitHub user xet7 for contributions. + # v0.42 2017-09-25 Wekan release This release fixes the following bugs: diff --git a/client/components/main/editor.jade b/client/components/main/editor.jade index 31f533e69..f10d64a1d 100644 --- a/client/components/main/editor.jade +++ b/client/components/main/editor.jade @@ -9,5 +9,6 @@ template(name="editor") template(name="viewer") .viewer +mentions - +markdown - {{> UI.contentBlock }} + +emoji + +markdown + {{> UI.contentBlock }} diff --git a/client/components/main/editor.js b/client/components/main/editor.js index ea24f5189..5987b7720 100755 --- a/client/components/main/editor.js +++ b/client/components/main/editor.js @@ -4,6 +4,25 @@ Template.editor.onRendered(() => { autosize($textarea); $textarea.escapeableTextComplete([ + // Emoji + { + match: /\B:([\-+\w]*)$/, + search(term, callback) { + callback(Emoji.values.map((emoji) => { + return emoji.includes(term) ? emoji : null; + }).filter(Boolean)); + }, + template(value) { + const imgSrc = Emoji.baseImagePath + value; + const image = ``; + return image + value; + }, + replace(value) { + return `:${value}:`; + }, + index: 1, + }, + // User mentions { match: /\B@([\w.]*)$/, From eb945f26a3be316fb2ae4452d6db45a11f8b91d4 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Mon, 25 Sep 2017 19:47:10 +0300 Subject: [PATCH 21/21] v0.43 --- package.json | 2 +- sandstorm-pkgdef.capnp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 733eb1ccf..0cad0e289 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "0.42.0", + "version": "0.43.0", "description": "The open-source Trello-like kanban", "private": true, "scripts": { diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index df1b01a38..07f1c8ef6 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 = 29, + appVersion = 30, # Increment this for every release. - appMarketingVersion = (defaultText = "0.42.0~2017-09-25"), + appMarketingVersion = (defaultText = "0.43.0~2017-09-25"), # Human-readable presentation of the app version. minUpgradableAppVersion = 0,