show error in composer if upload fails
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
updated README: added links to blog, plugins, themes; added new screenshots (old ones were 0.2x); other minor changes
README: using thumbnails instead
added timing to prune
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
README: added a few more screenshots to even things up a bit; emphasis on like/follow/star
README: forgot to credit manchester united forums
decided to move screenshots back up one level since we're using thumbnails instead
README - OK I promise I won't touch this again for at least a few months.
assorted CP changes
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
reorganizing account settings
removed some unused stuff in account settings
closes #1005
Merge branch 'master' of https://github.com/designcreateplay/NodeBB
fixed event log
SocketUser.getSettings
modifying user.getSettings / user.saveSettings to allow passing in custom data
new hook - filter:user.settings allows plugins to generate custom user settings on account page