Merge branch 'edge' into meteor-1.8

This commit is contained in:
Lauri Ojansivu 2019-06-21 21:00:06 +03:00
commit a35712c708
8 changed files with 36 additions and 15 deletions

View file

@ -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:

View file

@ -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

View file

@ -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

View file

@ -27,6 +27,10 @@ BlazeComponent.extendComponent({
return Utils.isMiniScreen() && Session.get('currentCard');
},
goHome() {
FlowRouter.go('home');
},
}).register('board');
BlazeComponent.extendComponent({

View file

@ -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",

View file

@ -1,6 +1,6 @@
{
"name": "wekan",
"version": "v2.88.0",
"version": "v2.89.0",
"description": "Open-Source kanban",
"private": true,
"scripts": {

View file

@ -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,

View file

@ -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 };