diff options
author | Lauri Ojansivu <x@xet7.org> | 2018-06-14 19:45:22 +0300 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2018-06-14 19:45:22 +0300 |
commit | 94bd63c8a75e9519f4ef87e8e5e16c114b031cdd (patch) | |
tree | 1acffdab9348330f3c0426578fdb048da0635b56 | |
parent | 85e02010d444453a4a682770522a65fcdc488c8b (diff) | |
parent | 3e8b2620a17674df466939e200e395a3ff344f7b (diff) | |
download | wekan-94bd63c8a75e9519f4ef87e8e5e16c114b031cdd.tar.gz wekan-94bd63c8a75e9519f4ef87e8e5e16c114b031cdd.tar.bz2 wekan-94bd63c8a75e9519f4ef87e8e5e16c114b031cdd.zip |
Merge branch 'rjevnikar-fixRDate' into devel
-rw-r--r-- | CHANGELOG.md | 6 | ||||
-rw-r--r-- | client/components/cards/minicard.jade | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 3be0b8a1..a55867f3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,9 +13,11 @@ and fixes the following bugs: Sandstorm Wekan](https://github.com/wekan/wekan/commit/8d5cbf1e6c2b6d467fe1c0708cd794fd11b98a2e#commitcomment-29362180); * [Fix Issue with custom fields shown on card](https://github.com/wekan/wekan/issues/1659); * [Fix showing public board in list mode](https://github.com/wekan/wekan/issues/1623); -* [Fix for not able to remove Custom Field "Show on Card"](https://github.com/wekan/wekan/pull/1699). +* [Fix for not able to remove Custom Field "Show on Card"](https://github.com/wekan/wekan/pull/1699); +* [Fix minicardReceivedDate typo in 1.04 regression: Socket connection error and boards + not loading](https://github.com/wekan/wekan/issues/1694). -Thanks to GitHub users feuerball11, oec and xet7 for their contributions. +Thanks to GitHub users feuerball11, Fran-KTA, oec, rjevnikar and xet7 for their contributions. # v1.04 2018-06-12 Wekan release diff --git a/client/components/cards/minicard.jade b/client/components/cards/minicard.jade index c912ea70..2a8e95ab 100644 --- a/client/components/cards/minicard.jade +++ b/client/components/cards/minicard.jade @@ -15,7 +15,7 @@ template(name="minicard") unless dueAt unless endAt .date - +miniCardReceivedDate + +minicardReceivedDate if startAt .date +minicardStartDate |