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

less/header.less

@@ -205,6 +205,8 @@
 			display: inline-block;
 			padding-left: 5px;
 			padding-right: 5px;
+			padding-top: 0px;
+			padding-bottom: 0px;
 		}
 
 		.open>a {

less/posts_list.less

@@ -107,6 +107,11 @@
 	}
 }
 
+.posts-list.diffs .posts-list-item .content {
+	max-height: inherit;
+	overflow-y: none;
+}
+
 @media (max-width: @screen-sm-min) {
 	.posts-list .posts-list-item .post-info {
 		width: 100px;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "8.0.0",
+  "version": "8.0.9",
   "nbbpm": {
     "compatibility": "^1.8.0"
   },
@@ -40,6 +40,6 @@
   },
   "dependencies": {
     "striptags": "^3.1.1",
-    "pulling": "^1.1.1"
+    "pulling": "^1.1.2"
   }
 }

templates/account/profile.tpl

@@ -70,7 +70,7 @@
 
 			<!-- IF websiteName -->
 			<span>[[user:website]]</span>
-			<strong><a href="{websiteLink}" rel="nofollow">{websiteName}</a></strong>
+			<strong><a href="{websiteLink}" rel="nofollow noopener noreferrer">{websiteName}</a></strong>
 			<!-- ENDIF websiteName -->
 
 			<!-- IF location -->

templates/chat.tpl

@@ -46,7 +46,7 @@
 
 				<div component="chat/composer">
 					<textarea component="chat/input" placeholder="[[modules:chat.placeholder]]" class="form-control chat-input mousetrap" rows="1"></textarea>
-					<button class="btn btn-primary" type="button" data-action="send">[[modules:chat.send]]</button>
+					<button class="btn btn-primary" type="button" data-action="send"><i class="fa fa-fw fa-2x fa-paper-plane"></i></button>
 					<span component="chat/message/remaining">{maximumChatMessageLength}</span>
 				</div>
 			</div>

templates/login.tpl

@@ -55,7 +55,7 @@
 			<h4>[[login:alternative_logins]]</h4>
 			<ul class="alt-logins">
 				<!-- BEGIN authentication -->
-				<li class="{authentication.name}"><a rel="nofollow" target="_top" href="{config.relative_path}{authentication.url}"><i class="fa {authentication.icon} fa-3x"></i></a></li>
+				<li class="{authentication.name}"><a rel="nofollow noopener noreferrer" target="_top" href="{config.relative_path}{authentication.url}"><i class="fa {authentication.icon} fa-3x"></i></a></li>
 				<!-- END authentication -->
 			</ul>
 		</div>

templates/outgoing.tpl

@@ -7,7 +7,7 @@
 			[[notifications:outgoing_link_message, {title}]]
 		</h3>
 		<p>
-			<a href="{outgoing}" rel="nofollow" class="btn btn-primary btn-lg">[[notifications:continue_to, {outgoing}]]</a>
+			<a href="{outgoing}" rel="nofollow noopener noreferrer" class="btn btn-primary btn-lg">[[notifications:continue_to, {outgoing}]]</a>
 			<a id="return-btn" href="#" class="btn btn-lg btn-warning">[[notifications:return_to, {title}]]</a>
 		</p>
 	</div>

templates/partials/account/menu.tpl

@@ -23,8 +23,8 @@
 			<a href="{config.relative_path}/user/{userslug}" class="inline-block" id="profile">[[user:profile]]</a>
 		</li>
 		<!-- IF showHidden -->
-		<li><a href="{config.relative_path}/user/{userslug}/settings">[[user:settings]]</a></li>
 		<li><a href="{config.relative_path}/user/{userslug}/edit">[[user:edit]]</a></li>
+		<li><a href="{config.relative_path}/user/{userslug}/settings">[[user:settings]]</a></li>
 		<!-- ENDIF showHidden -->
 
 		<!-- IF !isSelf -->

templates/partials/modals/post_history.tpl

