summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md15
-rw-r--r--Stackerfile.yml2
-rw-r--r--client/components/boards/boardBody.jade3
-rw-r--r--client/components/boards/boardBody.js4
-rw-r--r--i18n/fr.i18n.json18
-rw-r--r--package.json2
-rw-r--r--sandstorm-pkgdef.capnp4
-rw-r--r--sandstorm.js3
8 files changed, 36 insertions, 15 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd671acc..067d2165 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,18 @@
+# v2.89 2019-06-21 Wekan release
+
+This release adds the following Sandstorm features:
+
+- [Sandstorm Wekan: Set everyone as Admin](https://github.com/wekan/wekan/commit/60d62a6ae3a79059e68b2cd1d554d67b7d50b6aa).
+ Please test does this help with [Problem with the user management: can't add users or give wekan admin rights](https://github.com/wekan/wekan/issues/2405).
+ Thanks to xet7.
+- [If board does not exist, redirect to All Boards page, at all Wekan platforms](https://github.com/wekan/wekan/commit/4f46adc389126597266d71110f9754841f86857c).
+ So now at Sandstorm when loading Wekan grain, if first Sandstorm board is found,
+ it is opened. If first Sandstorm board is not found (it's deleted or archived),
+ then redirect automatically to All Boards page. [Closes #3132](https://github.com/wekan/wekan/issues/3132).
+ Thanks to xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
# v2.88 2019-06-21 Wekan release
This release adds the following updates:
diff --git a/Stackerfile.yml b/Stackerfile.yml
index 48248472..270dd709 100644
--- a/Stackerfile.yml
+++ b/Stackerfile.yml
@@ -1,5 +1,5 @@
appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928
-appVersion: "v2.88.0"
+appVersion: "v2.89.0"
files:
userUploads:
- README.md
diff --git a/client/components/boards/boardBody.jade b/client/components/boards/boardBody.jade
index 017d0b0a..7a811dbb 100644
--- a/client/components/boards/boardBody.jade
+++ b/client/components/boards/boardBody.jade
@@ -7,7 +7,8 @@ template(name="board")
+boardBody
else
//- XXX We need a better error message in case the board has been archived
- +message(label="board-not-found")
+ //+message(label="board-not-found")
+ {{goHome}}
else
+spinner
diff --git a/client/components/boards/boardBody.js b/client/components/boards/boardBody.js
index dc5e0ede..e9b9f88a 100644
--- a/client/components/boards/boardBody.js
+++ b/client/components/boards/boardBody.js
@@ -27,6 +27,10 @@ BlazeComponent.extendComponent({
return Utils.isMiniScreen() && Session.get('currentCard');
},
+ goHome() {
+ FlowRouter.go('home');
+ },
+
}).register('board');
BlazeComponent.extendComponent({
diff --git a/i18n/fr.i18n.json b/i18n/fr.i18n.json
index 8083beba..24bdc5c9 100644
--- a/i18n/fr.i18n.json
+++ b/i18n/fr.i18n.json
@@ -669,15 +669,15 @@
"r-board-note": "Note : laisser le champ vide pour faire correspondre avec toutes les valeurs possibles.",
"r-checklist-note": "Note : les items de la checklist doivent être séparés par des virgules.",
"r-when-a-card-is-moved": "Quand une carte est déplacée vers une autre liste",
- "r-set": "Set",
- "r-update": "Update",
- "r-datefield": "date field",
- "r-df-start-at": "start",
- "r-df-due-at": "due",
- "r-df-end-at": "end",
- "r-df-received-at": "received",
- "r-to-current-datetime": "to current date/time",
- "r-remove-value-from": "Remove value from",
+ "r-set": "Définir",
+ "r-update": "Mettre à jour",
+ "r-datefield": "champ date",
+ "r-df-start-at": "début",
+ "r-df-due-at": "échéance",
+ "r-df-end-at": "fin",
+ "r-df-received-at": "reçu",
+ "r-to-current-datetime": "à la date/heure courante",
+ "r-remove-value-from": "Supprimer la valeur de",
"ldap": "LDAP",
"oauth2": "OAuth2",
"cas": "CAS",
diff --git a/package.json b/package.json
index 4a941d46..e58826a4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "wekan",
- "version": "v2.88.0",
+ "version": "v2.89.0",
"description": "Open-Source kanban",
"private": true,
"scripts": {
diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp
index 8f253a1a..5f9bcc94 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 = 290,
+ appVersion = 291,
# Increment this for every release.
- appMarketingVersion = (defaultText = "2.88.0~2019-06-21"),
+ appMarketingVersion = (defaultText = "2.89.0~2019-06-21"),
# Human-readable presentation of the app version.
minUpgradableAppVersion = 0,
diff --git a/sandstorm.js b/sandstorm.js
index de003a6f..9a1f4fd5 100644
--- a/sandstorm.js
+++ b/sandstorm.js
@@ -206,7 +206,8 @@ if (isSandstorm && Meteor.isServer) {
function updateUserPermissions(userId, permissions) {
const isActive = permissions.indexOf('participate') > -1;
- const isAdmin = permissions.indexOf('configure') > -1;
+ //const isAdmin = permissions.indexOf('configure') > -1;
+ const isAdmin = true;
const isCommentOnly = false;
const isNoComments = false;
const permissionDoc = { userId, isActive, isAdmin, isNoComments, isCommentOnly };