From d816b1659a98861693a17eb5c765f1b126a62b85 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Fri, 1 Sep 2017 16:04:00 -0400
Subject: [PATCH 01/40] re-exposing taskbar on mobile layout

---
 less/modules/taskbar.less | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/less/modules/taskbar.less b/less/modules/taskbar.less
index 9b18749..ad73c0e 100644
--- a/less/modules/taskbar.less
+++ b/less/modules/taskbar.less
@@ -137,11 +137,9 @@
 		}
 	}
 
-
-	@media (max-width: 979px) {
-		/*
-	 		Gets in the way of entering text when writing posts
-		*/
-		display: none !important;
+	@media (max-width: @screen-sm) {
+		.nav.navbar-nav {
+			margin: 0;
+		}
 	}
 }
\ No newline at end of file

From 6b2c3fa44ae61b2a0456118774c0900bfc3defca Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Wed, 26 Jul 2017 14:00:35 -0400
Subject: [PATCH 02/40] add hideEmail/hideFullname setting

---
 templates/account/settings.tpl | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/templates/account/settings.tpl b/templates/account/settings.tpl
index 7157d63..4df6558 100644
--- a/templates/account/settings.tpl
+++ b/templates/account/settings.tpl
@@ -124,16 +124,21 @@
 
 			<h4>[[global:privacy]]</h4>
 			<div class="well">
+				<!-- IF !hideEmail -->
 				<div class="checkbox">
 					<label>
 						<input type="checkbox" data-property="showemail" <!-- IF settings.showemail -->checked <!-- ENDIF settings.showemail -->/> <strong>[[user:show_email]]</strong>
 					</label>
 				</div>
+				<!-- ENDIF !hideEmail -->
+
+				<!-- IF !hideFullname -->
 				<div class="checkbox">
 					<label>
 						<input type="checkbox" data-property="showfullname" <!-- IF settings.showfullname -->checked<!-- ENDIF settings.showfullname -->/> <strong>[[user:show_fullname]]</strong>
 					</label>
 				</div>
+				<!-- ENDIF !hideFullname -->
 				<div class="checkbox">
 					<label>
 						<input type="checkbox" data-property="restrictChat" <!-- IF settings.restrictChat -->checked<!-- ENDIF settings.restrictChat -->/> <strong>[[user:restrict_chats]]</strong>

From 6dfa22e6edd6a1c0a6808856310984c3bb8041f8 Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Wed, 26 Jul 2017 14:01:02 -0400
Subject: [PATCH 03/40] 5.0.15

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

diff --git a/package.json b/package.json
index 368fe61..8679b3e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "5.0.14",
+  "version": "5.0.15",
   "nbbpm": {
     "compatibility": "^1.4.4"
   },

From 2ca01d73301e8747a0e99873730879c4b6e3eea5 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: Thu, 27 Jul 2017 19:57:28 -0400
Subject: [PATCH 04/40] fix missing group

---
 templates/partials/groups/memberlist.tpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/partials/groups/memberlist.tpl b/templates/partials/groups/memberlist.tpl
index a1106c0..a24f2f3 100644
--- a/templates/partials/groups/memberlist.tpl
+++ b/templates/partials/groups/memberlist.tpl
@@ -5,7 +5,7 @@
 
 <table component="groups/members" class="table table-striped table-hover" data-nextstart="{group.membersNextStart}">
 	<tbody>
-	<!-- BEGIN members -->
+	<!-- BEGIN group.members -->
 	<tr data-uid="{group.members.uid}">
 		<td>
 			<a href="{config.relative_path}/user/{group.members.userslug}">
@@ -32,6 +32,6 @@
 			<!-- ENDIF group.isOwner -->
 		</td>
 	</tr>
-	<!-- END members -->
+	<!-- END group.members -->
 	</tbody>
 </table>
\ No newline at end of file

From ba43eef8615cc1386ab89e876fb656361a342f80 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: Thu, 27 Jul 2017 19:58:33 -0400
Subject: [PATCH 05/40] 5.0.16

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

