diff options
| author | Lauri Ojansivu <x@xet7.org> | 2017-12-11 22:51:50 +0200 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2017-12-11 22:51:50 +0200 |
| commit | d235a00b113014c67beb3dd418e0f6ec17c214c1 (patch) | |
| tree | e7cf71eabe35787ab35b936cd874d26508bbeb02 | |
| parent | 4c0b262c7b2a446199d1d97e94edb9cbb2d3adb1 (diff) | |
| parent | 8dc9856ed896d3f0498b91990d74da01ea951521 (diff) | |
| download | wekan-d235a00b113014c67beb3dd418e0f6ec17c214c1.tar.gz wekan-d235a00b113014c67beb3dd418e0f6ec17c214c1.tar.bz2 wekan-d235a00b113014c67beb3dd418e0f6ec17c214c1.zip | |
Merge branch 'thuanpq-keep-attachment-section-for-uploading-attachment-easier' into devel
| -rw-r--r-- | CHANGELOG.md | 5 | ||||
| -rw-r--r-- | client/components/cards/cardDetails.jade | 11 |
2 files changed, 8 insertions, 8 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 57b9fff0..871257ec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,8 @@ This release adds the following new features: * [Change password of any user in Standalone Wekan Admin Panel](https://github.com/wekan/wekan/pull/1372); * [Performance optimization: Move more global subscriptions to template subscription](https://github.com/wekan/wekan/pull/1373); -* [Auto update card cover with latest uploaded image attachment](https://github.com/wekan/wekan/pull/1387). +* [Auto update card cover with latest uploaded image attachment](https://github.com/wekan/wekan/pull/1387); +* [Always display attachment section for uploading file quickly](https://github.com/wekan/wekan/pull/1391). * Update tranlations. Add Latvian language; * Update to Meteor 1.6.0, Node 6.12.2 and MongoDB 3.2.18. @@ -14,7 +15,7 @@ and fixes the following bugs: * [Bug on not able to see member avatar on sidebar activity](https://github.com/wekan/wekan/pull/1380); * [Don't open swipebox on update card cover / download file / delete file](https://github.com/wekan/wekan/pull/1386); * [Boards subscription should be placed at header for all other component can be used](https://github.com/wekan/wekan/pull/1381); -* [bug on long url of attachment in card activity log](https://github.com/wekan/wekan/pull/1388). +* [Bug on long url of attachment in card activity log](https://github.com/wekan/wekan/pull/1388). Thanks to GitHub users mfshiu, thuanpq and xet7 for their contributions. Thanks to translators for their translations. diff --git a/client/components/cards/cardDetails.jade b/client/components/cards/cardDetails.jade index 4c68c2f7..0a7a8cd6 100644 --- a/client/components/cards/cardDetails.jade +++ b/client/components/cards/cardDetails.jade @@ -85,13 +85,12 @@ template(name="cardDetails") hr +checklists(cardId = _id) - if attachments.count - hr - h2 - i.fa.fa-paperclip - | {{_ 'attachments'}} + hr + h2 + i.fa.fa-paperclip + | {{_ 'attachments'}} - +attachmentsGalery + +attachmentsGalery hr .activity-title |