diff options
| author | Lauri Ojansivu <x@xet7.org> | 2017-12-11 22:05:07 +0200 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2017-12-11 22:05:07 +0200 |
| commit | a282a38ecdc4a4c22af2e069a2809b3dac392262 (patch) | |
| tree | 34f66b0f7a88235c2e8f3bea10473f1aa439b54f | |
| parent | 6ce5ea9ca5dfc9e6af6d9119ee07175faa35805d (diff) | |
| parent | 1f830cc5e3f7d916547920002e907b2d07861f58 (diff) | |
| download | wekan-a282a38ecdc4a4c22af2e069a2809b3dac392262.tar.gz wekan-a282a38ecdc4a4c22af2e069a2809b3dac392262.tar.bz2 wekan-a282a38ecdc4a4c22af2e069a2809b3dac392262.zip | |
Merge branch 'thuanpq-dont-open-swipebox-overlay-while-downloading-update-cover' into devel
| -rw-r--r-- | CHANGELOG.md | 3 | ||||
| -rw-r--r-- | client/components/cards/attachments.jade | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 665a4ed8..97497b7a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,8 @@ This release adds the following new features: and fixes the following bugs: * [Bug on not being able to see Admin Panel if not having access to Board List](https://github.com/wekan/wekan/pull/1371); -* [Bug on not able to see member avatar on sidebar activity](https://github.com/wekan/wekan/pull/1380). +* [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). Thanks to GitHub users mfshiu, thuanpq and xet7 for their contributions. Thanks to translators for their translations. diff --git a/client/components/cards/attachments.jade b/client/components/cards/attachments.jade index c8442691..0f79323b 100644 --- a/client/components/cards/attachments.jade +++ b/client/components/cards/attachments.jade @@ -21,8 +21,8 @@ template(name="attachmentDeletePopup") template(name="attachmentsGalery") .attachments-galery each attachments - a.attachment-item.swipebox(href="{{url}}" title="{{name}}") - .attachment-thumbnail + .attachment-item + a.attachment-thumbnail.swipebox(href="{{url}}" title="{{name}}") if isUploaded if isImage img.attachment-thumbnail-img(src="{{url}}") |