diff --git a/package.json b/package.json
index 8679b3e..753c109 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "5.0.15",
+  "version": "5.0.16",
   "nbbpm": {
     "compatibility": "^1.4.4"
   },

From 9240b77f3502052618a641661538adcde08dc76c Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Tue, 1 Aug 2017 13:58:36 -0400
Subject: [PATCH 06/40] https://github.com/NodeBB/NodeBB/issues/5845

---
 templates/account/profile.tpl | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/templates/account/profile.tpl b/templates/account/profile.tpl
index 147a85a..908151a 100644
--- a/templates/account/profile.tpl
+++ b/templates/account/profile.tpl
@@ -4,7 +4,15 @@
 	<div class="profile row">
 		<h1 class="fullname"><!-- IF fullname -->{fullname}<!-- ELSE -->{username}<!-- ENDIF fullname --></h1>
 		<h2 class="username"><!-- IF !banned -->@{username}<!-- ELSE -->[[user:banned]]<!-- ENDIF !banned --></h2>
-
+		<!-- IF banned -->
+		<div class="text-center">
+		<!-- IF banned_until -->
+		[[user:info.banned-until, {banned_until_readable}]]
+		<!-- ELSE -->
+		[[user:info.banned-permanently]]
+		<!-- ENDIF banned_until -->
+		</div>
+		<!-- ENDIF banned -->
 
 		<!-- IF selectedGroup.slug -->
 		<div class="text-center">

From bf847d249ae5d4a0f3d1a193e5919288e6a47bb4 Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Tue, 1 Aug 2017 13:59:22 -0400
Subject: [PATCH 07/40] 5.0.17

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

diff --git a/package.json b/package.json
index 753c109..d44894e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "5.0.16",
+  "version": "5.0.17",
   "nbbpm": {
     "compatibility": "^1.4.4"
   },

From 7b7d05fdc9644d28f457a1d7ac7d994c913f7d4c Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Tue, 1 Aug 2017 14:09:26 -0400
Subject: [PATCH 08/40] only show to admin and mods

---
 templates/account/profile.tpl | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/templates/account/profile.tpl b/templates/account/profile.tpl
index 908151a..56f4db8 100644
--- a/templates/account/profile.tpl
+++ b/templates/account/profile.tpl
@@ -4,6 +4,7 @@
 	<div class="profile row">
 		<h1 class="fullname"><!-- IF fullname -->{fullname}<!-- ELSE -->{username}<!-- ENDIF fullname --></h1>
 		<h2 class="username"><!-- IF !banned -->@{username}<!-- ELSE -->[[user:banned]]<!-- ENDIF !banned --></h2>
+		<!-- IF isAdminOrGlobalModeratorOrModerator -->
 		<!-- IF banned -->
 		<div class="text-center">
 		<!-- IF banned_until -->
@@ -13,6 +14,7 @@
 		<!-- ENDIF banned_until -->
 		</div>
 		<!-- ENDIF banned -->
+		<!-- ENDIF isAdminOrGlobalModeratorOrModerator -->
 
 		<!-- IF selectedGroup.slug -->
 		<div class="text-center">

From 4264cfae4918fdcd377078f0aa71ed0124aca684 Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Tue, 1 Aug 2017 14:09:38 -0400
Subject: [PATCH 09/40] 5.0.18

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

diff --git a/package.json b/package.json
index d44894e..052c013 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "5.0.17",
+  "version": "5.0.18",
   "nbbpm": {
     "compatibility": "^1.4.4"
   },

From 60ad04e2d6809f69080ace8859af486dc94052d8 Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Tue, 1 Aug 2017 14:35:38 -0400
Subject: [PATCH 10/40] https://github.com/NodeBB/NodeBB/issues/5775

---
 templates/flags/detail.tpl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/templates/flags/detail.tpl b/templates/flags/detail.tpl
