Compare commits

...

11 Commits

Author SHA1 Message Date
Misty (Bot)
3a49b52ca1 chore: incrementing version number - v1.11.2 2019-01-24 21:28:58 +00:00
Misty (Bot)
f2d5b2c2fe Merge commit 'bc41848adb6c2a84c74a88598b87334a179ecabf' into v1.11.x 2019-01-24 21:28:57 +00:00
Julian Lam
c1042ee471 fix: removal of timeago fallback middleware (#7259)
* fix: removal of timeago fallback middleware

Instead of loading English fallback on missing language, we opt
to not send a script tag for a missing language to begin with.

Timeago already loads with English as default, so it will just
continue to use English.

* fix: check userLang against supported language codes

* fix: cleaned up code as per @pitaj

* fix: added comments

* fix: more fixes as per @pitaj

* feat: added addl. test for timeago locales, fixed broken test
2019-01-18 16:17:45 -05:00
Barış Soner Uşaklı
53c13976b6 backport unread inf scroll fix 2019-01-08 18:57:12 -05:00
Barış Soner Uşaklı
1cdb6af5dc backport unread inf scroll fix 2018-12-16 10:25:17 -05:00
Misty (Bot)
b0a44d866b chore: incrementing version number - v1.11.1 2018-12-14 21:17:50 +00:00
Misty (Bot)
77b767331b Merge commit 'f3e8e065033025084e0b6752025f73286b10efc3' into v1.11.x 2018-12-14 21:17:50 +00:00
renovate[bot]
ab5035f4e2 fix(deps): update dependency nodebb-plugin-dbsearch to v3.0.3 (#7035) 2018-11-30 12:54:13 -05:00
Baris Usakli
2555d72c84 change deprecated message 2018-11-30 12:53:21 -05:00
Barış Soner Uşaklı
213582df8b dont crash for undefined categories 2018-11-29 10:41:37 -05:00
Misty (Bot)
543336070a Incremented version number - v1.11.0 2018-11-28 21:53:14 +00:00
2 changed files with 4 additions and 2 deletions

View File

@@ -2,7 +2,7 @@
"name": "nodebb",
"license": "GPL-3.0",
"description": "NodeBB Forum",
"version": "1.11.1",
"version": "1.11.2",
"homepage": "http://www.nodebb.org",
"repository": {
"type": "git",
@@ -169,4 +169,4 @@
"url": "https://github.com/barisusakli"
}
]
}
}

View File

@@ -1,5 +1,6 @@
'use strict';
var path = require('path');
var async = require('async');
var nconf = require('nconf');
var jsesc = require('jsesc');
@@ -16,6 +17,7 @@ var translator = require('../translator');
var privileges = require('../privileges');
var languages = require('../languages');
var utils = require('../utils');
var file = require('../file');
var controllers = {
api: require('../controllers/api'),