From 245c83c3756645df378f001be1688f9f58abd6e9 Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Wed, 17 Jan 2018 14:01:37 -0500
Subject: [PATCH 1/9] change move post modal

---
 templates/partials/move_post_modal.tpl | 25 ++++---------------------
 1 file changed, 4 insertions(+), 21 deletions(-)

diff --git a/templates/partials/move_post_modal.tpl b/templates/partials/move_post_modal.tpl
index 8973ac1..1f623e7 100644
--- a/templates/partials/move_post_modal.tpl
+++ b/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 class="modal-dialog">
-		<div class="modal-content">
-			<div class="modal-header">
-				<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>
\ No newline at end of file
+<div>
+	<label for="topicId">[[topic:topic_id]]</label>
+	<input id="topicId" type="text" class="form-control" placeholder="[[topic:topic_id_placeholder]]"><br/>
+</div>

From 1b3fad24f75d294f2f2ce681c6532d07f352e391 Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Wed, 17 Jan 2018 14:02:21 -0500
Subject: [PATCH 2/9] 7.2.17

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b32820c..735728a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "7.2.16",
+  "version": "7.2.17",
   "nbbpm": {
     "compatibility": "^1.7.0"
   },

From 2bbd2ad37bf11347e4a619ea03af7c2d899974b8 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Mon, 22 Jan 2018 10:22:20 -0500
Subject: [PATCH 3/9] nodebb/nodebb#6262

---
 templates/partials/categories/link.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/partials/categories/link.tpl b/templates/partials/categories/link.tpl
index 36507c7..0f91cda 100644
--- a/templates/partials/categories/link.tpl
+++ b/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 -->

From 4e4b76e9b771ed87a634295e2a18ca968b295299 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Mon, 22 Jan 2018 10:22:36 -0500
Subject: [PATCH 4/9] 7.2.18

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 735728a..74a9e35 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "7.2.17",
+  "version": "7.2.18",
   "nbbpm": {
     "compatibility": "^1.7.0"
   },

From bd3e5b079c32efa2d2577798370f1fd58fa21191 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <baris@nodebb.org>
Date: Fri, 26 Jan 2018 12:19:48 -0500
Subject: [PATCH 5/9] https://github.com/NodeBB/NodeBB/issues/6248

---
 templates/topic.tpl | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/templates/topic.tpl b/templates/topic.tpl
index 2b3d07b..12a5d64 100644
--- a/templates/topic.tpl
+++ b/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">

From d9bee6b8ec065874b370973063db4b841deb4c06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <baris@nodebb.org>
Date: Fri, 26 Jan 2018 12:20:19 -0500
Subject: [PATCH 6/9] 7.2.14

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 74a9e35..556462c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "7.2.18",
+  "version": "7.2.14",
   "nbbpm": {
     "compatibility": "^1.7.0"
   },

From 37068623fdeddc8d342ed1a7a41f492b836afc5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <baris@nodebb.org>
Date: Fri, 26 Jan 2018 12:20:33 -0500
Subject: [PATCH 7/9] 7.2.19

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 556462c..392de55 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "7.2.14",
+  "version": "7.2.19",
   "nbbpm": {
     "compatibility": "^1.7.0"
   },

From 1c783033811ad08e561e29de539cf9d5a27f8221 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <baris@nodebb.org>
Date: Mon, 29 Jan 2018 11:36:17 -0500
Subject: [PATCH 8/9] https://github.com/NodeBB/NodeBB/issues/6287

---
 templates/popular.tpl | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/templates/popular.tpl b/templates/popular.tpl
index d1cd53f..6a64555 100644
--- a/templates/popular.tpl
+++ b/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>
\ No newline at end of file

From 41b2f27a26e0fbe63a8fb20898fa5c6465611db6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <baris@nodebb.org>
Date: Mon, 29 Jan 2018 11:38:43 -0500
Subject: [PATCH 9/9] 7.2.20

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 392de55..8411c11 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "7.2.19",
+  "version": "7.2.20",
   "nbbpm": {
     "compatibility": "^1.7.0"
   },