Merge remote-tracking branch 'upstream/develop' into develop

view/theme/frio/js/hovercard.js

@@ -79,7 +79,8 @@ $(document).ready(function(){
 									},
 									trigger: hctrigger,
 									template: '<div class="popover hovercard" data-card-created="' + timeNow + '"><div class="arrow"></div><div class="popover-content hovercard-content"></div></div>',
-									content: data
+									content: data,
+									container: "body",
 								}).popover('show');
 							}
 						});

view/theme/frio/js/theme.js

@@ -100,6 +100,7 @@ $(document).ready(function(){
 	// initialize the bootstrap tooltips
 	$('body').tooltip({
 		selector: '[data-toggle="tooltip"]',
+		container: 'body',
 		animation: true,
 		html: true,
 		placement: 'auto',

view/theme/frio/templates/nav.tpl

@@ -278,7 +278,7 @@
 <ul id="nav-notifications-template" class="media-list" style="display:none;" rel="template">
 	<li class="{4} notif-entry">
 		<div class="notif-entry-wrapper media">
-			<div class="notif-photo-wrapper media-object pull-left"><a href="{6}"><img data-src="{1}"></a></div>
+			<div class="notif-photo-wrapper media-object pull-left"><a href="{6}" class="userinfo"><img data-src="{1}"></a></div>
 			<a href="{0}" class="notif-desc-wrapper media-body">
 				{2}
 				<div><time class="notif-when time" data-toggle="tooltip" title="{5}">{3}</time></div>