index c9f1ee7..0c03dee 100644
--- a/templates/flags/detail.tpl
+++ b/templates/flags/detail.tpl
@@ -118,7 +118,7 @@
 				<div component="flag/notes">
 					<!-- IF !notes.length -->
 					<div class="alert alert-success text-center">[[flags:no-notes]]</div>
-					<!-- ENDIF !notes.length --> 
+					<!-- ENDIF !notes.length -->
 					<!-- BEGIN notes -->
 					<div class="media">
 						<div class="media-left">
@@ -144,12 +144,12 @@
 			<div class="col-sm-6 col-md-4">
 				<label>[[flags:quick-links]]</label>
 				<ul>
-					<li><a href="{config.relative_path}/{type}/{targetId}">[[flags:go-to-target]]</a></li>
+					<li><a href="{config.relative_path}/{type_path}/{targetId}">[[flags:go-to-target]]</a></li>
 					<li>
 						[[flags:flagged-user]]
 						<ul>
-							<li><a href="{config.relative_path}/uid/{target.user.uid}">[[flags:view-profile]]</a></li>
-							<li><a href="#" data-chat="{target.user.uid}">[[flags:start-new-chat]]</a></li>
+							<li><a href="{config.relative_path}/uid/{target.uid}">[[flags:view-profile]]</a></li>
+							<li><a href="#" data-chat="{target.uid}">[[flags:start-new-chat]]</a></li>
 						</ul>
 					</li>
 					<li>

From 86e62c145d720f7b5685eb0d2de550e4067b7c8b Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Tue, 1 Aug 2017 14:35:49 -0400
Subject: [PATCH 11/40] 5.0.19

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

diff --git a/package.json b/package.json
index 052c013..6e2575a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "5.0.18",
+  "version": "5.0.19",
   "nbbpm": {
     "compatibility": "^1.4.4"
   },

From abf95d312e2f9b329ffce1f5af29cec36fe57daa Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Tue, 1 Aug 2017 16:23:30 -0400
Subject: [PATCH 12/40] closes NodeBB/nodebb-theme-persona#370

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

diff --git a/templates/partials/menu.tpl b/templates/partials/menu.tpl
index 1e7ee22..0743440 100644
--- a/templates/partials/menu.tpl
+++ b/templates/partials/menu.tpl
@@ -108,7 +108,7 @@
 							</li>
 							<!-- IF showModMenu -->
 							<li role="presentation" class="divider"></li>
-							<li class="dropdown-header">Moderator Tools</li>
+							<li class="dropdown-header">[[pages:moderator-tools]]</li>
 							<li>
 								<a href="{relative_path}/flags">
 									<i class="fa fa-fw fa-flag"></i> <span>[[pages:flagged-content]]</span>

From ef7d12cd29c0fd49a1eaa9ad9e38dab71692c830 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Tue, 1 Aug 2017 16:23:41 -0400
Subject: [PATCH 13/40] 5.0.20

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

diff --git a/package.json b/package.json
index 6e2575a..48e6cec 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "5.0.19",
+  "version": "5.0.20",
   "nbbpm": {
     "compatibility": "^1.4.4"
   },

From 36863456f5b601fabcb95e380190883b22f510fb Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Thu, 3 Aug 2017 11:56:20 -0400
Subject: [PATCH 14/40] https://github.com/NodeBB/NodeBB/issues/5857

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

diff --git a/templates/partials/menu.tpl b/templates/partials/menu.tpl
index 0743440..1c2285b 100644
--- a/templates/partials/menu.tpl
+++ b/templates/partials/menu.tpl
@@ -210,7 +210,7 @@
 					<!-- BEGIN navigation -->
 					<!-- IF function.displayMenuItem, @index -->
 					<li class="{navigation.class}">
