From c3e839c885bef820b15bcebf75a721b1ce2799f9 Mon Sep 17 00:00:00 2001 From: pravdomil Date: Tue, 26 Jun 2018 10:54:22 +0200 Subject: [PATCH 1/7] revert 6a58729 --- client/components/cards/minicard.styl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/components/cards/minicard.styl b/client/components/cards/minicard.styl index 391a63165..335182a39 100644 --- a/client/components/cards/minicard.styl +++ b/client/components/cards/minicard.styl @@ -37,7 +37,7 @@ flex-wrap: wrap background-color: #fff min-height: 20px - box-shadow: 0 0px 16px rgba(0,0,0,0.15) inset + box-shadow: 0 1px 2px rgba(0,0,0,.15) border-radius: 2px color: #4d4d4d overflow: hidden From 5bca2f802bed6183a9020c2168574bc6486a473b Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sat, 30 Jun 2018 11:34:00 +0300 Subject: [PATCH 2/7] Update translations. --- i18n/fr.i18n.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/i18n/fr.i18n.json b/i18n/fr.i18n.json index 53e45eb89..cae8c836f 100644 --- a/i18n/fr.i18n.json +++ b/i18n/fr.i18n.json @@ -100,7 +100,7 @@ "boardMenuPopup-title": "Menu du tableau", "boards": "Tableaux", "board-view": "Vue du tableau", - "board-view-cal": "Calendar", + "board-view-cal": "Calendrier", "board-view-swimlanes": "Couloirs", "board-view-lists": "Listes", "bucket-example": "Comme « todo list » par exemple", From 08a1927c0c01b19ca40efde0f8e9d490dbc7df7d Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sat, 30 Jun 2018 11:42:03 +0300 Subject: [PATCH 3/7] - Remove card shadow, Wekan users now prefer not to have it. Thanks to GitHub users pravdomil and xet7 for their contributions. --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 56fc9f2a6..03cdee3d6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +# Upcoming Wekan release + +This release fixes the following bugs: + +* [Remove card shadow, Wekan users now prefer not to have it](https://github.com/wekan/wekan/pull/1726). + +Thanks to GitHub users pravdomil and xet7 for their contributions. + # v1.10 2018-06-28 Wekan release This release fixes the following bugs: From 4f5086c5cd4647e210d743c64edbbe09cb30dcd4 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sat, 30 Jun 2018 12:03:15 +0300 Subject: [PATCH 4/7] - Revert previous More margin-bottom after minicard. Thanks to pravdomil and xet7 ! --- CHANGELOG.md | 4 +++- client/components/cards/minicard.styl | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 03cdee3d6..1938ed773 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,9 @@ This release fixes the following bugs: -* [Remove card shadow, Wekan users now prefer not to have it](https://github.com/wekan/wekan/pull/1726). +* [Remove card shadow](https://github.com/wekan/wekan/pull/1726), Wekan users now prefer not to have it; +* [Revert](https://github.com/wekan/wekan/commit/fe69ab90309953ff4de363d41aed539480922016) previous + [More margin-bottom after minicard](https://github.com/wekan/wekan/pull/1713). Thanks to GitHub users pravdomil and xet7 for their contributions. diff --git a/client/components/cards/minicard.styl b/client/components/cards/minicard.styl index 335182a39..d7e55d8da 100644 --- a/client/components/cards/minicard.styl +++ b/client/components/cards/minicard.styl @@ -9,7 +9,7 @@ &.placeholder background: darken(white, 20%) - border-radius: 2px + border-radius: 9px &.ui-sortable-helper cursor: grabbing From 928d88cfe1da4187797519c929cd2fdd9ffe9c2e Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sat, 30 Jun 2018 12:22:35 +0300 Subject: [PATCH 5/7] - More margin-bottom after minicard. Thanks to pravdomil and xet7 ! --- client/components/cards/minicard.styl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/components/cards/minicard.styl b/client/components/cards/minicard.styl index d7e55d8da..b89805bed 100644 --- a/client/components/cards/minicard.styl +++ b/client/components/cards/minicard.styl @@ -5,7 +5,7 @@ position: relative display: flex align-items: center - margin-bottom: 2px + margin-bottom: 9px &.placeholder background: darken(white, 20%) From 6ba4574c67a705de0d9e8d76a3881ccfacd29628 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sat, 30 Jun 2018 12:23:49 +0300 Subject: [PATCH 6/7] - Less margin-bottom after minicard. Thanks to pravdomil and xet7 ! --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1938ed773..3c91b9071 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,8 +3,8 @@ This release fixes the following bugs: * [Remove card shadow](https://github.com/wekan/wekan/pull/1726), Wekan users now prefer not to have it; -* [Revert](https://github.com/wekan/wekan/commit/fe69ab90309953ff4de363d41aed539480922016) previous - [More margin-bottom after minicard](https://github.com/wekan/wekan/pull/1713). +* [Revert](https://github.com/wekan/wekan/commit/928d88cfe1da4187797519c929cd2fdd9ffe9c2e) previous + [Less margin-bottom after minicard](https://github.com/wekan/wekan/pull/1713). Thanks to GitHub users pravdomil and xet7 for their contributions. From 8fbbc104f7e2b680698d286859adab9adf5ff2ae Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sat, 30 Jun 2018 12:38:40 +0300 Subject: [PATCH 7/7] v1.11 --- CHANGELOG.md | 2 +- package.json | 2 +- sandstorm-pkgdef.capnp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3c91b9071..91c522008 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Upcoming Wekan release +# v1.11 2018-06-30 Wekan release This release fixes the following bugs: diff --git a/package.json b/package.json index e3f7b0d84..117baa70e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "wekan", - "version": "1.10.0", + "version": "1.11.0", "description": "The open-source Trello-like kanban", "private": true, "scripts": { diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp index 6dccb65de..22f531680 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 = 95, + appVersion = 96, # Increment this for every release. - appMarketingVersion = (defaultText = "1.10.0~2018-06-28"), + appMarketingVersion = (defaultText = "1.11.0~2018-06-30"), # Human-readable presentation of the app version. minUpgradableAppVersion = 0,