Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'develop' of github.com:martini/zammad into develop

Browse source
This commit is contained in:
Martin Edenhofer 2015-06-03 15:59:38 +02:00
commit 82c04c1800
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/app/controllers/layout_ref.js.coffee
View file

@ -991,7 +991,9 @@ class cluesRef extends App.ControllerContent
container = $(clue.container) container = $(clue.container)
container.removeClass('selected-clue') container.removeClass('selected-clue')
# maybe undo perform # undo click perform by doing it again
if clue.action
@perform clue.action, container
@el.find('.clue').remove() @el.find('.clue').remove()

2
app/assets/javascripts/app/views/layout_ref/user_profile.jst.eco
View file

@ -87,7 +87,7 @@
<svg class="icon-priority"><use xlink:href="#icon-priority" /></svg> <svg class="icon-priority"><use xlink:href="#icon-priority" /></svg>
</div> </div>
<div class="flex"> <div class="flex">
<div class="name">Print sheets strip off with a lot of text in the headline</div> <div class="name">Print sheets strip_off_with_a_lot_of_text_in_the_headline</div>
<div class="time">1 hour ago</div> <div class="time">1 hour ago</div>
</div> </div>
<li class="task level-1"> <li class="task level-1">

1
app/assets/stylesheets/zammad.css.scss
View file

@ -4975,6 +4975,7 @@ label + .wizard-buttonList {
} }
.name { .name {
word-break: break-all;
@extend .u-highlight; @extend .u-highlight;
} }
} }