-						<a href="{navigation.route}" title="{navigation.title}" <!-- IF navigation.id -->id="{navigation.id}"<!-- ENDIF navigation.id --><!-- IF navigation.properties.targetBlank --> target="_blank"<!-- ENDIF navigation.properties.targetBlank -->>
+						<a class="navigation-link" href="{navigation.route}" title="{navigation.title}" <!-- IF navigation.id -->id="{navigation.id}"<!-- ENDIF navigation.id --><!-- IF navigation.properties.targetBlank --> target="_blank"<!-- ENDIF navigation.properties.targetBlank -->>
 							<!-- IF navigation.iconClass -->
 							<i class="fa fa-fw {navigation.iconClass}"></i>
 							<!-- ENDIF navigation.iconClass -->

From 2b4ba9c3d17fe0f6be251492e8914a616ea21146 Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Thu, 3 Aug 2017 11:57:20 -0400
Subject: [PATCH 15/40] 5.0.21

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

diff --git a/package.json b/package.json
index 48e6cec..7741349 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "5.0.20",
+  "version": "5.0.21",
   "nbbpm": {
     "compatibility": "^1.4.4"
   },

From 2f94933129d24989528e79a61ebb2f1f0e1d27bb 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: Wed, 16 Aug 2017 09:07:57 -0400
Subject: [PATCH 16/40] fix missing template names

---
 templates/groups/details.tpl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/templates/groups/details.tpl b/templates/groups/details.tpl
index cd37193..be94e74 100644
--- a/templates/groups/details.tpl
+++ b/templates/groups/details.tpl
@@ -70,7 +70,7 @@
 					<!-- IF !group.pending.length -->
 					<div class="alert alert-info">[[groups:pending.none]]</div>
 					<!-- ENDIF !group.pending.length -->
-					<!-- BEGIN pending -->
+					<!-- BEGIN group.pending -->
 					<tr data-uid="{group.pending.uid}">
 						<td>
 							<!-- IF group.pending.picture -->
@@ -94,7 +94,7 @@
 							</div>
 						</td>
 					</tr>
-					<!-- END pending -->
+					<!-- END group.pending -->
 				</table>
 			</div>
 		</div>
@@ -122,7 +122,7 @@
 					<!-- IF !group.invited.length -->
 					<div class="alert alert-info">[[groups:invited.none]]</div>
 					<!-- ENDIF !group.invited.length -->
-					<!-- BEGIN invited -->
+					<!-- BEGIN group.invited -->
 					<tr data-uid="{group.invited.uid}">
 						<td>
 							<!-- IF group.invited.picture -->
@@ -145,7 +145,7 @@
 							</div>
 						</td>
 					</tr>
-					<!-- END invited -->
+					<!-- END group.invited -->
 				</table>
 			</div>
 		</div>

From cd1a6e713430e634e41df80d6cc515a329c5b5ca 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: Wed, 16 Aug 2017 09:09:15 -0400
Subject: [PATCH 17/40] 5.0.22

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

diff --git a/package.json b/package.json
index 7741349..4e8fabf 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "5.0.21",
+  "version": "5.0.22",
   "nbbpm": {
     "compatibility": "^1.4.4"
   },

From 6ae256b049fae5237e9765599b3feda86e8287d7 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Thu, 17 Aug 2017 11:42:38 -0400
Subject: [PATCH 18/40] 5.0.23

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

diff --git a/package.json b/package.json
index 4e8fabf..0579da5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "5.0.22",
+  "version": "5.0.23",
   "nbbpm": {
     "compatibility": "^1.4.4"
   },

From ffe0d00d0f37a577e695073bc6e8b9623d9d1f89 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Thu, 17 Aug 2017 12:53:52 -0400
Subject: [PATCH 19/40] 5.0.24

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

diff --git a/package.json b/package.json
index 0579da5..bf23d9a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "5.0.23",
+  "version": "5.0.24",
   "nbbpm": {
     "compatibility": "^1.4.4"
   },

From 1c3449f54a48e95c813bcc34937c342dbda6ccab Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Thu, 17 Aug 2017 13:13:54 -0400
Subject: [PATCH 20/40] 5.0.25

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

diff --git a/package.json b/package.json
index bf23d9a..ec43835 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "5.0.24",
+  "version": "5.0.25",
   "nbbpm": {
     "compatibility": "^1.4.4"
   },

