From f9e8178d25400df1b9c71d718120677e6bb2b9e9 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 20 Jan 2014 13:16:23 -0500 Subject: [PATCH 1/4] fixed timeagago for zh_cn --- public/src/translator.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/src/translator.js b/public/src/translator.js index afc726d446..2cebc85fc7 100644 --- a/public/src/translator.js +++ b/public/src/translator.js @@ -39,6 +39,10 @@ languageCode = 'cz'; break; + case 'zh_cn': + languageCode = 'zh-CN'; + break; + default: languageCode = config.defaultLang; break; From 2654a8e86aa1e5594dabed8afac3b45ed8592b15 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 20 Jan 2014 13:22:03 -0500 Subject: [PATCH 2/4] added cache buster to ACP theme --- public/templates/admin/header.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/templates/admin/header.tpl b/public/templates/admin/header.tpl index ee3b7f2339..05159da6d0 100644 --- a/public/templates/admin/header.tpl +++ b/public/templates/admin/header.tpl @@ -37,7 +37,7 @@ - + From 663aff4b246e43ecd58401e9c0a19443f46e0f55 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 20 Jan 2014 13:41:46 -0500 Subject: [PATCH 3/4] fixed #723 - bootswatch now using BootstrapCDN, scheme-independant URL --- public/src/forum/admin/themes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/forum/admin/themes.js b/public/src/forum/admin/themes.js index 5163f0df1d..7c0baaa568 100644 --- a/public/src/forum/admin/themes.js +++ b/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 = '' + '
' + From 9c9fadb5a1a1c8120cc26dbbb4f9918435bdc03a Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 20 Jan 2014 14:53:09 -0500 Subject: [PATCH 4/4] upping mentions minver --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5ba0ddfbd4..1cb47da746 100644 --- a/package.json +++ b/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",