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

less/search.less

@@ -2,6 +2,11 @@
 	.user-img {
 		.user-icon-style(24px, 1.5, 50%);
 	}
+	.post-search-item {
+		.bootstrap-tagsinput {
+			display: block;
+		}
+	}
 }
 
 .search-result-text {
@@ -22,4 +27,5 @@
 	button {
 		padding: 4px 6px;
 	}
-}
+}
+

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "4.1.88",
+  "version": "4.1.90",
   "nbbpm": {
     "compatibility": "^0.8.2 || ^0.9.0 || ^1.0.0"
   },

templates/partials/categories/item.tpl

@@ -18,9 +18,11 @@
 			<!-- ENDIF !config.hideSubCategories -->
 		</h2>
 		<span class="visible-xs pull-right">
+			<!-- IF ../teaser.timestampISO -->
 			<a class="permalink" href="{../teaser.url}">
 				<small class="timeago" title="{../teaser.timestampISO}"></small>
 			</a>
+			<!-- ENDIF ../teaser.timestampISO -->
 		</span>
 	</div>
 

templates/search.tpl

@@ -48,6 +48,11 @@
 							<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>
 							<div class="row">