From 09761d3fd7d67a2429f8a4c800e1323374046d37 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Thu, 17 Aug 2017 13:31:08 -0400
Subject: [PATCH 21/40] removed gitignore for css files..

---
 .gitignore | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 386c235..1fafe72 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,3 @@
-*.css
-!less/bootstrap-flipped.css
 npm-debug.log
 sftp-config.json
 *.sublime-project

From 52cd0c3ec835415473658cf0c05965117cdb043d Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Thu, 17 Aug 2017 13:31:15 -0400
Subject: [PATCH 22/40] 5.0.26

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

diff --git a/package.json b/package.json
index ec43835..f36f2f3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "5.0.25",
+  "version": "5.0.26",
   "nbbpm": {
     "compatibility": "^1.4.4"
   },

From 61b81fdfc8d9665a6ea8ab03228615ad6c883379 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Thu, 17 Aug 2017 13:33:03 -0400
Subject: [PATCH 23/40] Revert "removed gitignore for css files.."

This reverts commit 452668cd0deafa4c23171ea84bbd774759be78dc.
---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 1fafe72..386c235 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+*.css
+!less/bootstrap-flipped.css
 npm-debug.log
 sftp-config.json
 *.sublime-project

From 1a91322cf4c927a1653dc77d2c7f0951ae8f262f Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Thu, 17 Aug 2017 13:33:39 -0400
Subject: [PATCH 24/40] npmignore too... forgot that.

---
 .npmignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.npmignore b/.npmignore
index 5fe11db..6f68237 100644
--- a/.npmignore
+++ b/.npmignore
@@ -1,5 +1,6 @@
 *.css
+!less/bootstrap-flipped.css
 npm-debug.log
 sftp-config.json
 *.sublime-project
-*.sublime-workspace
\ No newline at end of file
+*.sublime-workspace

From 417dc098d992b95c1474302b009fcd6983ea6080 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Thu, 17 Aug 2017 13:33:41 -0400
Subject: [PATCH 25/40] 5.0.27

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

diff --git a/package.json b/package.json
index f36f2f3..c80f683 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "5.0.26",
+  "version": "5.0.27",
   "nbbpm": {
     "compatibility": "^1.4.4"
   },

From 543e5d2bccdd1b690e0da0a85838e243b8a4586b Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Fri, 18 Aug 2017 16:31:10 -0400
Subject: [PATCH 26/40] theme changes for nodebb/nodebb#5873

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

diff --git a/templates/partials/notifications_list.tpl b/templates/partials/notifications_list.tpl
index 505dcb8..8182798 100644
--- a/templates/partials/notifications_list.tpl
+++ b/templates/partials/notifications_list.tpl
@@ -4,7 +4,7 @@
 <!-- ENDIF !notifications.length -->
 
 <!-- BEGIN notifications -->
-<li class="{notifications.readClass}" data-nid="{notifications.nid}">
+<li class="{notifications.readClass}" data-nid="{notifications.nid}"<!-- IF ../index --> data-index="{../index}" data-tid="{../tid}"<!-- ENDIF ../index -->>
 	<!-- IF notifications.image -->
 	<!-- IF notifications.from -->
 	<a href="{config.relative_path}/user/{notifications.user.userslug}"><img class="pull-left user-img avatar avatar-md avatar-rounded"src="{notifications.image}" /></a>

From 90317775cc19d6091501b8d1e2ef4efc9dc4e65d Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Fri, 18 Aug 2017 16:31:25 -0400
Subject: [PATCH 27/40] 5.0.28

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

diff --git a/package.json b/package.json
index c80f683..8a13239 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "5.0.27",
+  "version": "5.0.28",
   "nbbpm": {
     "compatibility": "^1.4.4"
   },

From 303a5171a05a46a028d455feb488b1bfb14a0e94 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, 18 Aug 2017 18:53:41 -0400
Subject: [PATCH 28/40] change data attribs

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

