Merge branch '0.5.1' into hashtalk

v1.18.x
Julian Lam 11 years ago
commit 45a0d0196b

@ -3,6 +3,10 @@
"field": "title", "field": "title",
"value": "NodeBB" "value": "NodeBB"
}, },
{
"field": "showSiteTitle",
"value": "1"
},
{ {
"field": "postDelay", "field": "postDelay",
"value": 10 "value": 10

@ -2,7 +2,7 @@
"name": "nodebb", "name": "nodebb",
"license": "GPLv3 or later", "license": "GPLv3 or later",
"description": "NodeBB Forum", "description": "NodeBB Forum",
"version": "0.5.0-4", "version": "0.5.0",
"homepage": "http://www.nodebb.org", "homepage": "http://www.nodebb.org",
"repository": { "repository": {
"type": "git", "type": "git",

@ -1,7 +1,7 @@
"use strict"; "use strict";
/*global define, ajaxify, app, socket, RELATIVE_PATH*/ /*global define, ajaxify, app, socket, RELATIVE_PATH*/
define('forum/admin/index', function() { define('forum/admin/index', ['semver'], function(semver) {
var Admin = {}; var Admin = {};
var updateIntervalId = 0; var updateIntervalId = 0;
Admin.init = function() { Admin.init = function() {
@ -25,6 +25,13 @@ define('forum/admin/index', function() {
}); });
$.get('https://api.github.com/repos/NodeBB/NodeBB/tags', function(releases) { $.get('https://api.github.com/repos/NodeBB/NodeBB/tags', function(releases) {
// Re-sort the releases, as they do not follow Semver (wrt pre-releases)
releases = releases.sort(function(a, b) {
a = a.name.replace(/^v/, '');
b = b.name.replace(/^v/, '');
return semver.lt(a, b) ? 1 : -1;
});
var version = $('#version').html(), var version = $('#version').html(),
latestVersion = releases[0].name.slice(1), latestVersion = releases[0].name.slice(1),
checkEl = $('.version-check'); checkEl = $('.version-check');

Binary file not shown.

Before

Width:  |  Height:  |  Size: 262 KiB

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save