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

less/category.less

@@ -147,3 +147,8 @@
 	font-weight: normal;
 	line-height: 1.42857143;
 }
+
+.category-dropdown-menu {
+	max-height: 500px;
+	overflow-y: auto;
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "4.2.7",
+  "version": "4.2.10",
   "nbbpm": {
     "compatibility": "^1.4.4"
   },

templates/recent.tpl

@@ -15,7 +15,7 @@
 				<!-- IF selectedCategory --><!-- IF selectedCategory.icon --><i class="fa fa-fw {selectedCategory.icon}"></i><!-- ENDIF selectedCategory.icon --> {selectedCategory.name}<!-- ELSE -->
 				[[unread:all_categories]]<!-- ENDIF selectedCategory --> <span class="caret"></span>
 			</button>
-			<ul class="dropdown-menu" role="menu">
+			<ul class="dropdown-menu category-dropdown-menu" role="menu">
 				<li role="presentation" class="category">
 					<a role="menu-item" href="{config.relative_path}/{selectedFilter.url}"><i class="fa fa-fw <!-- IF !selectedCategory -->fa-check<!-- ENDIF !selectedCategory -->"></i> [[unread:all_categories]]</a>
 				</li>

templates/topic.tpl

@@ -20,7 +20,7 @@
 				<a href="{config.relative_path}/user/{deleter.userslug}">
 					<strong>{deleter.username}</strong>
 				</a>
-				<small class="timeago" title="{deletedTimestamp}"></small>
+				<small class="timeago" title="{deletedTimestampISO}"></small>
 				<!-- ENDIF deleter -->
 			</span>
 		</div>

templates/unread.tpl

@@ -13,7 +13,7 @@
 			<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
 				[[unread:mark_as_read]] <span class="caret"></span>
 			</button>
-			<ul class="dropdown-menu" role="menu">
+			<ul class="dropdown-menu category-dropdown-menu" role="menu">
 
 				<li role="presentation">
 					<a id="markSelectedRead" role="menuitem" tabindex="-1" href="#">[[unread:selected]]</a>
@@ -36,7 +36,7 @@
 				<!-- IF selectedCategory --><!-- IF selectedCategory.icon --><i class="fa fa-fw {selectedCategory.icon}"></i><!-- ENDIF selectedCategory.icon --> {selectedCategory.name}<!-- ELSE -->
 				[[unread:all_categories]]<!-- ENDIF selectedCategory --> <span class="caret"></span>
 			</button>
-			<ul class="dropdown-menu" role="menu">
+			<ul class="dropdown-menu category-dropdown-menu" role="menu">
 				<li role="presentation" class="category">
 					<a role="menu-item" href="{config.relative_path}/{selectedFilter.url}"><i class="fa fa-fw <!-- IF !selectedCategory -->fa-check<!-- ENDIF !selectedCategory -->"></i> [[unread:all_categories]]</a>
 				</li>