diff --git a/templates/partials/notifications_list.tpl b/templates/partials/notifications_list.tpl
index 8182798..5264f98 100644
--- a/templates/partials/notifications_list.tpl
+++ b/templates/partials/notifications_list.tpl
@@ -4,7 +4,7 @@
 <!-- ENDIF !notifications.length -->
 
 <!-- BEGIN notifications -->
-<li class="{notifications.readClass}" data-nid="{notifications.nid}"<!-- IF ../index --> data-index="{../index}" data-tid="{../tid}"<!-- ENDIF ../index -->>
+<li class="{notifications.readClass}" data-nid="{notifications.nid}" data-path="{config.relative_path}{notifications.path}" <!-- IF notifications.pid --> data-pid="{notifications.pid}"<!-- ENDIF notifications.pid --><!-- IF notifications.tid --> data-tid="{notifications.tid}"<!-- ENDIF notifications.tid -->>
 	<!-- IF notifications.image -->
 	<!-- IF notifications.from -->
 	<a href="{config.relative_path}/user/{notifications.user.userslug}"><img class="pull-left user-img avatar avatar-md avatar-rounded"src="{notifications.image}" /></a>

From be06b4dd17bfbb27e793b69fcba8a6196a48ce97 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, 18 Aug 2017 18:54:17 -0400
Subject: [PATCH 29/40] 5.0.29

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

diff --git a/package.json b/package.json
index 8a13239..d072e31 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "5.0.28",
+  "version": "5.0.29",
   "nbbpm": {
     "compatibility": "^1.4.4"
   },

From e4f58eb289fdb4e813722dbb5f05d1359033db77 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, 18 Aug 2017 19:59:04 -0400
Subject: [PATCH 30/40] add display_flag_tools

---
 templates/partials/topic/post-menu-list.tpl | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/templates/partials/topic/post-menu-list.tpl b/templates/partials/topic/post-menu-list.tpl
index 23a92c3..1222a25 100644
--- a/templates/partials/topic/post-menu-list.tpl
+++ b/templates/partials/topic/post-menu-list.tpl
@@ -63,14 +63,12 @@
 	</li>
 <!-- END postSharing -->
 
-<!-- IF config.loggedIn -->
-<!-- IF !posts.selfPost -->
+<!-- IF posts.display_flag_tools -->
 <li role="presentation" class="divider"></li>
 <li role="presentation">
 	<a component="post/flag" role="menuitem" tabindex="-1" href="#">
 		[[topic:flag_title]]
 	</a>
 </li>
-<!-- ENDIF !posts.selfPost -->
-<!-- ENDIF config.loggedIn -->
+<!-- ENDIF posts.display_flag_tools -->
 <!-- ENDIF !posts.deleted -->
\ No newline at end of file

From 43be71a1cb12787a495b535df953cf036bc71748 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, 18 Aug 2017 19:59:40 -0400
Subject: [PATCH 31/40] 5.0.30

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

diff --git a/package.json b/package.json
index d072e31..d9afd24 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "5.0.29",
+  "version": "5.0.30",
   "nbbpm": {
     "compatibility": "^1.4.4"
   },

From 205f61cb86d135003f7b4becb294a06293097e35 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, 21 Aug 2017 16:30:15 -0400
Subject: [PATCH 32/40] if there are not categories/filters dont show dropdowns

---
 templates/recent.tpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/recent.tpl b/templates/recent.tpl
index 2d42221..7a11a7c 100644
--- a/templates/recent.tpl
+++ b/templates/recent.tpl
@@ -14,7 +14,7 @@
 			<!-- ENDIF loggedIn -->
 		</div>
 
