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

Merge branch '0.7.0'

Browse Source 
Conflicts:
	package.json
	src/search.js
This commit is contained in:
Julian Lam
2015-02-07 17:07:48 -05:00
parent 8bbd7d971b 59da48dee5
commit 957415463f
18 changed files with 55 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/groups.js
View File

@@ -803,8 +803,12 @@ var async = require('async'),
groupData = groupData.filter(function(group) {
return parseInt(group.hidden, 10) !== 1 && !!group.userTitle;
}).map(function(group) {
group.createtimeISO = utils.toISOString(group.createtime);
return group;
});
var groupSets = groupData.map(function(group) {
group.labelColor = group.labelColor || '#000000';
group.createtimeISO = utils.toISOString(group.createtime);