nodebb/public/templates
Julian Lam 3ff550914f Merge remote-tracking branch 'origin/master' into email-revamp
Conflicts:
	package.json
..
admin closes
emails initial commit to emailer system overhaul
install fontawesome 4 migration, closes
noscript fontawesome 4 migration, closes
403.tpl internationalization: 404 and 403
404.tpl internationalization: 404 and 403
500.tpl closes
account.tpl closes , closes
accountedit.tpl closes
accountsettings.tpl updates to language files, capitalizing some values across languages
category.tpl fixed last couple tweaks, ready t'merge
composer.tpl closes , closes
config.json display events in admin page events section
confirm.tpl i18n for all templates completed, jsons for german added
favourites.tpl vanilla color fixes
followers.tpl Merge pull request from Joopmicroop/master
following.tpl Merge pull request from Joopmicroop/master
footer.tpl closes , refactor admin image uploads, fixed gif uploads
header.tpl added cache buster to require.js files - fixes
home.tpl added ability to upload category images. closes , closes
login.tpl match login.tpl button to look like register.tpl
logout.tpl fixed serverside templating; footer, logout internationalization; updated more global lang keys
notifications.tpl i18n for all templates completed, jsons for german added
outgoing.tpl i18n for all templates completed, jsons for german added
recent.tpl recent rss link fix
register.tpl closes
reset.tpl i18n for all templates completed, jsons for german added
reset_code.tpl i18n for all templates completed, jsons for german added
search.tpl closes
topic.tpl closes
unread.tpl closes
users.tpl fontawesome 4 migration, closes