-		<div class="btn-group pull-right category-dropdown-container">
+		<div class="btn-group pull-right category-dropdown-container <!-- IF !categories.length -->hidden<!-- ENDIF !categories.length -->">
 			<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
 				<!-- IF selectedCategory --><!-- IF selectedCategory.icon --><span class="fa-stack"><i style="color: {selectedCategory.bgColor};" class="fa fa-circle fa-stack-2x"></i><i class="fa fa-fw fa-stack-1x {selectedCategory.icon}" style="color: {selectedCategory.color};"></i></span><!-- ENDIF selectedCategory.icon --> {selectedCategory.name}<!-- ELSE -->
 				[[unread:all_categories]]<!-- ENDIF selectedCategory --> <span class="caret"></span>
@@ -31,7 +31,7 @@
 			</ul>
 		</div>
 
-		<div class="btn-group pull-right">
+		<div class="btn-group pull-right <!-- IF !filters.length -->hidden<!-- ENDIF !filters.length -->">
 			<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
 			{selectedFilter.name} <span class="caret"></span>
 			</button>

From 838aa34750104c38e2db57457764a815d51b7f1a 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, 21 Aug 2017 16:30:41 -0400
Subject: [PATCH 33/40] 5.0.31

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

diff --git a/package.json b/package.json
index d9afd24..5de6ce4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "5.0.30",
+  "version": "5.0.31",
   "nbbpm": {
     "compatibility": "^1.4.4"
   },

From 505ac95ba13b62b2136fd13a05ec3c12b585780a 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: Tue, 22 Aug 2017 10:23:21 -0400
Subject: [PATCH 34/40] https://github.com/NodeBB/NodeBB/issues/5888

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

diff --git a/templates/partials/menu.tpl b/templates/partials/menu.tpl
index 1c2285b..7dfb2f0 100644
--- a/templates/partials/menu.tpl
+++ b/templates/partials/menu.tpl
@@ -10,7 +10,7 @@
 					<img alt="{brand:logo:alt}" class="{brand:logo:display} forum-logo" src="{brand:logo}" />
 				</a>
 				<!-- IF config.showSiteTitle -->
-				<a href="{relative_path}/">
+				<a href="<!-- IF title:url -->{title:url}<!-- ELSE -->{relative_path}/<!-- ENDIF title:url -->">
 					<h1 class="navbar-brand forum-title">{title}</h1>
 				</a>
 				<!-- ENDIF config.showSiteTitle -->

From b2e446cd4cde6bdf562caf252a4eeee7b0400f1e 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: Tue, 22 Aug 2017 10:25:56 -0400
Subject: [PATCH 35/40] 5.0.32

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

diff --git a/package.json b/package.json
index 5de6ce4..9d3d00c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "5.0.31",
+  "version": "5.0.32",
   "nbbpm": {
     "compatibility": "^1.4.4"
   },

From b93b87e6d828850b7ada9e398bc3e737ed08ae25 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Tue, 29 Aug 2017 11:39:38 -0400
Subject: [PATCH 36/40] nodebb/nodebb#5868

---
 less/chats.less | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/less/chats.less b/less/chats.less
index 94d4525..9212800 100644
--- a/less/chats.less
+++ b/less/chats.less
@@ -187,6 +187,10 @@
 		.close {
 			padding: 0.5em;
 		}
