Compare commits

...

23 Commits

Author SHA1 Message Date
barisusakli
7e1a07245c fixed 1 more
Conflicts:
	src/topics/posts.js
2014-05-14 16:14:39 -04:00
barisusakli
80821da9d8 fixes 2 privilege issues 2014-05-14 16:13:45 -04:00
Julian Lam
227d567d48 updated package deps in 0.4.x branch so it doesn't pull theme versions that are too new 2014-05-14 00:27:31 -04:00
Julian Lam
dca1f253e7 updated shrinkwrap file 2014-05-14 00:27:23 -04:00
barisusakli
17931ba3f3 fixed missing return 2014-05-13 21:25:12 -04:00
Julian Lam
49ed247be3 updated shrinkwrap file 2014-05-13 16:43:33 -04:00
Julian Lam
04fe8950f0 Merge branch 'master' into v0.4.x 2014-05-13 16:40:40 -04:00
Julian Lam
2832265677 fixed #1477 2014-05-04 16:47:58 -04:00
Julian Lam
5df0ebf895 updated shrinkwrap file 2014-05-02 23:55:09 -04:00
Julian Lam
0bc8b20f70 Merge branch 'master' into v0.4.x 2014-05-02 23:54:25 -04:00
Julian Lam
727ac0d534 0.4.2 2014-05-01 15:26:04 -04:00
Julian Lam
7f54cb2452 updating shrinkwrap file for 0.4.2 2014-05-01 15:25:57 -04:00
Julian Lam
b858193753 Merge branch 'master' into v0.4.x 2014-05-01 15:24:30 -04:00
Julian Lam
b1b2a03747 Merge branch 'master' into v0.4.x 2014-05-01 15:15:25 -04:00
Julian Lam
45c62da51c Merge branch 'master' into v0.4.x 2014-04-09 14:24:40 -04:00
Julian Lam
f88d7e6170 Merge remote-tracking branch 'origin/v0.4.x' into v0.4.x 2014-04-08 21:30:39 -04:00
Julian Lam
13b4aa2282 updated shrinkwrap file for v0.4.1 2014-04-08 21:30:03 -04:00
Julian Lam
995fb22600 Merge branch 'master' into v0.4.x 2014-04-08 21:25:30 -04:00
barisusakli
5de430deb5 add taskbar to body 2014-04-03 17:30:46 -04:00
Julian Lam
e1c9bd7229 updated shrinkwrap file 2014-04-02 09:15:11 -04:00
Julian Lam
eabbc81b40 Merge branch 'master' into v0.4.x 2014-04-02 09:05:46 -04:00
Julian Lam
e29aa5abf8 Merge branch 'master' into v0.4.x 2014-04-01 17:00:43 -04:00
Julian Lam
cde7168f9c adding shrinkwrap file for release 2014-04-01 16:41:06 -04:00
5 changed files with 1197 additions and 7 deletions

1190
npm-shrinkwrap.json generated Normal file

File diff suppressed because it is too large Load Diff

View File

@@ -47,8 +47,8 @@
"nodebb-plugin-mentions": "~0.4.0",
"nodebb-plugin-markdown": "~0.4.1",
"nodebb-widget-essentials": "~0.0.21",
"nodebb-theme-vanilla": "~0.0.19",
"nodebb-theme-lavender": "~0.0.25",
"nodebb-theme-vanilla": "<0.0.20",
"nodebb-theme-lavender": "<0.0.26",
"nodebb-plugin-soundpack-default": "~0.1.1",
"nodebb-plugin-dbsearch": "0.0.9"
},

View File

@@ -116,7 +116,7 @@ var async = require('async'),
Notifications.get(nid, null, function(notif_data) {
async.each(uids, function(uid, next) {
if (!parseInt(uid, 10)) {
next();
return next();
}
checkReplace(notif_data.uniqueId, uid, notif_data, function(err, replace) {

View File

@@ -164,7 +164,7 @@ var db = require('./database'),
async.filter(pids, function(pid, next) {
postTools.privileges(pid, callerUid, function(err, privileges) {
next(!err && privileges.read);
next(!err && privileges.meta.read);
});
}, function(pids) {
if (!(pids && pids.length)) {
@@ -216,7 +216,7 @@ var db = require('./database'),
async.filter(pids, function(pid, next) {
postTools.privileges(pid, uid, function(err, privileges) {
next(!err && privileges.read);
next(!err && privileges.meta.read);
});
}, function(pids) {
Posts.getPostSummaryByPids(pids, true, callback);

View File

@@ -66,8 +66,8 @@ module.exports = function(Topics) {
postData[i].upvoted = results.voteData[i].upvoted;
postData[i].downvoted = results.voteData[i].downvoted;
postData[i].votes = postData[i].votes || 0;
postData[i].display_moderator_tools = parseInt(uid, 10) !== 0 && results.privileges[i].editable;
postData[i].display_move_tools = results.privileges[i].move;
postData[i].display_moderator_tools = parseInt(uid, 10) !== 0 && results.privileges[i].meta.editable;
postData[i].display_move_tools = results.privileges[i].meta.move;
postData[i].selfPost = parseInt(uid, 10) === parseInt(postData[i].uid, 10);
if(postData[i].deleted && !results.privileges[i].view_deleted) {