Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-16 02:36:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into search-cid-uid

Browse Source
This commit is contained in:
Julian Lam
2015-03-17 15:13:43 -04:00
parent 518aec6e76 406126536a
commit f8aba4f4ef
5 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@@ -45,8 +45,8 @@
"nodebb-plugin-mentions": "^0.11.0", "nodebb-plugin-mentions": "^0.11.0",
"nodebb-plugin-soundpack-default": "~0.1.1", "nodebb-plugin-soundpack-default": "~0.1.1",
"nodebb-plugin-spam-be-gone": "^0.4.0", "nodebb-plugin-spam-be-gone": "^0.4.0",
"nodebb-theme-lavender": "^1.0.6", "nodebb-theme-lavender": "^1.0.22",
"nodebb-theme-vanilla": "^1.0.28", "nodebb-theme-vanilla": "^1.0.65",
"nodebb-widget-essentials": "~0.2.12", "nodebb-widget-essentials": "~0.2.12",
"nodebb-rewards-essentials": "^0.0.1", "nodebb-rewards-essentials": "^0.0.1",
"npm": "^2.1.4", "npm": "^2.1.4",

4
public/src/ajaxify.js
View File

@@ -64,12 +64,12 @@ $(document).ready(function() {
ajaxify.handleACPRedirect = function(url) { ajaxify.handleACPRedirect = function(url) {
// If ajaxifying into an admin route from regular site, do a cold load. // If ajaxifying into an admin route from regular site, do a cold load.
url = ajaxify.removeRelativePath(url.replace(/\/$/, '')); url = ajaxify.removeRelativePath(url.replace(/\/$/, ''));
if (url.indexOf('admin') === 0 && window.location.pathname.indexOf('/admin') !== 0) { if (url.indexOf('admin') === 0 && window.location.pathname.indexOf(RELATIVE_PATH + '/admin') !== 0) {
window.open(RELATIVE_PATH + '/' + url, '_blank'); window.open(RELATIVE_PATH + '/' + url, '_blank');
return true; return true;
} }
return false; return false;
} };
ajaxify.start = function(url, quiet, search) { ajaxify.start = function(url, quiet, search) {
url = ajaxify.removeRelativePath(url.replace(/\/$/, '')); url = ajaxify.removeRelativePath(url.replace(/\/$/, ''));

2
src/categories/create.js
View File

@@ -32,7 +32,7 @@ module.exports = function(Categories) {
order: order, order: order,
link: '', link: '',
numRecentReplies: 1, numRecentReplies: 1,
class: 'col-md-3 col-xs-6', class: 'col-md-3 col-xs-12',
imageClass: 'auto' imageClass: 'auto'
}; };

3
src/emailer.js
View File

@@ -62,7 +62,8 @@ var fs = require('fs'),
plaintext: translated[1], plaintext: translated[1],
template: template, template: template,
uid: uid, uid: uid,
pid: params.pid pid: params.pid,
fromUid: params.fromUid
}); });
callback(); callback();
} else { } else {

12
src/views/partials/requirejs-config.tpl Normal file
View File

@@ -0,0 +1,12 @@
<script>
require.config({
baseUrl: "{relative_path}/src/modules",
waitSeconds: 3,
urlArgs: "{cache-buster}",
paths: {
'forum': '../forum',
'vendor': '../../vendor',
'mousetrap': '../../bower/mousetrap/mousetrap'
}
});
</script>