Merge remote-tracking branch 'origin/master' into develop

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "7.2.21",
+  "version": "7.2.20",
   "nbbpm": {
     "compatibility": "^1.7.0"
   },

templates/partials/categories/link.tpl

@@ -2,7 +2,7 @@
 {../name}
 <!-- ELSE -->
 <!-- IF ../link -->
-<a href="{../link}" itemprop="url" target="_blank">
+<a href="{../link}" itemprop="url">
 <!-- ELSE -->
 <a href="{config.relative_path}/category/{../slug}" itemprop="url">
 <!-- ENDIF ../link -->

templates/partials/move_post_modal.tpl

@@ -1,21 +1,4 @@
-<div id="move-post-modal" tabindex="-1" role="dialog" aria-labelledby="" aria-hidden="true" data-backdrop="none">
+<div>
-	<div class="modal-dialog">
+	<label for="topicId">[[topic:topic_id]]</label>
-		<div class="modal-content">
+	<input id="topicId" type="text" class="form-control" placeholder="[[topic:topic_id_placeholder]]"><br/>
-			<div class="modal-header">
+</div>
-				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-				<h4>[[topic:move_post]]</h4>
-			</div>
-			<div class="modal-body">
-				<div class="form-group">
-					<label for="topicId">[[topic:topic_id]]</label>
-					<input id="topicId" type="text" class="form-control" placeholder="[[topic:topic_id_placeholder]]"><br/>
-				</div>
-			</div>
-
-			<div class="modal-footer">
-				<button type="button" class="btn btn-default" data-dismiss="modal" id="move_post_cancel">[[global:buttons.close]]</button>
-				<button type="button" class="btn btn-primary" id="move_post_commit" disabled>[[topic:confirm_move]]</button>
-			</div>
-		</div>
-	</div>
-</div>

templates/popular.tpl

@@ -28,5 +28,9 @@
 		<!-- ENDIF !topics.length -->
 
 		<!-- IMPORT partials/topics_list.tpl -->
+
+		<!-- IF config.usePagination -->
+			<!-- IMPORT partials/paginator.tpl -->
+		<!-- ENDIF config.usePagination -->
 	</div>
 </div>

templates/topic.tpl

@@ -17,6 +17,18 @@
 			<span class="topic-title" component="topic/title">{title}</span>
 		</h1>
 
+		<div component="topic/merged/message" class="alert alert-warning<!-- IF !merger --> hidden<!-- ENDIF !merger --> clearfix">
+			<span class="pull-left">[[topic:merged_message, {mergeIntoTid}, {merger.mergedIntoTitle}]]</span>
+			<span class="pull-right">
+				<!-- IF merger -->
+				<a href="{config.relative_path}/user/{merger.userslug}">
+					<strong>{merger.username}</strong>
+				</a>
+				<small class="timeago" title="{mergedTimestampISO}"></small>
+				<!-- ENDIF merger -->
+			</span>
+		</div>
+
 		<div component="topic/deleted/message" class="alert alert-warning<!-- IF !deleted --> hidden<!-- ENDIF !deleted --> clearfix">
 			<span class="pull-left">[[topic:deleted_message]]</span>
 			<span class="pull-right">