Merge remote-tracking branch 'upstream/master'

package.json

@@ -38,7 +38,7 @@
     "prompt": "~0.2.11",
     "uglify-js": "~2.4.0",
     "validator": "~1.5.1",
-    "nodebb-plugin-mentions": "~0.2",
+    "nodebb-plugin-mentions": "~0.3",
     "nodebb-plugin-markdown": "~0.3",
     "nodebb-theme-vanilla": "~0.0.13",
     "nodebb-theme-cerulean": "~0.0.12",

public/src/forum/admin/groups.js

@@ -171,13 +171,17 @@ define(function() {
 		groupMembersEl.on('click', 'li[data-uid]', function() {
 			var uid = this.getAttribute('data-uid'),
 				gid = detailsModal.attr('data-gid');
-
+			
-			socket.emit('admin.groups.leave', {
+			bootbox.confirm('Are you sure you want to remove this user?', function(confirm) {
-				gid: gid,
+				if (confirm){
-				uid: uid
+					socket.emit('admin.groups.leave', {
-			}, function(err, data) {
+						gid: gid,
-				if (!err) {
+						uid: uid
-					groupMembersEl.find('li[data-uid="' + uid + '"]').remove();
+						}, function(err, data) {
+						if (!err) {
+							groupMembersEl.find('li[data-uid="' + uid + '"]').remove();
+						}
+					});
 				}
 			});
 		});

public/src/forum/admin/themes.js

@@ -114,7 +114,7 @@ define(function() {
 
 		for (var x = 0; x < numThemes; x++) {
 			var theme = bootswatch.themes[x];
-			themeEl.setAttribute('data-css', theme.cssMin);
+			themeEl.setAttribute('data-css', theme.cssCdn);
 			themeEl.setAttribute('data-theme', theme.name);
 			themeEl.innerHTML = '<img src="' + theme.thumbnail + '" />' +
 				'<div>' +

public/src/modules/chat.js

@@ -131,7 +131,8 @@ define(['taskbar', 'string'], function(taskbar, S) {
 				chatModal.draggable({
 					start:function() {
 						module.bringModalToTop(chatModal);
-					}
+					},
+					handle: '.modal-header'
 				});
 
 				chatModal.find('#chat-with-name').html(username);

public/templates/admin/groups.tpl

@@ -95,4 +95,4 @@
 			</div>
 		</div>
 	</div>
-</div>
+</div>