summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2017-12-11 22:47:45 +0200
committerLauri Ojansivu <x@xet7.org>2017-12-11 22:47:45 +0200
commit4c0b262c7b2a446199d1d97e94edb9cbb2d3adb1 (patch)
treea1a344cab53ad2732760ebf1c87d1c34d26dcfca
parenta05292bd910ddba3054337c9a6761c4e62117e35 (diff)
parent4ac9048d80a5fec75013d24f806273d4e9e10341 (diff)
downloadwekan-4c0b262c7b2a446199d1d97e94edb9cbb2d3adb1.tar.gz
wekan-4c0b262c7b2a446199d1d97e94edb9cbb2d3adb1.tar.bz2
wekan-4c0b262c7b2a446199d1d97e94edb9cbb2d3adb1.zip
Merge branch 'thuanpq-fixed-bug-on-long-card-history-log' into devel
-rw-r--r--CHANGELOG.md3
-rw-r--r--client/components/activities/activities.styl2
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0d3a2d32..57b9fff0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,7 +13,8 @@ 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);
* [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).
+* [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).
Thanks to GitHub users mfshiu, thuanpq and xet7 for their contributions.
Thanks to translators for their translations.
diff --git a/client/components/activities/activities.styl b/client/components/activities/activities.styl
index 59e54a6a..380e7b40 100644
--- a/client/components/activities/activities.styl
+++ b/client/components/activities/activities.styl
@@ -17,6 +17,8 @@
height: @width
.activity-desc
+ word-wrap: break-word
+ overflow: hidden
flex: 1
align-self: center
margin: 0