@@ -19,6 +19,6 @@
 
 	<hr />
 
-	<ul class="posts-list"></ul>
+	<ul class="posts-list diffs"></ul>
 </div>
 <!-- END -->

templates/partials/move_post_modal.tpl

@@ -1,4 +1,22 @@
-<div>
+<div class="panel panel-primary fork-thread-card">
+	<div class="panel-heading">
+		<h3 class="panel-title">[[topic:thread_tools.move-posts]]</h3>
+	</div>
+	<div class="panel-body">
+		<div>
 			<label for="topicId">[[topic:topic_id]]</label>
 			<input id="topicId" type="text" class="form-control" placeholder="[[topic:topic_id_placeholder]]"><br/>
+		</div>
+		<p>
+			[[topic:move_posts_instruction]]<br />
+			<strong><span id="pids"></span></strong>
+		</p>
+	</div>
+	<div class="panel-footer">
+		&nbsp;
+		<div class="btn-group pull-right">
+			<button class="btn btn-link btn-xs" id="move_posts_cancel">[[global:buttons.close]]</button>
+			<button class="btn btn-primary btn-xs" id="move_posts_confirm" disabled>[[topic:move]]</button>
+		</div>
+	</div>
 </div>

templates/partials/topic/topic-menu-list.tpl

@@ -7,6 +7,7 @@
 <li class="divider"></li>
 <li><a component="topic/move" href="#"><i class="fa fa-fw fa-arrows"></i> [[topic:thread_tools.move]]</a></li>
 <li><a component="topic/fork" href="#"><i class="fa fa-fw fa-code-fork"></i> [[topic:thread_tools.fork]]</a></li>
+<li><a component="topic/move-posts" href="#"><i class="fa fa-fw fa-arrows"></i> [[topic:thread_tools.move-posts]]</a></li>
 <li class="divider"></li>
 <!-- ENDIF privileges.editable -->
 

templates/register.tpl

@@ -68,7 +68,7 @@
 			<h4>[[register:alternative_registration]]</h4>
 			<ul class="alt-logins">
 				<!-- BEGIN authentication -->
-				<li class="{authentication.name}"><a rel="nofollow" target="_top" href="{config.relative_path}{authentication.url}"><i class="fa {authentication.icon} fa-3x"></i></i></a></li>
+				<li class="{authentication.name}"><a rel="nofollow noopener noreferrer" target="_top" href="{config.relative_path}{authentication.url}"><i class="fa {authentication.icon} fa-3x"></i></i></a></li>
 				<!-- END authentication -->
 			</ul>
 		</div>

templates/search.tpl

@@ -34,9 +34,24 @@
 					<div class="panel-body search-options collapse <!-- IF expandSearch -->in<!-- ENDIF expandSearch -->">
 
 						<div class="form-group post-search-item">
+							<div class="row">
+								<div class="col-md-3">
+									<label>[[search:match-words]]</label>
+									<select id="match-words-filter" class="form-control">
+										<option value="all">[[search:all]]</option>
+										<option value="any">[[search:any]]</option>
+									</select>
+								</div>
+								<div class="col-md-3">
 									<label>[[search:posted-by]]</label>
 									<input type="text" class="form-control" id="posted-by-user" placeholder="[[search:posted-by]]">
 								</div>
+								<div class="col-md-6">
+									<label>[[search:has-tags]]</label>
+									<input type="text" class="form-control" id="has-tags">
+								</div>
+							</div>
+						</div>
 
 						<div class="form-group post-search-item">
 							<label>[[search:in-categories]]</label>
@@ -48,10 +63,6 @@
 							<input type="checkbox" id="search-children"> [[search:search-child-categories]]
 						</div>
 
-						<div class="form-group post-search-item">
-							<label>[[search:has-tags]]</label>
-							<input type="text" class="form-control" id="has-tags">
-						</div>
 
 						<div class="form-group post-search-item">
 							<label>[[search:reply-count]]</label>