Merge branch 'edge' into meteor-1.8

CHANGELOG.md

@@ -1,3 +1,12 @@
+# v2.84 2019-06-18 Wekan release
+
+This release fixes the following bugs:
+
+- [Buttons for adding rules to a board where missing for isBoardAdmin](https://github.com/wekan/wekan/pull/2500).
+  Thanks to road42.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
 # v2.83 2019-06-17 Wekan release
 
 This release fixes the following bugs:

Stackerfile.yml

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

client/components/rules/rulesList.jade

@@ -17,6 +17,10 @@ template(name="rulesList")
               button.js-delete-rule
                 i.fa.fa-trash-o
                 | {{{_ 'r-delete-rule'}}}
+            else if currentUser.isBoardAdmin
+              button.js-delete-rule
+                i.fa.fa-trash-o
+                | {{{_ 'r-delete-rule'}}}
       else
         li.no-items-message {{{_ 'r-no-rules' }}}
     if currentUser.isAdmin
@@ -24,4 +28,10 @@ template(name="rulesList")
         button.js-goto-trigger
           i.fa.fa-plus
           | {{{_ 'r-add-rule'}}}
-        input(type=text,placeholder="{{{_ 'r-new-rule-name' }}}",id="ruleTitle")
+        input(type=text,placeholder="{{{_ 'r-new-rule-name' }}}",id="ruleTitle")
+    else if currentUser.isBoardAdmin
+      div.rules-add
+        button.js-goto-trigger
+          i.fa.fa-plus
+          | {{{_ 'r-add-rule'}}}
+        input(type=text,placeholder="{{{_ 'r-new-rule-name' }}}",id="ruleTitle")

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "v2.83.0",
+  "version": "v2.84.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 = 285,
+    appVersion = 286,
     # Increment this for every release.
 
-    appMarketingVersion = (defaultText = "2.83.0~2019-06-17"),
+    appMarketingVersion = (defaultText = "2.84.0~2019-06-18"),
     # Human-readable presentation of the app version.
 
     minUpgradableAppVersion = 0,