Merge remote-tracking branch 'upstream/master'

9 files changed, 38 insertions, 10 deletions

diff --git a/.meteor-1.6-snap/.meteor/packages b/.meteor-1.6-snap/.meteor/packages
index 8ba42068..7030dd39 100644
--- a/.meteor-1.6-snap/.meteor/packages
+++ b/.meteor-1.6-snap/.meteor/packages
@@ -94,3 +94,5 @@ wekan-markdown
 konecty:mongo-counter
 percolate:synced-cron
 easylogic:summernote
+cfs:filesystem
+
diff --git a/.meteor-1.6-snap/.meteor/versions b/.meteor-1.6-snap/.meteor/versions
index 48e3d06f..896a9177 100644
--- a/.meteor-1.6-snap/.meteor/versions
+++ b/.meteor-1.6-snap/.meteor/versions
@@ -30,6 +30,7 @@ cfs:collection@0.5.5
 cfs:collection-filters@0.2.4
 cfs:data-man@0.0.6
 cfs:file@0.1.17
+cfs:filesystem@0.1.2
 cfs:gridfs@0.0.34
 cfs:http-methods@0.0.32
 cfs:http-publish@0.0.13
diff --git a/.meteor-1.6-snap/package.json b/.meteor-1.6-snap/package.json
index 53f56490..cff817b0 100644
--- a/.meteor-1.6-snap/package.json
+++ b/.meteor-1.6-snap/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "v3.11.0",
+  "version": "v3.13.0",
   "description": "Open-Source kanban",
   "private": true,
   "scripts": {
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a85b6561..4cf4b518 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,27 @@
-# Upcoming Wekan release
+# v3.13 2019-08-09 Wekan relese
 
-This release fixes the following bugs:
+Update translations. Thanks to translators.
 
+# v3.12 2019-08-09 Wekan release
+
+This release adds the following new features:
+
+- [Allowing wekan server admin to specify the attachments to be uploaded to server
+  file system instead of mongodb by specifying a system
+  env var: ATTACHMENTS_STORE_PATH](https://github.com/wekan/wekan/pull/2603).
+  The only caveat for this is if it's not a brand new wekan, if the wekan
+  server admin switchs to this setting, their old attachments won't be available
+  anymore, unless someone make a script to export them out to the filesystem.
+  Thanks to whowillcare.
+- [Allowing user to insert video, link and image, or paste in html with sanitization.
+  In user comments display area, images can be clicked and shown as
+  swipebox](https://github.com/wekan/wekan/pull/2593).
+  Thanks to whowillcare.
+
+and fixes the following bugs:
+
+- [Fix comment-editor marking issue](https://github.com/wekan/wekan/issues/2575).
+  Thanks to whowillcare.
 - [Bugfix: style kbd font color became white after introduced summernote editor
   to card comments](https://github.com/wekan/wekan/pull/2600).
   Thanks to whowillcare.
@@ -9,6 +29,11 @@ This release fixes the following bugs:
   on desktop webbrowser view, so that it's not possible for normal users to make accidental
   clicks to those](https://github.com/wekan/wekan/issues/2599).
   Thanks to derbolle and xet7.
+- [Fix bug on editing users informations, switching to other view, staring
+  a board](https://github.com/wekan/wekan/issues/2590).
+  Thanks to road42.
+- [Fix null access with board body](https://github.com/wekan/wekan/pull/2602).
+  Thanks to justinr1234.
 
 Thanks to above GitHub users for their contributions and translators for their translations.
 
diff --git a/Stackerfile.yml b/Stackerfile.yml
index f40728b2..c3208f04 100644
--- a/Stackerfile.yml
+++ b/Stackerfile.yml
@@ -1,5 +1,5 @@
 appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928
-appVersion: "v3.11.0"
+appVersion: "v3.13.0"
 files:
   userUploads:
     - README.md
diff --git a/client/components/boards/boardsList.js b/client/components/boards/boardsList.js
index b1371747..3918af82 100644
--- a/client/components/boards/boardsList.js
+++ b/client/components/boards/boardsList.js
@@ -8,10 +8,10 @@ Template.boardListHeaderBar.events({
 
 Template.boardListHeaderBar.helpers({
   templatesBoardId() {
-    return Meteor.user().getTemplatesBoardId();
+    return Meteor.user() && Meteor.user().getTemplatesBoardId();
   },
   templatesBoardSlug() {
-    return Meteor.user().getTemplatesBoardSlug();
+    return Meteor.user() && Meteor.user().getTemplatesBoardSlug();
   },
 });
 
diff --git a/models/users.js b/models/users.js
index 46e56ad6..870e8fe9 100644
--- a/models/users.js
+++ b/models/users.js
@@ -260,7 +260,7 @@ Users.attachSchema(
 Users.allow({
   update(userId) {
     const user = Users.findOne(userId);
-    return user && Meteor.user().isAdmin;
+    return user; // && Meteor.user().isAdmin; // GitHub issue #2590
   },
   remove(userId, doc) {
     const adminsNumber = Users.find({ isAdmin: true }).count();
diff --git a/package.json b/package.json
index 67142418..670569fc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "v3.11.0",
+  "version": "v3.13.0",
   "description": "Open-Source kanban",
   "private": true,
   "scripts": {
diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp
index 144ccc5d..79f0f3a0 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 = 313,
+    appVersion = 315,
     # Increment this for every release.
 
-    appMarketingVersion = (defaultText = "3.11.0~2019-08-07"),
+    appMarketingVersion = (defaultText = "3.13.0~2019-08-09"),
     # Human-readable presentation of the app version.
 
     minUpgradableAppVersion = 0,