summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md11
-rw-r--r--Stackerfile.yml2
-rw-r--r--models/attachments.js4
-rw-r--r--models/cardComments.js2
-rw-r--r--models/cards.js6
-rw-r--r--models/checklistItems.js10
-rw-r--r--models/checklists.js4
-rw-r--r--package.json2
-rw-r--r--sandstorm-pkgdef.capnp4
9 files changed, 40 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9fd8ec46..c9e7dad7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+# v2.59 2019-04-06 Wekan release
+
+This release fixes the following bugs:
+
+- [Add variables for activity notifications, Fixes #2285](https://github.com/wekan/wekan/pull/2320).
+ Thanks to rinnaz.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
# v2.58 2019-04-06 Wekan release
This release adds the following new features:
@@ -7,7 +16,7 @@ This release adds the following new features:
- [Add Duplicate Board tooltip, and remove adding text "Copy" to duplicated board](https://github.com/wekan/wekan/commit/0f15b6d1982c383f76e8411cb501ff27e8febd42).
Thanks to xet7.
-amd fixes the following bugs:
+and fixes the following bugs:
- [Add proper variables for unjoin card](https://github.com/wekan/wekan/pull/2313).
Thanks to chotaire.
diff --git a/Stackerfile.yml b/Stackerfile.yml
index f01bea82..5b0761ed 100644
--- a/Stackerfile.yml
+++ b/Stackerfile.yml
@@ -1,5 +1,5 @@
appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928
-appVersion: "v2.58.0"
+appVersion: "v2.59.0"
files:
userUploads:
- README.md
diff --git a/models/attachments.js b/models/attachments.js
index f870861b..fb32f497 100644
--- a/models/attachments.js
+++ b/models/attachments.js
@@ -72,6 +72,8 @@ if (Meteor.isServer) {
attachmentId: doc._id,
boardId: doc.boardId,
cardId: doc.cardId,
+ listId: doc.listId,
+ swimlaneId: doc.swimlaneId,
});
} else {
// Don't add activity about adding the attachment as the activity
@@ -96,6 +98,8 @@ if (Meteor.isServer) {
activityType: 'deleteAttachment',
boardId: doc.boardId,
cardId: doc.cardId,
+ listId: doc.listId,
+ swimlaneId: doc.swimlaneId,
});
});
}
diff --git a/models/cardComments.js b/models/cardComments.js
index fcb97104..2bcb5453 100644
--- a/models/cardComments.js
+++ b/models/cardComments.js
@@ -87,6 +87,8 @@ function commentCreation(userId, doc){
boardId: doc.boardId,
cardId: doc.cardId,
commentId: doc._id,
+ listId: doc.listId,
+ swimlaneId: doc.swimlaneId,
});
}
diff --git a/models/cards.js b/models/cards.js
index 6de95123..7430ae52 100644
--- a/models/cards.js
+++ b/models/cards.js
@@ -1356,6 +1356,7 @@ function cardState(userId, doc, fieldNames) {
boardId: doc.boardId,
listId: doc.listId,
cardId: doc._id,
+ swimlaneId: doc.swimlaneId,
});
} else {
Activities.insert({
@@ -1365,6 +1366,7 @@ function cardState(userId, doc, fieldNames) {
listName: Lists.findOne(doc.listId).title,
listId: doc.listId,
cardId: doc._id,
+ swimlaneId: doc.swimlaneId,
});
}
}
@@ -1426,6 +1428,8 @@ function cardLabels(userId, doc, fieldNames, modifier) {
activityType: 'addedLabel',
boardId: doc.boardId,
cardId: doc._id,
+ listId: doc.listId,
+ swimlaneId: doc.swimlaneId,
};
Activities.insert(act);
}
@@ -1442,6 +1446,8 @@ function cardLabels(userId, doc, fieldNames, modifier) {
activityType: 'removedLabel',
boardId: doc.boardId,
cardId: doc._id,
+ listId: doc.listId,
+ swimlaneId: doc.swimlaneId,
});
}
}
diff --git a/models/checklistItems.js b/models/checklistItems.js
index c46fe9bd..013fee04 100644
--- a/models/checklistItems.js
+++ b/models/checklistItems.js
@@ -95,6 +95,8 @@ function itemCreation(userId, doc) {
checklistId: doc.checklistId,
checklistItemId: doc._id,
checklistItemName:doc.title,
+ listId: doc.listId,
+ swimlaneId: doc.swimlaneId,
});
}
@@ -121,6 +123,8 @@ function publishCheckActivity(userId, doc){
checklistId: doc.checklistId,
checklistItemId: doc._id,
checklistItemName:doc.title,
+ listId: doc.listId,
+ swimlaneId: doc.swimlaneId,
};
Activities.insert(act);
}
@@ -138,6 +142,8 @@ function publishChekListCompleted(userId, doc){
boardId,
checklistId: doc.checklistId,
checklistName: checkList.title,
+ listId: doc.listId,
+ swimlaneId: doc.swimlaneId,
};
Activities.insert(act);
}
@@ -169,6 +175,8 @@ function publishChekListUncompleted(userId, doc){
boardId,
checklistId: doc.checklistId,
checklistName: checkList.title,
+ listId: doc.listId,
+ swimlaneId: doc.swimlaneId,
};
Activities.insert(act);
}
@@ -207,6 +215,8 @@ if (Meteor.isServer) {
checklistId: doc.checklistId,
checklistItemId: doc._id,
checklistItemName:doc.title,
+ listId: doc.listId,
+ swimlaneId: doc.swimlaneId,
});
});
}
diff --git a/models/checklists.js b/models/checklists.js
index 9e763f1a..d5063faf 100644
--- a/models/checklists.js
+++ b/models/checklists.js
@@ -135,6 +135,8 @@ if (Meteor.isServer) {
boardId: Cards.findOne(doc.cardId).boardId,
checklistId: doc._id,
checklistName:doc.title,
+ listId: doc.listId,
+ swimlaneId: doc.swimlaneId,
});
});
@@ -152,6 +154,8 @@ if (Meteor.isServer) {
boardId: Cards.findOne(doc.cardId).boardId,
checklistId: doc._id,
checklistName:doc.title,
+ listId: doc.listId,
+ swimlaneId: doc.swimlaneId,
});
diff --git a/package.json b/package.json
index 19f7d77f..945d4e67 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "wekan",
- "version": "v2.58.0",
+ "version": "v2.59.0",
"description": "Open-Source kanban",
"private": true,
"scripts": {
diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp
index b47cf8b2..86887776 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 = 260,
+ appVersion = 261,
# Increment this for every release.
- appMarketingVersion = (defaultText = "2.58.0~2019-04-06"),
+ appMarketingVersion = (defaultText = "2.59.0~2019-04-06"),
# Human-readable presentation of the app version.
minUpgradableAppVersion = 0,