Merge develop into 1901_autocomplete

This commit is contained in:
rabuzarus 2016-01-30 16:57:54 +01:00
commit 162f754e2d
60 changed files with 4311 additions and 4280 deletions

View file

@ -160,7 +160,9 @@
'inline' : true,
'transition' : 'elastic'
});
$("a.ajax-popupbox").colorbox({
'transition' : 'elastic'
});
/* notifications template */
var notifications_tpl= unescape($("#nav-notifications-template[rel=template]").html());