nodebb/public/templates
Julian Lam 0159a43a20 Merge branch 'master' of github.com:designcreateplay/NodeBB
Conflicts:
	public/src/forum/topic.js
..
admin putting category options behind a dropdown, and fixing category enable/disable
emails added email verification on registration
install fontawesome 4 migration, closes
noscript fontawesome 4 migration, closes
403.tpl internationalization: 404 and 403
404.tpl internationalization: 404 and 403
account.tpl clean up of posts and some template additions
accountedit.tpl fontawesome 4 migration, closes
accountsettings.tpl fontawesome 4 migration, closes
category.tpl closes
config.json closes
confirm.tpl added email verification on registration
favourites.tpl fontawesome 4 migration, closes
followers.tpl fontawesome 4 migration, closes
following.tpl fontawesome 4 migration, closes
footer.tpl added footer.build and page.load hooks
header.tpl paginator progress bar
home.tpl fontawesome 4 migration, closes
login.tpl modularized SSO, paving the way for potential plugins. cleaned up associated templates/js
logout.tpl fixed serverside templating; footer, logout internationalization; updated more global lang keys
notifications.tpl closes
outgoing.tpl closed
recent.tpl closes
register.tpl modularized SSO, paving the way for potential plugins. cleaned up associated templates/js
reset.tpl revamped client side scripts so that they are loaded using Require.js instead.
reset_code.tpl revamped client side scripts so that they are loaded using Require.js instead.
search.tpl revamped client side scripts so that they are loaded using Require.js instead.
topic.tpl removed .main-post from follow class (now using conditionals to show/hide)
unread.tpl closes
users.tpl fontawesome 4 migration, closes