Compare commits

...

12 Commits

Author SHA1 Message Date
Julian Lam
d341428ca1 0.5.2 2014-10-18 00:27:37 -04:00
Julian Lam
b81b5fdf50 updated shrinkwrap file 2014-10-18 00:22:29 -04:00
Julian Lam
964e2b09a9 Merge branch 'master' into v0.5.x 2014-10-18 00:18:57 -04:00
Julian Lam
62477c7d9b fixed #2214 - each individual thread will create its own logrotate write handler, because if one is closed, everything crashes in a cascade effect because we're calling .write() after .end(), bleh. 2014-10-13 14:20:23 -04:00
Barış Soner Uşaklı
c3c560a48a Merge pull request #2216 from kazrudys/v0.5.x
Fix for Outgoing Links Warning page being displayed in IE for internal links
2014-10-03 11:38:11 -04:00
Kaz Rudys
740fae7fd8 Fix for Outgoing Links Warning page being displayed in IE for internal links.
IE appears to set the 'host' property of anchor tags to "" for internal links, this was causing all internal links to be treated as external and therefore being rewritten to point at the Outgoing Link Warning page at /outgoing/
2014-10-03 09:04:38 +01:00
Julian Lam
598784b909 Merge pull request #2192 from Fusselwurm/patch-1
fix 403 handling in ajaxify.js
2014-10-01 02:16:39 -04:00
Moritz Schmidt
bc44aeac4b fix 403 handling in ajaxify.js
Fix typo from dedf7a6715
2014-10-01 08:14:48 +02:00
Julian Lam
0b806e16d5 Revert "bumping to 0.5.2 for dev purposes"
This reverts commit e6824fd727.
2014-10-01 00:31:09 -04:00
Julian Lam
575ce47d52 Merge branch 'master' into v0.5.x 2014-10-01 00:30:29 -04:00
Julian Lam
7c14e6f894 added shrinkwrap file 2014-10-01 00:00:52 -04:00
Julian Lam
8bf3c484cc removing console.log 2014-09-30 23:58:52 -04:00
4 changed files with 5 additions and 5 deletions

2
app.js
View File

@@ -357,4 +357,4 @@ function restart() {
winston.error('[app] Could not restart server. Shutting down.'); winston.error('[app] Could not restart server. Shutting down.');
shutdown(1); shutdown(1);
} }
} }

View File

@@ -249,4 +249,4 @@ async.series([
if (err) { if (err) {
console.log('[loader] Error during startup: ' + err.message); console.log('[loader] Error during startup: ' + err.message);
} }
}); });

View File

@@ -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.2-dev", "version": "0.5.2",
"homepage": "http://www.nodebb.org", "homepage": "http://www.nodebb.org",
"repository": { "repository": {
"type": "git", "type": "git",

View File

@@ -35,7 +35,7 @@ $(document).ready(function() {
} else if (data.status === 401) { } else if (data.status === 401) {
app.alertError('[[global:please_log_in]]'); app.alertError('[[global:please_log_in]]');
return ajaxify.go('login'); return ajaxify.go('login');
} else if (data.statuc === 403) { } else if (data.status === 403) {
app.alertError('[[error:no-privileges]]'); app.alertError('[[error:no-privileges]]');
} else if (data.status === 302) { } else if (data.status === 302) {
return ajaxify.go(data.responseJSON.slice(1), callback, quiet); return ajaxify.go(data.responseJSON.slice(1), callback, quiet);
@@ -311,4 +311,4 @@ $(document).ready(function() {
}); });
}); });
}); });