浏览代码

Merge branch 'edge' into meteor-1.8

Lauri Ojansivu 6 年之前
父节点
当前提交
a35712c708
共有 8 个文件被更改,包括 36 次插入15 次删除
  1. 15 0
      CHANGELOG.md
  2. 1 1
      Stackerfile.yml
  3. 2 1
      client/components/boards/boardBody.jade
  4. 4 0
      client/components/boards/boardBody.js
  5. 9 9
      i18n/fr.i18n.json
  6. 1 1
      package.json
  7. 2 2
      sandstorm-pkgdef.capnp
  8. 2 1
      sandstorm.js

+ 15 - 0
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
 # v2.88 2019-06-21 Wekan release
 
 
 This release adds the following updates:
 This release adds the following updates:

+ 1 - 1
Stackerfile.yml

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

+ 2 - 1
client/components/boards/boardBody.jade

@@ -7,7 +7,8 @@ template(name="board")
         +boardBody
         +boardBody
     else
     else
       //- XXX We need a better error message in case the board has been archived
       //- 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
   else
     +spinner
     +spinner
 
 

+ 4 - 0
client/components/boards/boardBody.js

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

+ 9 - 9
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-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-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-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",
     "ldap": "LDAP",
     "oauth2": "OAuth2",
     "oauth2": "OAuth2",
     "cas": "CAS",
     "cas": "CAS",

+ 1 - 1
package.json

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

+ 2 - 2
sandstorm-pkgdef.capnp

@@ -22,10 +22,10 @@ const pkgdef :Spk.PackageDefinition = (
     appTitle = (defaultText = "Wekan"),
     appTitle = (defaultText = "Wekan"),
     # The name of the app as it is displayed to the user.
     # The name of the app as it is displayed to the user.
 
 
-    appVersion = 290,
+    appVersion = 291,
     # Increment this for every release.
     # 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.
     # Human-readable presentation of the app version.
 
 
     minUpgradableAppVersion = 0,
     minUpgradableAppVersion = 0,

+ 2 - 1
sandstorm.js

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