From da8795f666d1719237b88ae66bbbb3ecdbe72f23 Mon Sep 17 00:00:00 2001 From: pichalite Date: Thu, 29 Dec 2016 19:41:43 +0000 Subject: [PATCH 1/6] Add missing translations --- public/language/en-GB/global.json | 4 +++- public/language/en-GB/modules.json | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/public/language/en-GB/global.json b/public/language/en-GB/global.json index 57be9a9468..bb152e4561 100644 --- a/public/language/en-GB/global.json +++ b/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" } diff --git a/public/language/en-GB/modules.json b/public/language/en-GB/modules.json index 556ef2fbf4..5f258128f8 100644 --- a/public/language/en-GB/modules.json +++ b/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", From a86134cc5bc0c3cad7787aaec00e7efac868aabb Mon Sep 17 00:00:00 2001 From: loopback0 Date: Tue, 3 Jan 2017 20:18:35 +0000 Subject: [PATCH 2/6] Fix selection Tweak to allow the shift + click behaviour for the checkboxes while still letting the browser behaviour work --- public/src/modules/topicSelect.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/public/src/modules/topicSelect.js b/public/src/modules/topicSelect.js index 6169b1f891..0380e90333 100644 --- a/public/src/modules/topicSelect.js +++ b/public/src/modules/topicSelect.js @@ -10,9 +10,9 @@ 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) { var select = $(this); @@ -82,4 +82,4 @@ define('topicSelect', ['components'], function (components) { } return TopicSelect; -}); \ No newline at end of file +}); From aa32e7b35925f039c9e895f6e9601f93c67c9d3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Wed, 4 Jan 2017 00:58:32 +0300 Subject: [PATCH 3/6] fix indents --- public/src/modules/topicSelect.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/src/modules/topicSelect.js b/public/src/modules/topicSelect.js index 0380e90333..4368b97237 100644 --- a/public/src/modules/topicSelect.js +++ b/public/src/modules/topicSelect.js @@ -10,9 +10,9 @@ define('topicSelect', ['components'], function (components) { TopicSelect.init = function (onSelect) { topicsContainer = $('[component="category"]'); - topicsContainer.on('selectstart', '[component="topic/select"]', function (ev) { - ev.preventDefault(); - }); + topicsContainer.on('selectstart', '[component="topic/select"]', function (ev) { + ev.preventDefault(); + }); topicsContainer.on('click', '[component="topic/select"]', function (ev) { var select = $(this); From 22d0e60f08f790a02b68cc74d050754ccfee9b3d Mon Sep 17 00:00:00 2001 From: Anil Mandepudi Date: Tue, 3 Jan 2017 18:05:39 -0800 Subject: [PATCH 4/6] Update Chart.js dependency version Update Chart.js dependency to fix chart issue on category analytics page. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a9dbdfb82b..bcee688ae1 100644 --- a/package.json +++ b/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", From c42eaee30cdfae8598d5652bbe477efaaee6a4eb Mon Sep 17 00:00:00 2001 From: barisusakli Date: Wed, 4 Jan 2017 15:28:07 +0300 Subject: [PATCH 5/6] fix typo in language file --- public/language/en-GB/admin/settings/post.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/language/en-GB/admin/settings/post.json b/public/language/en-GB/admin/settings/post.json index f8aae19628..f293e554d9 100644 --- a/public/language/en-GB/admin/settings/post.json +++ b/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", From 8e7af0291a80953e5b79c3b530ebfdc0575ad38d Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Wed, 4 Jan 2017 11:50:03 -0500 Subject: [PATCH 6/6] fixed grammar in admin-manage-categories string --- public/language/en-GB/admin/manage/categories.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/language/en-GB/admin/manage/categories.json b/public/language/en-GB/admin/manage/categories.json index 8bd5d5bfcf..7e2a5ce12e 100644 --- a/public/language/en-GB/admin/manage/categories.json +++ b/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...",