Merge branch 'master' into edit_delete

This commit is contained in:
Julian Lam
2013-05-11 22:05:10 -04:00
12 changed files with 1530 additions and 40 deletions

View File

@@ -5,6 +5,10 @@ var RDB = require('./redis.js'),
topics = require('./topics.js'),
config = require('../config.js');
marked.setOptions({
breaks: true
});
(function(Posts) {
Posts.get = function(callback, tid, current_user, start, end) {
@@ -36,7 +40,7 @@ var RDB = require('./redis.js'),
'user_rep' : user_data[uid].reputation || 0,
'gravatar' : user_data[uid].picture,
'fav_star_class' : vote_data[pid] ? 'icon-star' : 'icon-star-empty',
'display_moderator_tools' : uid == current_user ? 'show' : 'none',
'display_moderator_tools': (uid == current_user || viewer_data.reputation >= config.privilege_thresholds.manage_content) ? 'show' : 'none',
'edited-class': post_data.editor[i] !== null ? '' : 'none',
'editor': post_data.editor[i] !== null ? user_data[post_data.editor[i]].username : '',
'relativeEditTime': post_data.editTime !== null ? utils.relativeTime(post_data.editTime[i]) : ''