Commit Graph

12 Commits

Author SHA1 Message Date
Julian Lam
72ef8c839f Merge remote-tracking branch 'origin/master' into category-whitelisting
Conflicts:
	src/groups.js
2013-11-27 11:34:52 -05:00
psychobunny
46d6d7637e potentially fixes ubbmigrator issue https://github.com/akhoury/nodebb-plugin-ubbmigrator/issues/2 2013-11-27 11:21:16 -05:00
Julian Lam
4e2326fc84 Merge remote-tracking branch 'origin' into category-whitelisting 2013-11-27 08:17:23 -05:00
psychobunny
a1839d90fd prevent admin group from being deleted, closes #530 2013-11-23 14:53:06 -05:00
Julian Lam
18009ebb39 interim commit 2013-11-13 19:54:46 -05:00
psychobunny
28704a6164 hinting 2013-09-18 10:50:02 -04:00
psychobunny
aea3181d27 formatting - server side core 2013-09-17 13:09:37 -04:00
Baris Usakli
bb14881b63 change getUserData to return err 2013-09-11 13:02:55 -04:00
Julian Lam
bec0b46a2c refactoring installation scripts to use node prompt module, lots of other fixes
fixed #263, fixed #264, fixed #265
2013-09-07 10:40:20 -04:00
Julian Lam
f39932ece7 group join leave, and updating 2013-09-03 16:05:01 -04:00
Julian Lam
85ac4aac94 group creation and deletion 2013-08-29 14:55:30 -04:00
Julian Lam
f2b8813fb9 brain dumped groups lib 2013-08-28 22:06:55 -04:00