diff options
author | Lauri Ojansivu <x@xet7.org> | 2019-01-28 17:27:50 +0200 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2019-01-28 17:27:50 +0200 |
commit | c360afb341a892a2e2516fdcb681f077efa86b0a (patch) | |
tree | 171e84a6a9ba1864b68139e7f7b4cd33437299d1 | |
parent | 2dba189830427e79046d7abbd151b2dacdb97489 (diff) | |
parent | 04279342a4a57d9bc57eb6bca0d5a3719cd92c48 (diff) | |
download | wekan-c360afb341a892a2e2516fdcb681f077efa86b0a.tar.gz wekan-c360afb341a892a2e2516fdcb681f077efa86b0a.tar.bz2 wekan-c360afb341a892a2e2516fdcb681f077efa86b0a.zip |
Merge branch 'edge' into meteor-1.8
-rw-r--r-- | CHANGELOG.md | 22 | ||||
-rw-r--r-- | Stackerfile.yml | 2 | ||||
-rw-r--r-- | client/components/swimlanes/swimlanes.jade | 26 | ||||
-rw-r--r-- | client/components/swimlanes/swimlanes.styl | 17 | ||||
-rw-r--r-- | i18n/de.i18n.json | 10 | ||||
-rw-r--r-- | i18n/pt.i18n.json | 54 | ||||
-rw-r--r-- | package.json | 2 | ||||
-rw-r--r-- | sandstorm-pkgdef.capnp | 4 |
8 files changed, 74 insertions, 63 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index d34730a2..e435bfbb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,25 @@ +# v2.08 2019-01-28 Wekan release + +This release fixes the following bugs with Apache I-CLA, thanks to bentiss: + +- Make the max height of the swimlane not too big](https://github.com/wekan/wekan/commit/ae82f43078546902e199d985a922ebf7041a4917). + We take a full screen minus the header height; +- [Properly fix horizontal rendering on Chrome and Firefox](https://github.com/wekan/wekan/commit/7cc185ac57c77be85178f92b1d01d46e20218948). + This reverts [commit 74cf9e2573](https://github.com/wekan/wekan/commit/74cf9e2573) "- Fix Firefox left-rigth scrollbar." + This reverts [commit 9dd8216dfb](https://github.com/wekan/wekan/commit/9dd8216dfb) + "- Fix cards below swimlane title in Firefox" by making + [previous fix](https://github.com/wekan/wekan/pull/2132/commits/f7c6b7fce237a6dbdbbd6d728cfb11ad3f4378eb)" + And this partially reverts [commit dd88eb4cc](https://github.com/wekan/wekan/commit/dd88eb4cc). + The root of the issue was that I was adding a new div and nesting + the list of lists in this new list. This resulted in some + weird behavior that Firefox could not handled properly + Revert to a code colser to v2.02, by just having the + swimlane header in a separate line, and keep only one + flex element. + Fixes #2137 + +Thanks to GitHub user bentiss for contributions, and translators for their translations. + # v2.07 2019-01-28 Wekan release This release fixes the following bugs: diff --git a/Stackerfile.yml b/Stackerfile.yml index bdbff8c4..d3ae715e 100644 --- a/Stackerfile.yml +++ b/Stackerfile.yml @@ -1,5 +1,5 @@ appId: wekan-public/apps/77b94f60-dec9-0136-304e-16ff53095928 -appVersion: "v2.07.0" +appVersion: "v2.08.0" files: userUploads: - README.md diff --git a/client/components/swimlanes/swimlanes.jade b/client/components/swimlanes/swimlanes.jade index ad61466e..34177a02 100644 --- a/client/components/swimlanes/swimlanes.jade +++ b/client/components/swimlanes/swimlanes.jade @@ -1,22 +1,22 @@ template(name="swimlane") - .swimlane.js-lists.js-swimlane + .swimlane +swimlaneHeader - .swimlane.list-group.js-lists - if isMiniScreen - if currentList - +list(currentList) - else - each currentBoard.lists - +miniList(this) - if currentUser.isBoardMember - +addListForm + .swimlane.js-lists.js-swimlane + if isMiniScreen + if currentList + +list(currentList) else each currentBoard.lists - +list(this) - if currentCardIsInThisList _id ../_id - +cardDetails(currentCard) + +miniList(this) if currentUser.isBoardMember +addListForm + else + each currentBoard.lists + +list(this) + if currentCardIsInThisList _id ../_id + +cardDetails(currentCard) + if currentUser.isBoardMember + +addListForm template(name="listsGroup") .swimlane.list-group.js-lists diff --git a/client/components/swimlanes/swimlanes.styl b/client/components/swimlanes/swimlanes.styl index 9abf2820..77a7a413 100644 --- a/client/components/swimlanes/swimlanes.styl +++ b/client/components/swimlanes/swimlanes.styl @@ -5,9 +5,9 @@ // transparent, because that won't work during a swimlane drag. background: darken(white, 13%) display: flex - flex-direction: column + flex-direction: row overflow: 0; - max-height: 100% + max-height: calc(100% - 26px) &.placeholder background-color: rgba(0, 0, 0, .2) @@ -27,7 +27,7 @@ .swimlane-header-wrap display: flex; flex-direction: row; - flex: 0 0 24px; + flex: 1 0 100%; background-color: #ccc; .swimlane-header @@ -51,19 +51,8 @@ margin-right: 10px .list-group - flex-direction: row height: 100% -// Firefox fix for cards behind swimlane to overflow-y -// https://github.com/wekan/wekan/pull/2132/commits/f7c6b7fce237a6dbdbbd6d728cfb11ad3f4378eb -// and enable Firefox left-right scroll https://github.com/wekan/wekan/issues/2137 -@-moz-document url-prefix() { - .list-group { - overflow-y: hidden; - overflow: -moz-scrollbars-vertical; - } -} - swimlane-color(background, color...) background: background !important if color diff --git a/i18n/de.i18n.json b/i18n/de.i18n.json index 69eb0863..22e61fbb 100644 --- a/i18n/de.i18n.json +++ b/i18n/de.i18n.json @@ -335,10 +335,10 @@ "list-archive-cards-pop": "Alle Karten dieser Liste werden vom Board entfernt. Um Karten im Papierkorb anzuzeigen und wiederherzustellen, klicken Sie auf \"Menü\" > \"Archiv\".", "list-move-cards": "Alle Karten in dieser Liste verschieben", "list-select-cards": "Alle Karten in dieser Liste auswählen", - "set-color-list": "Setze Farbe", + "set-color-list": "Lege Farbe fest", "listActionPopup-title": "Listenaktionen", "swimlaneActionPopup-title": "Swimlaneaktionen", - "swimlaneAddPopup-title": "Füge eine Swimlane unterhalb hinzu", + "swimlaneAddPopup-title": "Swimlane unterhalb einfügen", "listImportCardPopup-title": "Eine Trello-Karte importieren", "listMorePopup-title": "Mehr", "link-list": "Link zu dieser Liste", @@ -520,9 +520,9 @@ "editCardReceivedDatePopup-title": "Empfangsdatum ändern", "editCardEndDatePopup-title": "Enddatum ändern", "setCardColorPopup-title": "Farbe festlegen", - "setCardActionsColorPopup-title": "Wähle eine Farbe", - "setSwimlaneColorPopup-title": "Wähle eine Farbe", - "setListColorPopup-title": "Wähle eine Farbe", + "setCardActionsColorPopup-title": "Farbe wählen", + "setSwimlaneColorPopup-title": "Farbe wählen", + "setListColorPopup-title": "Farbe wählen", "assigned-by": "Zugewiesen von", "requested-by": "Angefordert von", "board-delete-notice": "Löschen kann nicht rückgängig gemacht werden. Sie werden alle Listen, Karten und Aktionen, die mit diesem Board verbunden sind, verlieren.", diff --git a/i18n/pt.i18n.json b/i18n/pt.i18n.json index 4da76fd7..ce895972 100644 --- a/i18n/pt.i18n.json +++ b/i18n/pt.i18n.json @@ -19,36 +19,36 @@ "act-importCard": "__card__ importado", "act-importList": "__list__ importada", "act-joinMember": "__member__ adicionado ao __card__", - "act-moveCard": "moved __card__ from __oldList__ to __list__", - "act-removeBoardMember": "removed __member__ from __board__", - "act-restoredCard": "restored __card__ to __board__", - "act-unjoinMember": "removed __member__ from __card__", + "act-moveCard": "__card__ movido de __oldList__ para __list__", + "act-removeBoardMember": "__member__ removido de __board__", + "act-restoredCard": "__card__ restaurado para __board__", + "act-unjoinMember": "__member__ removido de __card__", "act-withBoardTitle": "__board__", "act-withCardTitle": "[__board__] __card__", - "actions": "Actions", - "activities": "Activities", - "activity": "Activity", - "activity-added": "added %s to %s", - "activity-archived": "%s moved to Archive", - "activity-attached": "attached %s to %s", + "actions": "Ações", + "activities": "Atividade", + "activity": "Atividade", + "activity-added": "adicionado %s a %s", + "activity-archived": "%s arquivado", + "activity-attached": "anexado %s a %s", "activity-created": "Criado %s", - "activity-customfield-created": "created custom field %s", - "activity-excluded": "excluded %s from %s", - "activity-imported": "imported %s into %s from %s", - "activity-imported-board": "imported %s from %s", - "activity-joined": "joined %s", - "activity-moved": "moved %s from %s to %s", - "activity-on": "on %s", - "activity-removed": "removed %s from %s", - "activity-sent": "sent %s to %s", - "activity-unjoined": "unjoined %s", - "activity-subtask-added": "added subtask to %s", - "activity-checked-item": "checked %s in checklist %s of %s", - "activity-unchecked-item": "unchecked %s in checklist %s of %s", - "activity-checklist-added": "added checklist to %s", - "activity-checklist-removed": "removed a checklist from %s", - "activity-checklist-completed": "completed the checklist %s of %s", - "activity-checklist-uncompleted": "uncompleted the checklist %s of %s", + "activity-customfield-created": "criado campo customizado %s", + "activity-excluded": "excuído %s de %s", + "activity-imported": "importado %s para %s de %s", + "activity-imported-board": "importado %s de %s", + "activity-joined": "entrou em %s", + "activity-moved": "movido %s de %s para %s", + "activity-on": "em %s", + "activity-removed": "removido %s de %s", + "activity-sent": "enviado %s para %s", + "activity-unjoined": "saiu de %s", + "activity-subtask-added": "adicionada subtarefa a %s", + "activity-checked-item": "marcado %s na checklist %s de %s", + "activity-unchecked-item": "desmarcado %s na checklist %s de %s", + "activity-checklist-added": "checklist adicionada a %s", + "activity-checklist-removed": "checklist removida de %s", + "activity-checklist-completed": "checklist %s de %s foi completada", + "activity-checklist-uncompleted": "checklist %s de %s foi marcada como não completada", "activity-checklist-item-added": "added checklist item to '%s' in %s", "activity-checklist-item-removed": "removed a checklist item from '%s' in %s", "add": "Adicionar", diff --git a/package.json b/package.json index 40578434..939f2aff 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "v2.07.0", + "version": "v2.08.0", "description": "Open-Source kanban", "private": true, "scripts": { diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index e1fa9363..59d13fcd 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 = 209, + appVersion = 210, # Increment this for every release. - appMarketingVersion = (defaultText = "2.07.0~2019-01-28"), + appMarketingVersion = (defaultText = "2.08.0~2019-01-28"), # Human-readable presentation of the app version. minUpgradableAppVersion = 0, |