Merge branch 'master' into develop

less/outgoing.less

@@ -3,5 +3,7 @@
 		max-width: 100%;
 		overflow: hidden;
 		text-overflow: ellipse;
+		white-space: inherit;
+		word-break: break-all;
 	}
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-theme-persona",
-  "version": "6.1.5",
+  "version": "6.1.8",
   "nbbpm": {
     "compatibility": "^1.4.4 || ^1.5.0 || ^1.6.0"
   },

templates/account/ignored.tpl

@@ -0,0 +1 @@
+<!-- IMPORT account/topics.tpl -->

templates/partials/account/menu.tpl

@@ -58,6 +58,7 @@
 		<!-- IF showHidden -->
 		<li><a href="{config.relative_path}/user/{userslug}/bookmarks">[[user:bookmarks]]</a></li>
 		<li><a href="{config.relative_path}/user/{userslug}/watched">[[user:watched]]</a></li>
+		<li><a href="{config.relative_path}/user/{userslug}/ignored">[[user:ignored]]</a></li>
 		<!-- IF !reputation:disabled -->
 		<li><a href="{config.relative_path}/user/{userslug}/upvoted">[[global:upvoted]]</a></li>
 		<!-- IF !downvote:disabled -->

templates/partials/menu.tpl

@@ -114,6 +114,11 @@
 									<i class="fa fa-fw fa-flag"></i> <span>[[pages:flagged-content]]</span>
 								</a>
 							</li>
+							<li>
+								<a href="{relative_path}/post-queue">
+									<i class="fa fa-fw fa-list-alt"></i> <span>[[pages:post-queue]]</span>
+								</a>
+							</li>
 							<!-- IF isAdmin -->
 							<li>
 								<a href="{relative_path}/ip-blacklist">

templates/partials/modals/flag_modal.tpl

@@ -1,5 +1,5 @@
 <div class="modal" tabindex="-1" role="dialog" aria-labelledby="Flag post" aria-hidden="true">
-	<div class="modal-dialog">
+	<div class="modal-dialog modal-lg">
 		<div class="modal-content">
 			<div class="modal-header">
 				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
@@ -11,9 +11,6 @@
 				<p class="lead">
 					[[flags:modal-body, {type}, {id}]]
 				</p>
-				<div class="form-group">
-					<textarea class="form-control" id="flag-reason-custom" placeholder="[[flags:modal-reason-custom]]"></textarea>
-				</div>
 				<div class="btn-group btn-group-justified">
 					<div class="btn-group">
 						<button class="btn btn-default flag-reason">[[flags:modal-reason-spam]]</button>
@@ -21,11 +18,16 @@
 					<div class="btn-group">
 						<button class="btn btn-default flag-reason">[[flags:modal-reason-offensive]]</button>
 					</div>
+					<div class="btn-group">
+						<button class="btn btn-default toggle-custom">[[flags:modal-reason-other]]</button>
+					</div>
+				</div>
+				<div class="form-group">
+					<textarea class="form-control" id="flag-reason-custom" placeholder="[[flags:modal-reason-custom]]" disabled="disabled"></textarea>
 				</div>
-			</div>
 
-			<div class="modal-footer">
-				<button type="button" class="btn btn-primary" id="flag-post-commit" disabled>[[flags:modal-submit]]</button>
+				<button type="button" class="btn btn-primary pull-right" id="flag-post-commit" disabled>[[flags:modal-submit]]</button>
+				<div class="clear"></div>
 			</div>
 		</div>
 	</div>