Merge branch 'edge' into meteor-1.8

CHANGELOG.md

@@ -1,3 +1,15 @@
+# v2.46 2019-03-13 Wekan release
+
+This release fixes the following bugs:
+
+- [Fix watchers undefined](https://github.com/wekan/wekan/pull/2253).
+  Thanks to justinr1234.
+- [Revert hiding of Subtask boards](https://github.com/wekan/wekan/commit/1968b7da31d75757fd6383417d729ff6af6bbc5b)
+  because of feedback from Wekan users, that need Subtask boards to be visible.
+  Thanks to xet7.
+
+Thanks to above GitHub users and translators for their translations.
+
 # v2.45 2019-03-11 Wekan release
 
 This release fixes the following bugs, thanks to andresmanelli:
@@ -36,7 +48,7 @@ Thanks to above Wekan contributors for their contributions.
 
 This release adds the following new features, thanks to xet7:
 
-- [Hide Subtask boards from All Boards](https://github.com/wekan/wekan/issues/1990).
+- [Hide Subtask boards from All Boards](https://github.com/wekan/wekan/issues/1990). This was reverted in Wekan v2.46 to make Subtask boards visible again.
 - [Order All Boards by Starred, Color, Title and Description](https://github.com/wekan/wekan/commit/856872815292590e0c4eff2848ea1b857a318dc4).
 - [HTTP header automatic login](https://github.com/wekan/wekan/commit/ff825d6123ecfd033ccb08ce97c11cefee676104)
   for [3rd party authentication server method](https://github.com/wekan/wekan/issues/2019) like siteminder, and any webserver that

Stackerfile.yml

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

client/components/boards/boardsList.js

@@ -25,7 +25,6 @@ BlazeComponent.extendComponent({
       archived: false,
       'members.userId': Meteor.userId(),
       type: 'board',
-      subtasksDefaultListId: null,
     }, { sort: [['stars', 'desc'], ['color', 'asc'], ['title', 'asc'], ['description', 'asc'], ['_id', 'asc']] });
   },
   isStarred() {

i18n/fr.i18n.json

@@ -567,8 +567,8 @@
     "activity-added-label-card": "a ajouté l'étiquette '%s'",
     "activity-removed-label-card": "a supprimé l'étiquette '%s'",
     "activity-delete-attach-card": "a supprimé une pièce jointe",
-    "activity-set-customfield": "set custom field '%s' to '%s' in %s",
-    "activity-unset-customfield": "unset custom field '%s' in %s",
+    "activity-set-customfield": "a défini le champ personnalisé '%s' à '%s' dans %s",
+    "activity-unset-customfield": "a effacé le champ personnalisé '%s' dans %s",
     "r-rule": "Règle",
     "r-add-trigger": "Ajouter un déclencheur",
     "r-add-action": "Ajouter une action",

i18n/ru.i18n.json

@@ -567,8 +567,8 @@
     "activity-added-label-card": "добавил метку '%s'",
     "activity-removed-label-card": "удалил метку '%s'",
     "activity-delete-attach-card": "удалил вложение",
-    "activity-set-customfield": "set custom field '%s' to '%s' in %s",
-    "activity-unset-customfield": "unset custom field '%s' in %s",
+    "activity-set-customfield": "сменил значение поля '%s' на '%s' в карточке %s",
+    "activity-unset-customfield": "очистил поле '%s' в карточке %s",
     "r-rule": "Правило",
     "r-add-trigger": "Задать условие",
     "r-add-action": "Задать действие",

models/activities.js

@@ -113,9 +113,11 @@ if (Meteor.isServer) {
     }
     if (activity.oldBoardId) {
       const oldBoard = activity.oldBoard();
-      watchers = _.union(watchers, oldBoard.watchers || []);
-      params.oldBoard = oldBoard.title;
-      params.oldBoardId = activity.oldBoardId;
+      if (oldBoard) {
+        watchers = _.union(watchers, oldBoard.watchers || []);
+        params.oldBoard = oldBoard.title;
+        params.oldBoardId = activity.oldBoardId;
+      }
     }
     if (activity.memberId) {
       participants = _.union(participants, [activity.memberId]);
@@ -129,15 +131,19 @@ if (Meteor.isServer) {
     }
     if (activity.oldListId) {
       const oldList = activity.oldList();
-      watchers = _.union(watchers, oldList.watchers || []);
-      params.oldList = oldList.title;
-      params.oldListId = activity.oldListId;
+      if (oldList) {
+        watchers = _.union(watchers, oldList.watchers || []);
+        params.oldList = oldList.title;
+        params.oldListId = activity.oldListId;
+      }
     }
     if (activity.oldSwimlaneId) {
       const oldSwimlane = activity.oldSwimlane();
-      watchers = _.union(watchers, oldSwimlane.watchers || []);
-      params.oldSwimlane = oldSwimlane.title;
-      params.oldSwimlaneId = activity.oldSwimlaneId;
+      if (oldSwimlane) {
+        watchers = _.union(watchers, oldSwimlane.watchers || []);
+        params.oldSwimlane = oldSwimlane.title;
+        params.oldSwimlaneId = activity.oldSwimlaneId;
+      }
     }
     if (activity.cardId) {
       const card = activity.card();

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "v2.45.0",
+  "version": "v2.46.0",
   "description": "Open-Source kanban",
   "private": true,
   "scripts": {

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 = 247,
+    appVersion = 248,
     # Increment this for every release.
 
-    appMarketingVersion = (defaultText = "2.45.0~2019-03-11"),
+    appMarketingVersion = (defaultText = "2.46.0~2019-03-13"),
     # Human-readable presentation of the app version.
 
     minUpgradableAppVersion = 0,