Merge branch 'master' of https://github.com/NodeBB/NodeBB

public/language/en-GB/admin/advanced/events.json

@@ -3,6 +3,7 @@
 	"no-events": "There are no events",
 	"control-panel": "Events Control Panel",
 	"delete-events": "Delete Events",
+	"confirm-delete-all-events": "Are you sure you want to delete all logged events?",
 	"filters": "Filters",
 	"filters-apply": "Apply Filters",
 	"filter-type": "Event Type",

public/language/en-GB/error.json

@@ -41,6 +41,7 @@
 	"email-not-confirmed-chat": "You are unable to chat until your email is confirmed, please click here to confirm your email.",
 	"email-not-confirmed-email-sent": "Your email has not been confirmed yet, please check your inbox for the confirmation email. You won't be able to post or chat until your email is confirmed.",
 	"no-email-to-confirm": "Your account does not have an email set. An email is necessary for account recovery. Please click here to enter an email.",
+	"user-doesnt-have-email": "User \"%1\" does not have an email set.",
 	"email-confirm-failed": "We could not confirm your email, please try again later.",
 	"confirm-email-already-sent": "Confirmation email already sent, please wait %1 minute(s) to send another one.",
 	"sendmail-not-found": "The sendmail executable could not be found, please ensure it is installed and executable by the user running NodeBB.",
@@ -120,6 +121,7 @@
 	"already-unbookmarked": "You have already unbookmarked this post",
 
 	"cant-ban-other-admins": "You can't ban other admins!",
+	"cant-make-banned-users-admin": "You can't make banned users admin.",
 	"cant-remove-last-admin": "You are the only administrator. Add another user as an administrator before removing yourself as admin",
 	"account-deletion-disabled": "Account deletion is disabled",
 	"cant-delete-admin": "Remove administrator privileges from this account before attempting to delete it.",

public/src/admin/advanced/events.js

@@ -1,27 +1,31 @@
 'use strict';
 
 
-define('admin/advanced/events', function () {
-	var	Events = {};
+define('admin/advanced/events', ['bootbox'], function (bootbox) {
+	const Events = {};
 
 	Events.init = function () {
 		$('[data-action="clear"]').on('click', function () {
-			socket.emit('admin.deleteAllEvents', function (err) {
-				if (err) {
-					return app.alertError(err.message);
+			bootbox.confirm('[[admin/advanced/events:confirm-delete-all-events]]', (confirm) => {
+				if (confirm) {
+					socket.emit('admin.deleteAllEvents', function (err) {
+						if (err) {
+							return app.alertError(err.message);
+						}
+						$('.events-list').empty();
+					});
 				}
-				$('.events-list').empty();
 			});
 		});
 
 		$('.delete-event').on('click', function () {
-			var parentEl = $(this).parents('[data-eid]');
-			var eid = parentEl.attr('data-eid');
+			const $parentEl = $(this).parents('[data-eid]');
+			const eid = $parentEl.attr('data-eid');
 			socket.emit('admin.deleteEvents', [eid], function (err) {
 				if (err) {
 					return app.alertError(err.message);
 				}
-				parentEl.remove();
+				$parentEl.remove();
 			});
 		});
 
@@ -31,8 +35,8 @@ define('admin/advanced/events', function () {
 	Events.refresh = function (event) {
 		event.preventDefault();
 
-		var formEl = $('#filters');
-		ajaxify.go('admin/advanced/events?' + formEl.serialize());
+		const $formEl = $('#filters');
+		ajaxify.go('admin/advanced/events?' + $formEl.serialize());
 	};
 
 	return Events;