Merge branch 'master' into develop

package.json

@@ -21,7 +21,7 @@
     "autoprefixer": "^6.2.3",
     "bcryptjs": "~2.3.0",
     "body-parser": "^1.9.0",
-    "chart.js": "^2.1.0",
+    "chart.js": "^2.4.0",
     "colors": "^1.1.0",
     "compression": "^1.1.0",
     "connect-ensure-login": "^0.1.1",

public/language/en-GB/admin/manage/categories.json

@@ -59,7 +59,7 @@
 	"alert.copy-success": "Settings Copied!",
 	"alert.set-parent-category": "Set Parent Category",
 	"alert.updated": "Updated Categories",
-	"alert.updated-success": "Category IDs %1 was successfully updated.",
+	"alert.updated-success": "Category IDs %1 successfully updated.",
 	"alert.upload-image": "Upload category image",
 	"alert.find-user": "Find a User",
 	"alert.user-search": "Search for a user here...",

public/language/en-GB/admin/settings/post.json

@@ -2,7 +2,7 @@
 	"sorting": "Post Sorting",
 	"sorting.post-default": "Default Post Sorting",
 	"sorting.oldest-to-newest": "Oldest to Newest",
-	"sorting.newest-to-oldest": ">Newest to Oldest",
+	"sorting.newest-to-oldest": "Newest to Oldest",
 	"sorting.most-votes": "Most Votes",
 	"sorting.topic-default": "Default Topic Sorting",
 	"restrictions": "Posting Restrictions",

public/language/en-GB/global.json

@@ -129,5 +129,7 @@
 
 	"cookies.message": "This website uses cookies to ensure you get the best experience on our website.",
 	"cookies.accept": "Got it!",
-	"cookies.learn_more": "Learn More"
+	"cookies.learn_more": "Learn More",
+	
+	"edited": "Edited"
 }

public/language/en-GB/modules.json

@@ -13,6 +13,7 @@
 	"chat.contacts": "Contacts",
 	"chat.message-history": "Message History",
 	"chat.pop-out": "Pop out chat",
+	"chat.minimize": "Minimize",
 	"chat.maximize": "Maximize",
 	"chat.seven_days": "7 Days",
 	"chat.thirty_days": "30 Days",

public/src/modules/topicSelect.js

@@ -10,8 +10,8 @@ define('topicSelect', ['components'], function (components) {
 
 	TopicSelect.init = function (onSelect) {
 		topicsContainer = $('[component="category"]');
-		topicsContainer.on('selectstart', function () {
-			return false;
+		topicsContainer.on('selectstart', '[component="topic/select"]', function (ev) {
+			ev.preventDefault();
 		});
 
 		topicsContainer.on('click', '[component="topic/select"]', function (ev) {
@@ -82,4 +82,4 @@ define('topicSelect', ['components'], function (components) {
 	}
 
 	return TopicSelect;
-});
+});