Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-12-16 23:40:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch 'xadagaras-bugfix/received_end_date_picker' into devel

Browse source
This commit is contained in:
Lauri Ojansivu 2018-05-26 08:27:07 +03:00
commit 73c4806864
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
CHANGELOG.md
View file

@ -7,9 +7,10 @@ This release fixes the following bugs:
yet](https://github.com/kelektiv/node.bcrypt.js/issues/604) and yet](https://github.com/kelektiv/node.bcrypt.js/issues/604) and
and [not yet merged pull request](https://github.com/kelektiv/node.bcrypt.js/pull/606). and [not yet merged pull request](https://github.com/kelektiv/node.bcrypt.js/pull/606).
This may cause some slowdown; This may cause some slowdown;
* [Snap: Filtering out swap file created at build time, adding stage package](https://github.com/wekan/wekan/pull/1660). * [Snap: Filtering out swap file created at build time, adding stage package](https://github.com/wekan/wekan/pull/1660);
* [Fix Received Date and End Date on Cards](https://github.com/wekan/wekan/issues/1654).
Thanks to GitHub users kubiko and xet7 for their contributions. Thanks to GitHub users kubiko, xadagaras and xet7 for their contributions.
# v1.01 2018-05-23 Wekan release # v1.01 2018-05-23 Wekan release

5
client/components/cards/cardDate.js
View file

@ -93,7 +93,7 @@ Template.dateBadge.helpers({
}); });
// editCardReceivedDatePopup // editCardReceivedDatePopup
(class extends EditCardDate { (class extends DatePicker {
onCreated() { onCreated() {
super.onCreated(); super.onCreated();
this.data().receivedAt && this.date.set(moment(this.data().receivedAt)); this.data().receivedAt && this.date.set(moment(this.data().receivedAt));
@ -156,7 +156,7 @@ Template.dateBadge.helpers({
}).register('editCardDueDatePopup'); }).register('editCardDueDatePopup');
// editCardEndDatePopup // editCardEndDatePopup
(class extends EditCardDate { (class extends DatePicker {
onCreated() { onCreated() {
super.onCreated(); super.onCreated();
this.data().endAt && this.date.set(moment(this.data().endAt)); this.data().endAt && this.date.set(moment(this.data().endAt));
@ -355,4 +355,3 @@ CardEndDate.register('cardEndDate');
return this.date.get().format('l'); return this.date.get().format('l');
} }
}).register('minicardEndDate'); }).register('minicardEndDate');