Julian Lam 0ac9ec6001 Merge remote-tracking branch 'origin/master' into email-revamp

2014-01-04 11:19:23 -05:00

..

category.json

fixed last couple tweaks, ready t'merge

2013-12-05 21:36:21 -05:00

footer.json

fixed last couple tweaks, ready t'merge

2013-12-05 21:36:21 -05:00

global.json

fixed last couple tweaks, ready t'merge

2013-12-05 21:36:21 -05:00

login.json

i18n for all templates completed, jsons for german added

2013-12-03 19:53:16 +01:00

notifications.json

fixing 'back to nodebb' ext, and revamping email confirm logic

2014-01-02 16:26:56 -05:00

recent.json

closes #394

2013-10-11 15:06:56 -04:00

register.json

registration.tpl; translator variable system

2013-09-24 14:50:38 -04:00

reset_password.json

i18n for all templates completed, jsons for german added

2013-12-03 19:53:16 +01:00

topic.json

first pass, #524, #667

2014-01-03 21:33:41 -05:00

unread.json

internationalization: unread.tpl

2013-09-20 17:03:30 -04:00

user.json

closes #707, closes #686

2013-12-31 17:01:51 -05:00

users.json

fixed conflicts, added new language key for users/online

2013-09-24 15:15:39 -04:00