The branch, master has been updated via 54c062c0ad19db67250fde19eff7f44f31429e74 (commit) via 20118f89cf9a84f019d77c748e8eb7d390781669 (commit) via c422694746d75d0fdb54fa7b11afa2156e4de8dc (commit) from cd5cddb2e4324094eae365e01422e8d165d372e8 (commit)

- Log ----------------------------------------------------------------- commit 54c062c0ad19db67250fde19eff7f44f31429e74 Merge: cd5cddb2e4324094eae365e01422e8d165d372e8 20118f89cf9a84f019d77c748e8eb7d390781669 Author: Marc Delisle marc@infomarc.info Date: Fri Jun 10 12:55:02 2011 -0400

Merge branch 'QA_3_4'

-----------------------------------------------------------------------

Summary of changes: ChangeLog | 1 + js/functions.js | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog index 565b1d3..288e572 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,7 @@ - bug #3307616 [edit] Inline edit updates multiple duplicate rows - patch #3311539 [edit] Inline edit does not escape backslashes - bug #3313210 [interface] Columns class sometimes changed for nothing +- patch #3313326 [interface] Some tooltips do not disappear

3.4.2.0 (2011-06-07) - bug #3301249 [interface] Iconic table operations does not remove inline edit label diff --git a/js/functions.js b/js/functions.js index fdae296..765f887 100644 --- a/js/functions.js +++ b/js/functions.js @@ -2029,7 +2029,7 @@ $(document).ready(function() { $(this).qtip({ content: tooltip_text, show: { delay: 0 }, - hide: { when: 'unfocus', delay: 0 }, + hide: { delay: 1000 }, style: { background: '#ffffcc' } }); });

hooks/post-receive