+
+		.users-tag-container span:only-of-type [data-role="remove"] {
+			display: none;
+		}
 	}
 
 	.chat-content {

From 84afb1fd59023f8c8f9e214e4ec28c1894214b87 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Tue, 29 Aug 2017 11:40:04 -0400
Subject: [PATCH 37/40] 5.0.33

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

diff --git a/package.json b/package.json
index 9d3d00c..49d6fce 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "5.0.32",
+  "version": "5.0.33",
   "nbbpm": {
     "compatibility": "^1.4.4"
   },

From 03bc6543923bb7ecd69a552a32c9ea87778b1c28 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Fri, 1 Sep 2017 16:03:26 -0400
Subject: [PATCH 38/40] 6.0.0

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

diff --git a/package.json b/package.json
index 49d6fce..8ef224a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "5.0.33",
+  "version": "6.0.0",
   "nbbpm": {
     "compatibility": "^1.4.4"
   },

From 788399c86da8aab33a391baaa58333f8798ce537 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Fri, 8 Sep 2017 11:50:16 -0400
Subject: [PATCH 39/40] moving minfile and custom scripts to the footer,
 nodebb/nodebb#5733

---
 templates/footer.tpl | 18 +++++++++++++-----
 templates/header.tpl |  6 ------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/templates/footer.tpl b/templates/footer.tpl
index 9e935fb..48d84c8 100644
--- a/templates/footer.tpl
+++ b/templates/footer.tpl
@@ -1,10 +1,6 @@
 		</div><!-- END container -->
 	</main>
 
-	<div class="hide">
-	<!-- IMPORT 500-embed.tpl -->
-	</div>
-
 	<div class="topic-search hidden">
 		<div class="btn-group">
 			<button type="button" class="btn btn-default count"></button>
@@ -20,8 +16,20 @@
 		</div>
 	</div>
 
+	<script async src="{relative_path}/assets/nodebb.min.js?{config.cache-buster}"></script>
+
+	<!-- BEGIN scripts -->
+	<script async defer type="text/javascript" src="{scripts.src}"></script>
+	<!-- END scripts -->
+
 	<script>
-		require(['forum/footer']);
+		window.addEventListener('load', function () {
+			require(['forum/footer']);
+		});
 	</script>
+
+	<div class="hide">
+	<!-- IMPORT 500-embed.tpl -->
+	</div>
 </body>
 </html>
diff --git a/templates/header.tpl b/templates/header.tpl
index a8b0984..9273ee1 100644
--- a/templates/header.tpl
+++ b/templates/header.tpl
@@ -16,12 +16,6 @@
 		};
 	</script>
 
-	<script src="{relative_path}/assets/nodebb.min.js?{config.cache-buster}"></script>
-
-	<!-- BEGIN scripts -->
-	<script type="text/javascript" src="{scripts.src}"></script>
-	<!-- END scripts -->
-
 	<!-- IF useCustomJS -->
 	{{customJS}}
 	<!-- ENDIF useCustomJS -->

From 98aa41222e74342a2f3294a8963462e5dfd1844b Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Fri, 8 Sep 2017 12:40:06 -0400
Subject: [PATCH 40/40] moved roboto link tag from CSS import to prefetched
 link tag, re: nodebb/nodebb#5733

---
 less/style.less |  2 --
 library.js      | 10 ++++++++++
 plugin.json     |  3 ++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/less/style.less b/less/style.less
index 55b6158..b068961 100644
--- a/less/style.less
+++ b/less/style.less
@@ -1,5 +1,3 @@
-@import url(https://fonts.googleapis.com/css?family=Roboto:300,400,500,700);
-
 html {
 	overflow-y: scroll;
 	min-height: 100%;
diff --git a/library.js b/library.js
index 1280951..2a45c43 100644
--- a/library.js
+++ b/library.js
@@ -117,4 +117,14 @@ library.addUserToTopic = function(data, callback) {
 	}
 };
 
+library.getLinkTags = function (data, callback) {
+	data.links.push({
+		rel: 'prefetch stylesheet',
+		type: '',
+		href: 'https://fonts.googleapis.com/css?family=Roboto:300,400,500,700',
+	});
+
+	callback(null, data);
+};
+
 module.exports = library;
diff --git a/plugin.json b/plugin.json
index 342429b..808a9d2 100644
--- a/plugin.json
+++ b/plugin.json
@@ -7,7 +7,8 @@
 		{ "hook": "filter:config.get", "method": "getThemeConfig" },
 		{ "hook": "static:app.load", "method": "init" },
 		{ "hook": "filter:admin.header.build", "method": "addAdminNavigation" },
-		{ "hook": "filter:topic.build", "method": "addUserToTopic" }
+		{ "hook": "filter:topic.build", "method": "addUserToTopic" },
+		{ "hook": "filter:meta.getLinkTags", "method": "getLinkTags"}
 	],
 	"scripts": [
 		"lib/persona.js",