Added DiscussionModel->Bookmark(). It's a cleaner version of DiscussioModel->BookmarkDiscussion() that doesn't join a bunch of tables and does just the job of bookmarking.
Modified discussion/bookmark to work better as an API endpoint.
I mustache you a question…
Add CategoryID to Popular list for SEOLinks
Merge branch 'master' of github.com:vanillaforums/Garden
Merge branch 'master' of github.com:vanillaforums/Garden
Check the captcha setting when inserting a user with approval registration. Fixes the issue where approval registration and social connect do not work together.
Flagging: Fix category dropdown
Restore 'No results for...' search result
Activity should show DateInserted not DateUpdated
Add Message location on New Discussion form
Fixed bug where users can't view their own personal information.
Emotify:
- Add emotify to the new discussion form.
- Fix the position of the emotify drop down now that we use box-sizing: border-box.
Remove mustache.
Remove extra ?> in activity helper functions file

I just noticed an extra closing tag show up on my activities feed.

I finally tracked it down.
Merge pull request #1735 from hgtonight/patch-3

Remove extra ?> in activity helper functions file
Don't accept a UserID on profile post.
Merge branch 'master' of github.com:vanillaforums/Garden
Whilst appreciating the quandary of truly knowing gender, we shall sidestep the philosophical implications and allow it to be specified instead
Translate the text on the new discussion button.