Merge branch 'devel'

CHANGELOG.md

@@ -1,3 +1,11 @@
+# v1.25 2018-08-09 Wekan release
+
+This release fixes the following bugs:
+
+- [Fix showing only the cards of the current board in calendar view](https://github.com/wekan/wekan/pull/1822).
+
+Thanks to GitHub user Yanonix for contributions.
+
 # v1.24 2018-08-09 Wekan release
 
 This release add the following new features:

models/boards.js

@@ -372,6 +372,7 @@ Boards.helpers({
 
   cardsInInterval(start, end) {
     return Cards.find({
+      boardId: this._id,
       $or: [
         {
           startAt: {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "1.24.0",
+  "version": "1.25.0",
   "description": "The open-source Trello-like 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 = 109,
+    appVersion = 110,
     # Increment this for every release.
 
-    appMarketingVersion = (defaultText = "1.24.0~2018-08-09"),
+    appMarketingVersion = (defaultText = "1.25.0~2018-08-09"),
     # Human-readable presentation of the app version.
 
     minUpgradableAppVersion = 0,