Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-01-31 03:40:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into 0.5.1

Browse Source
This commit is contained in:
barisusakli
2014-08-13 16:25:56 -04:00
parent 464be4f7cc 1a97302d68
commit 37115ea3d6
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
public/src/forum/topic.js
View File

@@ -351,7 +351,10 @@ define('forum/topic', dependencies, function(pagination, infinitescroll, threadT
utils.makeNumbersHumanReadable(element.find('.human-readable-number'));
element.find('span.timeago').timeago();
element.find('.post-content img:not(.emoji)').addClass('img-responsive').each(function() {
$(this).wrap('<a href="' + $(this).attr('src') + '" target="_blank">');
var $this = $(this);
if (!$this.parent().is('a')) {
$this.wrap('<a href="' + $this.attr('src') + '" target="_blank">');
}
});
postTools.updatePostCount();
showBottomPostBar();

4
src/middleware/index.js
View File

@@ -41,7 +41,7 @@ function routeThemeScreenshots(app, themes) {
(function(id, path) {
fs.exists(path, function(exists) {
if (exists) {
app.get('/css/previews/' + id, function(req, res) {
app.get(relativePath + '/css/previews/' + id, function(req, res) {
res.sendfile(path);
});
}
@@ -173,7 +173,7 @@ module.exports = function(app, data) {
if(meta.config.cookieDomain) {
cookie.domain = meta.config.cookieDomain;
}
app.use(session({
store: db.sessionStore,
secret: nconf.get('secret'),