Merge branch 'edge' into meteor-1.8

CHANGELOG.md

@@ -1,3 +1,12 @@
+# v2.60 2019-04-08 Wekan release
+
+This release fixes the following bugs:
+
+- [Fix: Description of Board is out of visible after Feature "Duplicate Board"](https://github.com/wekan/wekan/issues/2324).
+  Thanks to sfahrenholz and xet7.
+
+Thanks to above GitHub users for their contributions and translators for their translations.
+
 # v2.59 2019-04-06 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.59.0"
+appVersion: "v2.60.0"
 files:
   userUploads:
     - README.md

client/components/boards/boardsList.jade

@@ -22,15 +22,16 @@ template(name="boardList")
                 i.fa.js-star-board(
                   class="fa-star{{#if isStarred}} is-star-active{{else}}-o{{/if}}"
                   title="{{_ 'star-board-title'}}")
-              i.fa.js-clone-board(
+                p.board-list-item-desc= description
-                  class="fa-clone"
-                  title="{{_ 'duplicate-board'}}")
                 if hasSpentTimeCards
                   i.fa.js-has-spenttime-cards(
                     class="fa-circle{{#if hasOvertimeCards}} has-overtime-card-active{{else}} no-overtime-card-active{{/if}}"
                     title="{{#if hasOvertimeCards}}{{_ 'has-overtime-cards'}}{{else}}{{_ 'has-spenttime-cards'}}{{/if}}")
+                i.fa.js-clone-board(
+                    class="fa-clone"
+                    title="{{_ 'duplicate-board'}}")
+
 
-                p.board-list-item-desc= description
 
 template(name="boardListHeaderBar")
   h1 {{_ 'my-boards'}}

client/components/boards/boardsList.styl

@@ -93,6 +93,7 @@ $spaceBetweenTiles = 16px
 
   .is-star-active
     color: white
+
   .fa-clone
     position: absolute;
     bottom: 0

i18n/de.i18n.json

@@ -683,5 +683,5 @@
     "error-ldap-login": "Es ist ein Fehler beim Anmelden aufgetreten",
     "display-authentication-method": "Anzeige Authentifizierungsverfahren",
     "default-authentication-method": "Standardauthentifizierungsverfahren",
-    "duplicate-board": "Duplicate Board"
+    "duplicate-board": "Board duplizieren"
 }

i18n/fr.i18n.json

@@ -683,5 +683,5 @@
     "error-ldap-login": "Une erreur s'est produite lors de la tentative de connexion",
     "display-authentication-method": "Afficher la méthode d'authentification",
     "default-authentication-method": "Méthode d'authentification par défaut",
-    "duplicate-board": "Duplicate Board"
+    "duplicate-board": "Dupliquer le tableau"
 }

i18n/ru.i18n.json

@@ -683,5 +683,5 @@
     "error-ldap-login": "Ошибка при попытке авторизации",
     "display-authentication-method": "Показывать способ авторизации",
     "default-authentication-method": "Способ авторизации по умолчанию",
-    "duplicate-board": "Duplicate Board"
+    "duplicate-board": "Клонировать доску"
 }

i18n/sv.i18n.json

@@ -18,7 +18,7 @@
     "act-uncompleteChecklist": "ofullbordade checklista __checklist__ på kort __card__ i lista __list__ i simbana __swimlane__ på tavla __board__",
     "act-addComment": "kommenterade på kort __card__: __comment__ i lista __list__ i simbana __swimlane__ på tavla __board__",
     "act-createBoard": "skapade tavla __board__",
-    "act-createSwimlane": "created swimlane __swimlane__ to board __board__",
+    "act-createSwimlane": "skapade simbana __swimlane__ till tavla __board__",
     "act-createCard": "skapade kort __card__ i lista __list__ i simbana __swimlane__ på tavla __board__",
     "act-createCustomField": "skapade anpassat fält __customField__ på kort __card__ i lista __list__ i simbana __swimlane__ på tavla __board__",
     "act-createList": "la till lista __list__ på tavla __board__",
@@ -31,7 +31,7 @@
     "act-importCard": "importerade kort __card__ i lista __list__ i simbana __swimlane__ på tavla __board__",
     "act-importList": "importerade lista __list__ i simbana __swimlane__ på tavla __board__",
     "act-joinMember": "la till medlem __member__ på kort __card__ i lista __list__ i simbana __swimlane__ på tavla __board__",
-    "act-moveCard": "moved card __card__ at board __board__ from list __oldList__ at swimlane __oldSwimlane__ to list __list__ at swimlane __swimlane__",
+    "act-moveCard": "flyttade kort __card__ på tavla __board__ från lista __oldList__ i sambana __oldSwimlane__ till lista list __list__ i simbana __swimlane__",
     "act-moveCardToOtherBoard": "flyttade kort __card__ från lista __oldList__ i simbana __oldSwimlane__ på tavla __oldBoard__ till lista __list__ i simbana __swimlane__ på tavla __board__",
     "act-removeBoardMember": "borttagen medlem __member__  från tavla __board__",
     "act-restoredCard": "återställde kort __card__ till lista __lis__ i simbana __swimlane__ på tavla __board__",
@@ -683,5 +683,5 @@
     "error-ldap-login": "Ett fel uppstod när du försökte logga in",
     "display-authentication-method": "Visa autentiseringsmetod",
     "default-authentication-method": "Standard autentiseringsmetod",
-    "duplicate-board": "Duplicate Board"
+    "duplicate-board": "Dubbletttavla"
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wekan",
-  "version": "v2.59.0",
+  "version": "v2.60.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 = 261,
+    appVersion = 262,
     # Increment this for every release.
 
-    appMarketingVersion = (defaultText = "2.59.0~2019-04-06"),
+    appMarketingVersion = (defaultText = "2.60.0~2019-04-08"),
     # Human-readable presentation of the app version.
 
     minUpgradableAppVersion = 0,