Merge branch 'devel'

4 files changed, 19 insertions, 7 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ae395e96..e1a8e64e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# v1.39 2018-08-29 Wekan release
+
+This release fixes the following bugs:
+
+- [Only allow ifCanModify users to add dates on cards](https://github.com/wekan/wekan/pull/1867).
+
+Thanks to GitHub user rjevnikar for contributions.
+
 # v1.38 2018-08-29 Wekan release
 
 This release adds the following new features:
diff --git a/client/components/cards/cardDetails.jade b/client/components/cards/cardDetails.jade
index ad2044e8..10828445 100644
--- a/client/components/cards/cardDetails.jade
+++ b/client/components/cards/cardDetails.jade
@@ -36,28 +36,32 @@ template(name="cardDetails")
         if getReceived
           +cardReceivedDate
         else
-          a.js-received-date {{_ 'add'}}
+          if canModifyCard
+            a.js-received-date {{_ 'add'}}
 
       .card-details-item.card-details-item-start
         h3.card-details-item-title {{_ 'card-start'}}
         if getStart
           +cardStartDate
         else
-          a.js-start-date {{_ 'add'}}
+          if canModifyCard
+            a.js-start-date {{_ 'add'}}
 
       .card-details-item.card-details-item-due
         h3.card-details-item-title {{_ 'card-due'}}
         if getDue
           +cardDueDate
         else
-          a.js-due-date {{_ 'add'}}
+          if canModifyCard
+            a.js-due-date {{_ 'add'}}
 
       .card-details-item.card-details-item-end
         h3.card-details-item-title {{_ 'card-end'}}
         if getEnd
           +cardEndDate
         else
-          a.js-end-date {{_ 'add'}}
+          if canModifyCard
+            a.js-end-date {{_ 'add'}}
 
     .card-details-items
       .card-details-item.card-details-item-members
diff --git a/package.json b/package.json
index 597dc521..64bbf3e5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "1.38.0",
+  "version": "1.39.0",
   "description": "The open-source kanban",
   "private": true,
   "scripts": {
diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp
index cab36a72..f143377b 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 = 123,
+    appVersion = 124,
     # Increment this for every release.
 
-    appMarketingVersion = (defaultText = "1.38.0~2018-08-29"),
+    appMarketingVersion = (defaultText = "1.39.0~2018-08-29"),
     # Human-readable presentation of the app version.
 
     minUpgradableAppVersion = 0,