Merge branch 'edge' into meteor-1.8

This commit is contained in:
Lauri Ojansivu 2019-06-21 21:30:15 +03:00
commit 69333ea64f
5 changed files with 14 additions and 6 deletions

View file

@ -1,3 +1,12 @@
# v2.90 2019-06-21 Wekan release
This release reverts the following Sandstorm changes:
- [Revert v2.89 setting every Sandstorm Wekan user as admin](https://github.com/wekan/wekan/commit/e5c0d0ea18fe74a47afdfe101160280854e2c74f).
Thanks to xet7. [Related #2405](https://github.com/wekan/wekan/issues/2405).
Thanks to above GitHub users for their contributions and translators for their translations.
# v2.89 2019-06-21 Wekan release
This release adds the following Sandstorm features:

View file

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

View file

@ -1,6 +1,6 @@
{
"name": "wekan",
"version": "v2.89.0",
"version": "v2.90.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 = 291,
appVersion = 292,
# Increment this for every release.
appMarketingVersion = (defaultText = "2.89.0~2019-06-21"),
appMarketingVersion = (defaultText = "2.90.0~2019-06-21"),
# Human-readable presentation of the app version.
minUpgradableAppVersion = 0,

View file

@ -206,8 +206,7 @@ if (isSandstorm && Meteor.isServer) {
function updateUserPermissions(userId, permissions) {
const isActive = permissions.indexOf('participate') > -1;
//const isAdmin = permissions.indexOf('configure') > -1;
const isAdmin = true;
const isAdmin = permissions.indexOf('configure') > -1;
const isCommentOnly = false;
const isNoComments = false;
const permissionDoc = { userId, isActive, isAdmin, isNoComments, isCommentOnly };