0.3.0

Confirmation when removing user from a group

.gitignore

@@ -14,8 +14,9 @@ Vagrantfile
 .vagrant
 provision.sh
 *.komodoproject
-
+.DS_Store
 feeds/recent.rss
 
 # winston?
 error.log
+events.log

README.md

@@ -8,9 +8,9 @@
 * [Follow on Twitter](http://www.twitter.com/NodeBB/ "NodeBB Twitter")
 * [Like us on Facebook](http://www.facebook.com/NodeBB/ "NodeBB Facebook")
 
-![NodeBB Main Category Listing](http://i.imgur.com/zffCFoh.png)
+![NodeBB Main Category Listing](http://i.imgur.com/zRdzCcj.png)
 
-![NodeBB Topic Page](http://i.imgur.com/JihdcUa.png)
+![NodeBB Topic Page](http://i.imgur.com/ZC8W39a.png)
 
 ## How can I follow along/contribute?
 

app.js

@@ -27,8 +27,9 @@
 		async = require('async'),
 		semver = require('semver'),
 		winston = require('winston'),
-		pkg = require('./package.json'),
 		path = require('path'),
+		pkg = require('./package.json'),
+		utils = require('./public/src/utils.js'),
 		meta;
 
 	// Runtime environment
@@ -69,19 +70,23 @@
 		});
 		meta = require('./src/meta');
 
-		nconf.set('url', nconf.get('base_url') + (nconf.get('use_port') ? ':' + nconf.get('port') : '') + nconf.get('relative_path') + '/');
-		nconf.set('upload_url', nconf.get('url') + 'uploads/');
+		nconf.set('url', nconf.get('base_url') + (nconf.get('use_port') ? ':' + nconf.get('port') : '') + nconf.get('relative_path') + path.sep);
+		nconf.set('upload_url', path.join(path.sep, nconf.get('relative_path'), 'uploads', path.sep));
 		nconf.set('base_dir', __dirname);
 
-		winston.info('Initializing NodeBB v' + pkg.version + ', on port ' + nconf.get('port') + ', using Redis store at ' + nconf.get('redis:host') + ':' + nconf.get('redis:port') + '.');
+		winston.info('Initializing NodeBB v' + pkg.version + ', on port ' + nconf.get('port') + ', using ' + nconf.get('database') +' store at ' + nconf.get(nconf.get('database') + ':host') + ':' + nconf.get(nconf.get('database') + ':port') + '.');
 		winston.info('NodeBB instance bound to: ' + ((nconf.get('bind_address') === "0.0.0.0" || !nconf.get('bind_address')) ? 'Any address (0.0.0.0)' : nconf.get('bind_address')));
 
 		if (process.env.NODE_ENV === 'development') {
 			winston.info('Base Configuration OK.');
 		}
 
-		if (semver.gt(pkg.dependencies['nodebb-theme-cerulean'], require('./node_modules/nodebb-theme-cerulean/package.json').version)) {
-			winston.error('nodebb-theme-cerulean is out of date - please run npm install.')
+		if (!semver.satisfies(require('./node_modules/nodebb-theme-cerulean/package.json').version, pkg.dependencies['nodebb-theme-cerulean'])) {
+			winston.error('nodebb-theme-cerulean is out of date - please run npm install.');
+		}
+
+		if (!semver.satisfies(require('./node_modules/nodebb-theme-vanilla/package.json').version, pkg.dependencies['nodebb-theme-vanilla'])) {
+			winston.error('nodebb-theme-vanilla is out of date - please run npm install.');
 		}
 
 		require('./src/database').init(function(err) {
@@ -90,15 +95,17 @@
 				var templates = require('./public/src/templates'),
 					translator = require('./public/src/translator'),
 					webserver = require('./src/webserver'),
-					SocketIO =  require('socket.io').listen(global.server, { log: false, transports: ['websocket', 'xhr-polling', 'jsonp-polling', 'flashsocket'], 'browser client minification': true}),
-					websockets = require('./src/websockets'),
+					sockets = require('./src/socket.io'),
 					plugins = require('./src/plugins'),
 					notifications = require('./src/notifications'),
 					upgrade = require('./src/upgrade');
 
+				templates.setGlobal('relative_path', nconf.get('relative_path'));
+
 				upgrade.check(function(schema_ok) {
 					if (schema_ok || nconf.get('check-schema') === false) {
-						websockets.init(SocketIO);
+
+						sockets.init();
 
 						plugins.init();
 						global.templates = {};
@@ -108,15 +115,10 @@
 
 						var customTemplates = meta.config['theme:templates'] ? path.join(__dirname, 'node_modules', meta.config['theme:id'], meta.config['theme:templates']) : false;
 
-						// todo: replace below with read directory code, derp.
-						templates.init([
-							'header', 'footer', 'logout', 'outgoing', 'admin/header', 'admin/footer', 'admin/index',
-							'emails/reset', 'emails/reset_plaintext', 'emails/email_confirm', 'emails/email_confirm_plaintext',
-							'emails/header', 'emails/footer',
-
-							'noscript/header', 'noscript/home', 'noscript/category', 'noscript/topic'
-						], customTemplates);
 
+						utils.walk(path.join(__dirname, 'public/templates'), function (err, tplsToLoad) {
+							templates.init(tplsToLoad, customTemplates);
+						});
 
 						plugins.ready(function() {
 							templates.ready(webserver.init);
@@ -145,7 +147,8 @@
 			file: __dirname + '/config.json'
 		});
 
-		var install = require('./src/install');
+		var templates = require('./public/src/templates'),
+			install = require('./src/install');
 
 		winston.info('Welcome to NodeBB!');
 		winston.info('This looks like a new installation, so you\'ll have to answer a few questions about your environment before we can proceed.');
@@ -155,7 +158,7 @@
 			if (err) {
 				winston.error('There was a problem completing NodeBB setup: ', err.message);
 			} else {
-				winston.info('NodeBB Setup Completed. Run \'node app\' to manually start your NodeBB server.');
+				winston.info('NodeBB Setup Completed. Run \'./nodebb start\' to manually start your NodeBB server.');
 			}
 
 			process.exit();

nodebb

@@ -9,6 +9,13 @@ case "$1" in
 		node app
 		;;
 
+	upgrade)
+		npm install
+		ls -d node_modules/nodebb* | xargs -n1 basename | xargs npm update
+		node app --upgrade
+		echo -e "\n\e[00;32mNodeBB Dependencies up-to-date!\e[00;00m";
+		;;
+
 	dev)
 		echo "Launching NodeBB in \"development\" mode."
 		echo "To run the production build of NodeBB, please use \"forever\"."
@@ -23,22 +30,22 @@ case "$1" in
 		NODE_ENV=development supervisor -q --extensions 'node|js|tpl' -- app $1
 		;;
 
-	language)
-		case "$2" in
-			check)
-				node app --language="check"
-				;;
+	# language)
+	# 	case "$2" in
+	# 		check)
+	# 			node app --language="check"
+	# 			;;
 
-			*)
-				echo "Language Settings"
-				echo $"Usage: $0 language {check}"
-				echo ''
-				column -s '	' -t <<< '
-				check	Compare language files against the /en directory
-				'
-				;;
-		esac
-		;;
+	# 		*)
+	# 			echo "Language Settings"
+	# 			echo $"Usage: $0 language {check}"
+	# 			echo ''
+	# 			column -s '	' -t <<< '
+	# 			check	Compare language files against the /en directory
+	# 			'
+	# 			;;
+	# 	esac
+	# 	;;
 
 	*)
 		echo "Welcome to NodeBB"
@@ -48,7 +55,7 @@ case "$1" in
 		start	Start NodeBB in production mode
 		dev	Start NodeBB in development mode
 		watch	Start NodeBB in development mode and watch for changes
-		language	Language settings
+		upgrade	Run NodeBB upgrade scripts, ensure packages are up-to-date
 		'
 		exit 1
 esac

package.json

@@ -2,7 +2,7 @@
   "name": "nodebb",
   "license": "GPLv3 or later",
   "description": "NodeBB Forum",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "homepage": "http://www.nodebb.org",
   "repository": {
     "type": "git",
@@ -30,7 +30,7 @@
     "node-imagemagick": "0.1.8",
     "gravatar": "1.0.6",
     "nconf": "~0.6.7",
-    "sitemap": "~0.6.0",
+    "sitemap": "~0.7.1",
     "request": "~2.25.0",
     "reds": "~0.2.4",
     "winston": "~0.7.2",
@@ -38,12 +38,16 @@
     "prompt": "~0.2.11",
     "uglify-js": "~2.4.0",
     "validator": "~1.5.1",
-    "nodebb-plugin-mentions": "~0.1.16",
-    "nodebb-plugin-markdown": "~0.2.1",
-    "nodebb-theme-vanilla": "~0.0.10",
-    "nodebb-theme-cerulean": "0.0.10",
+    "nodebb-plugin-mentions": "~0.3",
+    "nodebb-plugin-markdown": "~0.3",
+    "nodebb-theme-vanilla": "~0.0.13",
+    "nodebb-theme-cerulean": "~0.0.12",
+    "nodebb-theme-lavender": "~0.0",
     "cron": "~1.0.1",
-    "semver": "~2.2.1"
+    "semver": "~2.2.1",
+    "string": "~1.7.0",
+    "xregexp": "~2.0.0",
+    "socket.io-wildcard": "~0.1.1"
   },
   "optionalDependencies": {
     "redis": "0.8.3",

public/language/ar/category.json

@@ -0,0 +1,14 @@
+{
+	"new_topic_button": "موضوع جديد",
+	"no_topics": "<strong>لا توجد مواضيع في هذه الفئة</strong>لماذا لا تحاول نشر واحد؟<br />",
+	"sidebar.recent_replies": "الردود مؤخرا",
+	"sidebar.active_participants": "المشاركون النشطة",
+	"sidebar.moderators": "المشرفين",
+	"posts": "مشاركات",
+	"views": "مشاهدات",
+	"posted": "نشر",
+	"browsing": "يتصفح",
+	"no_replies": "لم يرد أحد",
+	"replied": "رد",
+	"last_edited_by": "تغيرت أخيراً عبر"
+}

public/language/ar/footer.json

@@ -0,0 +1,7 @@
+{
+	"stats.online": "حالياً على الموقع",
+	"stats.users": "مستخدمين",
+	"stats.topics": "مواضيع",
+	"stats.posts": "مشاركات",
+	"success": "نجاح"
+}

public/language/ar/global.json

@@ -0,0 +1,37 @@
+{
+	"home": "الصفحة الرئيسية",
+	"search": "بحث",
+	"buttons.close": "أغلق",
+	"403.title": "غير مسموح بالدخول",
+	"403.message": "يبدو أنك قد تعثر على الصفحة التي لم يكن لديك الوصول إليها. ربما يجب عليك <a href='/login'> تسجيل الدخول </a> ",
+	"404.title": "لم يتم العثور",
+	"404.message": "يبدو أنك قد تعثرت على صفحة غير موجودة. عودة إلى الصفحة الرئيسية.",
+	"500.title": "خطأ داخلي.",
+	"500.message": "عفوا! يبدو وكأنه شيء ذهب على نحو خاطئ!",
+
+	"register": "تسجيل",
+	"login": "دخول",
+
+	"logout": "تسجيل الخروج",
+	"logout.title": "تم تسجيل الخروج",
+	"logout.message": "قمت بتسجيل الخروج بنجاح من NodeBB",
+
+	"save_changes": "حفظ التغييرات",
+	"close": "أغلق",
+
+	"header.admin": "مشرف",
+	"header.recent": "حديث",
+	"header.unread": "غير مقروء",
+	"header.users": "المستخدمين",
+	"header.search": "بحث",
+	"header.profile": "ملف",
+
+	"notifications.loading": "تحميل التبليغات",
+	"chats.loading": "تحميل الدردشات",
+
+	"motd.welcome": "مرحبا بكم  NodeBB، منصة مناقشة المستقبل",
+	"motd.get": "NodeBB إحصل على",
+	"motd.fork": "فرع",
+	"motd.like": "ود",
+	"motd.follow": "تابع"
+}

public/language/ar/language.json

@@ -0,0 +1,5 @@
+{
+	"name": "العربية",
+	"code": "ar",
+	"dir": "rtl"
+}

public/language/ar/login.json

@@ -0,0 +1,10 @@
+{
+	"login": "دخول",
+	"username": "اسم المستخدم",
+	"password": "كلمة السر",
+	"remember_me": "تذكرني؟",
+	"forgot_password": "نسيت كلمة المرور؟",
+	"alternative_logins": "تسجيلات الدخول البديلة",
+	"failed_login_attempt": "فشلت محاولة تسجيل الدخول، يرجى المحاولة مرة أخرى.",
+	"login_successful": "قمت بتسجيل الدخول بنجاح!"
+}

public/language/ar/modules.json

@@ -0,0 +1,6 @@
+{
+	"chat.chatting_with": "الدردشة مع <span id=\"chat-with-name\"></span>",
+	"chat.placeholder": "اكتب رسالة دردشة هنا، وإضغط ENTER لإرسال",
+	"chat.send": "أرسل",
+	"chat.no_active": "لا يوجد لديك دردشات نشطة."
+}

public/language/ar/notifications.json

@@ -0,0 +1,8 @@
+{
+	"title": "إعلام",
+	"back_to_home": "العودة إلى NodeBB",
+	"outgoing_link": "رابط خارجي",
+	"outgoing_link_message": "أنت الأن ترحل",
+	"continue_to": "أكمل إلى",
+	"return_to": "إرجع إلى"
+}

public/language/ar/recent.json

@@ -0,0 +1,5 @@
+{
+	"day": "يوم",
+	"week": "أسبوع",
+	"month": "شهر"
+}

public/language/ar/register.json

@@ -0,0 +1,16 @@
+{
+	"register": "تسجيل",
+	"help.email": "افتراضيا، سيتم إخفاء بريدك الإلكتروني من الجمهور.",
+	"help.username_restrictions": "اسم مستخدم فريدة من نوعها بين1% و2% حرفا. يمكن للآخرين ذكرك @ <'span id='your-username> اسم المستخدم </span>.",
+	"help.minimum_password_length": "كلمتك السر يجب أن تكون على الأقل متألفة من 1% أحرف",
+	"email_address": "عنوان البريد الإلكتروني",
+	"email_address_placeholder": "ادخل عنوان البريد الإلكتروني",
+	"username": "اسم المستخدم",
+	"username_placeholder": "أدخل اسم المستخدم",
+	"password": "كلمة السر",
+	"password_placeholder": "أدخل كلمة السر",
+	"confirm_password": "تأكيد كلمة السر",
+	"confirm_password_placeholder": "تأكيد كلمة السر",
+	"register_now_button": "قم بالتسجيل الآن",
+	"alternative_registration": "التسجيل البديلة"
+}

public/language/ar/reset_password.json

@@ -0,0 +1,13 @@
+{
+	"reset_password": "إعادة تعيين كلمة السر",
+	"update_password": "تحديث كلمة السر",
+	"password_changed.title": "تم تغير كلمة السر",
+	"password_changed.message": "<p>تم تغير كلمة السر بنجاح. يرجى <a href='/login'>إعادة الدخول</a></p>",
+	"wrong_reset_code.title": "إعادة تعيين رمز غير صحيح",
+	"wrong_reset_code.message": "رامز إعادة التعين غير صحيح، يرجى المحاولة مرة أخرى أو <a href='/reset'>اطلب رمز جديد</a>",
+	"new_password": "كلمة السر الجديدة",
+	"repeat_password": "تأكيد كلمة السر",
+	"enter_email": "يرجى إدخال <strong>عنوان البريد الإلكتروني</strong> الخاص بك وسوف نرسل لك رسالة بالبريد الالكتروني مع تعليمات حول كيفية إستعادة حسابك.",
+	"password_reset_sent": "إعادة تعيين كلمة السر أرسلت",
+	"invalid_email": "بريد إلكتروني غير صالح أو غير موجود"
+}

public/language/ar/topic.json

@@ -0,0 +1,52 @@
+{
+	"topic": "موضوع",
+	"topics": "مواضيع",
+
+	"no_topics_found": "لا توجد مواضيع !",
+
+	"profile": "ملف",
+	"posted_by": "رد من",
+	"chat": "دردشة",
+	"notify_me": "تنبه من ردود جديدة في هذا الموضوع",
+	"quote": "اقتبس",
+	"reply": "رد",
+	"edit": "صحح",
+	"delete": "حذف",
+	"move": "انقل",
+	"fork": "فرع",
+	"banned": "محظور",
+	"link": "رابط",
+	"share": "شارك",
+	"tools": "أدوات",
+
+	"thread_tools.title": "أدوات الموضوع",
+	"thread_tools.markAsUnreadForAll": "علم غير مقروء",
+	"thread_tools.pin": "علق الموضوع",
+	"thread_tools.lock": "قفل الموضوع",
+	"thread_tools.move": "نقل الموضوع",
+	"thread_tools.fork": "تفرع الموضوع",
+	"thread_tools.delete": "حذف الموضوع",
+
+	"load_categories": "تحميل الفئات",
+	"disabled_categories_note": "الفئات المجلدة رمادية",
+	"confirm_move": "انقل",
+	"confirm_fork": "فرع",
+
+	"favourite": "المفضل",
+	"favourites": "المفضلة",
+	"favourites.not_logged_in.title": "ليس موجود حالياً",
+	"favourites.not_logged_in.message": "الرجاء تسجيل الدخول لتفضل هذا الرد",
+	"favourites.has_no_favourites": "ليس لديك أي ردود مفضلة. فضل بعد الردود لرؤيتهم هنا",
+
+	"loading_more_posts": "تحميل المزيد من المشاركات",
+	"move_topic": "نقل الموضوع",
+	"move_post": "نقل الرد",
+	"fork_topic": "فرع الموضوع",
+	"topic_will_be_moved_to": "هذا الموضوع سوف ينقل إلى فئة",
+	"fork_topic_instruction": "إضغط على الردود لتفريعهم",
+	"fork_no_pids": "لم تختار أي رد",
+	"fork_success": "تفريع الموضوع بنجاح!",
+
+	"reputation": "سمعة",
+	"posts": "ردود"
+}

public/language/ar/unread.json

@@ -0,0 +1,5 @@
+{
+	"no_unread_topics": "ليس هناك أي موضوع غير مقروء",
+	"mark_all_read": "إجعل كل المواضيع مقرؤة",
+	"load_more": "حمل المزيد"
+}

public/language/ar/user.json

@@ -0,0 +1,41 @@
+{
+	"banned": "محظور",
+	"offline": "ليس موجود حالياً",
+	"username": "إسم المستخدم",
+	"email": "البريد الإلكتروني",
+	"fullname": "الاسم الكامل",
+	"website": "الموقع الإلكتروني",
+	"location": "موقع",
+	"age": "عمر",
+	"joined": "تاريخ التسجيل",
+	"lastonline": "تاريخ أخر دخول",
+	"profile_views": "مشاهد الملف",
+	"reputation": "سمعة",
+	"posts": "ردود",
+	"followers": "أتباع",
+	"following": "يتبع",
+	"signature": "توقيع",
+	"gravatar": "Gravatar",
+	"birthday": "عيد ميلاد",
+
+	"change_picture": "تغيير الصورة",
+	"edit": "صحح",
+	"uploaded_picture": "صورة تم تحميلها",
+	"upload_new_picture": "تحميل صورة جديدة",
+	"change_password": "تغيير كلمة السر",
+	"confirm_password": "تأكيد كلمة السر",
+	"password": "كلمة السر",
+
+	"upload_picture": "تحميل الصورة",
+	"upload_a_picture": "تحميل صورة",
+	"image_spec": "تستطيع تحميل سوى PNG، JPG، GIF تحت 256KB.",
+
+	"settings": "إعدادات",
+	"show_email": "أظهر بريدي الإلكتروني",
+
+	"has_no_follower": "هذا المستخدم ليس لديه أي أتباع :(",
+	"follows_no_one": "هذا المستخدم لا يتبع أحد :(",
+
+	"email_hidden": "البريد الإلكتروني مخفي",
+	"hidden": "مخفي"
+}

public/language/ar/users.json

@@ -0,0 +1,9 @@
+{
+	"latest_users": "أحدث المستخدمين",
+	"top_posters": "أكثر المشتركين",
+	"most_reputation": "أعلى سمعة",
+	"online": "موجودين حالياً",
+	"search": "بحث",
+	"enter_username": "أدخل اسم مستخدم للبحث",
+	"load_more": "حمل المزيد"
+}

public/language/cs/category.json

@@ -0,0 +1,14 @@
+{
+	"new_topic_button": "Nové téma",
+	"no_topics": "<strong>V této kategorii zatím nejsou žádné příspěvky.</strong><br />Můžeš být první!",
+	"sidebar.recent_replies": "Poslední příspěvky",
+	"sidebar.active_participants": "Aktivní účastníci",
+	"sidebar.moderators": "Moderátoři",
+	"posts": "příspěvky",
+	"views": "zobrazení",
+	"posted": "odesláno",
+	"browsing": "prohlíží",
+	"no_replies": "Nikdo ještě neodpověděl",
+	"replied": "přispěl",
+	"last_edited_by": "naposledy upravil"
+}

public/language/cs/footer.json

@@ -0,0 +1,7 @@
+{
+	"stats.online": "Online",
+	"stats.users": "Uživatelé",
+	"stats.topics": "Témata",
+	"stats.posts": "Příspěvky",
+	"success": "úspěch"
+}

public/language/cs/global.json

@@ -0,0 +1,37 @@
+{
+	"home": "Domů",
+	"search": "Hledat",
+	"buttons.close": "Zavřít",
+	"403.title": "Přístup odepřen",
+	"403.message": "K této stránce nemáte přístup. Zkuste se <a href='/login'>přihlásit</a>?",
+	"404.title": "Stránka nenalezena",
+	"404.message": "Tato stránka bohužel neexistuje. Vraťte se na <a href='/'>domovskou stránku</a>.",
+	"500.title": "Neznámá chyba",
+	"500.message": "Jejda, vypadá to, že se něco pokazilo.",
+
+	"register": "Registrovat",
+	"login": "Přihlásit se",
+
+	"logout": "Odhlásit se",
+	"logout.title": "Odhlásili jsme Vás.",
+	"logout.message": "Úspěšně jsme Vás odhlásili z fóra.",
+
+	"save_changes": "Uložit změny",
+	"close": "Zrušit",
+
+	"header.admin": "Administrace",
+	"header.recent": "Aktuality",
+	"header.unread": "Nepřečtené",
+	"header.users": "Uživatelé",
+	"header.search": "Hledat",
+	"header.profile": "Můj profil",
+
+	"notifications.loading": "Načítání upozornění",
+	"chats.loading": "Načítání grafů",
+
+	"motd.welcome": "Vítejte na NodeBB, diskusní platforma buducnosti.",
+	"motd.get": "Získat NodeBB",
+	"motd.fork": "Fork",
+	"motd.like": "To se mi líbí",
+	"motd.follow": "Sledovat"
+}

public/language/cs/language.json

@@ -0,0 +1,4 @@
+{
+	"name": "Czech",
+	"code": "cs"
+}

public/language/cs/login.json

@@ -0,0 +1,10 @@
+{
+	"login": "Přihlásit se",
+	"username": "Uživatelské jméno",
+	"password": "Heslo",
+	"remember_me": "Zapamatovat si mě?",
+	"forgot_password": "Zapomněli jste heslo?",
+	"alternative_logins": "Další způsoby přihlášení",
+	"failed_login_attempt": "Přihlášení se nezdařilo, zkuste to prosím znovu.",
+	"login_successful": "Přihlášení proběhlo úspěšně!"
+}

public/language/cs/modules.json

@@ -0,0 +1,6 @@
+{
+	"chat.chatting_with": "Chat s <span id=\"chat-with-name\"></span>",
+	"chat.placeholder": "napište zprávu sem a zmáčkněte enter pro odeslání",
+	"chat.send": "Odeslat",
+	"chat.no_active": "Nemáte žádné aktivní konverzace."
+}

public/language/cs/notifications.json

@@ -0,0 +1,8 @@
+{
+	"title": "Upozornění",
+	"back_to_home": "Zpět na úvodní stránku",
+	"outgoing_link": "Odkaz mimo fórum",
+	"outgoing_link_message": "Nyní opouštíte fórum",
+	"continue_to": "Přejít na",
+	"return_to": "Vrátit se na "
+}

public/language/cs/recent.json

@@ -0,0 +1,5 @@
+{
+	"day": "Den",
+	"week": "Týden",
+	"month": "Měsíc"
+}

public/language/cs/register.json

@@ -0,0 +1,16 @@
+{
+	"register": "Registrace",
+	"help.email": "Váš email nebude bez vašeho svolení zveřejněn.",
+	"help.username_restrictions": "Jedinečné uživatelské jméno dlouhé %1 až %2 znaků. Ostatní uživatelé Vás mohou zmínit jako @<span id='yourUsername'>uživatelské-jméno</span>.",
+	"help.minimum_password_length": "Délka vašeho hesla musí být alespoň %1 znaků.",
+	"email_address": "Email",
+	"email_address_placeholder": "Zadejte email",
+	"username": "Uživatelské jméno",
+	"username_placeholder": "Zadejte uživatelské jméno",
+	"password": "Heslo",
+	"password_placeholder": "Zadejte heslo",
+	"confirm_password": "Potvrzení hesla",
+	"confirm_password_placeholder": "Potvrďte heslo",
+	"register_now_button": "Zaregistrovat se",
+	"alternative_registration": "Jiný způsob registrace"
+}

public/language/cs/reset_password.json

@@ -0,0 +1,13 @@
+{
+	"reset_password": "Obnovit heslo",
+	"update_password": "Upravit heslo",
+	"password_changed.title": "Heslo změněno",
+	"password_changed.message": "<p>Heslo bylo úspěšně změněno, <a href=\"/login\">přihlaste se znovu</a> prosím.",
+	"wrong_reset_code.title": "Špatný kód",
+	"wrong_reset_code.message": "Byl zadán špatný kód. Zadejte ho prosím znovu, nebo <a href=\"/reset\">si nechte poslat nový</a>.",
+	"new_password": "Nové heslo",
+	"repeat_password": "Potvrzení hesla",
+	"enter_email": "Zadejte svou <strong>emailovou adresu</strong> a my Vám pošleme informace, jak můžete obnovit své heslo.",
+	"password_reset_sent": "Obnova hesla odeslána",
+	"invalid_email": "Špatný email / Email neexistuje!"
+}

public/language/cs/topic.json

@@ -0,0 +1,50 @@
+{
+	"topic": "Téma",
+	"topics": "Témata",
+
+	"no_topics_found": "Nebyla nalezena žádná témata!",
+
+	"profile": "Profil",
+	"posted_by": "Odeslal",
+	"chat": "Chat",
+	"notify_me": "Sledovat toto téma",
+	"quote": "Citovat",
+	"reply": "Odpovědět",
+	"edit": "Upravit",
+	"delete": "Smazat",
+	"move": "Přesunout",
+	"fork": "Rozdělit",
+	"banned": "banned",
+	"link": "Odkaz",
+
+	"thread_tools.title": "Nástroje",
+	"thread_tools.pin": "Zvýraznit vlákno",
+	"thread_tools.lock": "Uzamknout vlákno",
+	"thread_tools.move": "Přesunout vlákno",
+	"thread_tools.fork": "Rozdělit vlákno",
+	"thread_tools.delete": "Smazat vlákno",
+
+	"load_categories": "Načítání kategorií",
+	"disabled_categories_note": "Vypnuté (disabled) kategorie jsou šedé.",
+	"confirm_move": "Přesunout",
+	"confirm_fork": "Rozdělit",
+
+	"favourite": "Oblíbené",
+	"favourites": "Oblíbené",
+	"favourites.not_logged_in.title": "Přihlaste se!",
+	"favourites.not_logged_in.message": "Pro oblíbení příspěvku se musíte přihlásit.",
+	"favourites.has_no_favourites": "Nemáte žádné oblíbené příspěvky, přidejte některý příspěvek k oblíbeným a uvidíte ho zde!",
+
+	"posted_by": "odeslal",
+	"loading_more_posts": "Načítání více příspěvků",
+	"move_topic": "Přesunout téma",
+	"move_post": "Přesunout příspěvek",
+	"fork_topic": "Rozdělit příspěvek",
+	"topic_will_be_moved_to": "Toto téma bude přesunuto do kategorie",
+	"fork_topic_instruction": "Vyber příspěvky, které chceš oddělit",
+	"fork_no_pids": "Žádné příspěvky nebyly vybrány!",
+	"fork_success": "Téma bylo úspěšně rozděleno!",
+
+	"reputation": "Reputace",
+	"posts": "Příspěvky"
+}

public/language/cs/unread.json

@@ -0,0 +1,5 @@
+{
+	"no_unread_topics": "Nejsou zde žádné nepřečtené témata.",
+	"mark_all_read": "Označit vše jako přečtené",
+	"load_more": "Načíst další"
+}

public/language/cs/user.json

@@ -0,0 +1,41 @@
+{
+	"banned": "Banned",
+	"offline": "Offline",
+	"username": "Uživatelské jméno",
+	"email": "Email",
+	"fullname": "Jméno a příjmení",
+	"website": "Webové stránky",
+	"location": "Poloha",
+	"age": "Věk",
+	"joined": "Registrován",
+	"lastonline": "Naposledy online",
+	"profile_views": "Zobrazení profilu",
+	"reputation": "Reputace",
+	"posts": "Příspěvky",
+	"followers": "Sledují ho",
+	"following": "Sleduje",
+	"signature": "Podpis",
+	"gravatar": "Gravatar",
+	"birthday": "Datum narození",
+
+	"change_picture": "Změnit obrázek",
+	"edit": "Upravit",
+	"uploaded_picture": "Nahraný obrázek",
+	"upload_new_picture": "Nahrát nový obrázek",
+	"change_password": "Změnit heslo",
+	"confirm_password": "Potvrzení hesla",
+	"password": "Heslo",
+
+	"upload_picture": "Nahrát obrázek",
+	"upload_a_picture": "Nahrát obrázek",
+	"image_spec": "Můžete nahrávat poze obrázky ve formátu PNG, JPG, nebo GIF o velikosti menší než 256kb.",
+
+	"settings": "nastavení",
+	"show_email": "Zobrazovat můj email v profilu",
+
+	"has_no_follower": "Tohoto uživatele nikdo nesleduje :(",
+	"follows_no_one": "Tento uživatel nikoho nesleduje :(",
+
+	"email_hidden": "Skrytý email",
+	"hidden": "skrytý"
+}

public/language/cs/users.json

@@ -0,0 +1,9 @@
+{
+	"latest_users": "Nejnovější uživatelé",
+	"top_posters": "Nejaktivnější",
+	"most_reputation": "Nejváženější",
+	"online": "Online",
+	"search": "Vyhledávat",
+	"enter_username": "Zadej uživatelské jméno k hledání",
+	"load_more": "Načíst další"
+}

public/language/de/footer.json

@@ -1,7 +1,4 @@
 {
-	"chat.chatting_with": "Chatten mit <span id='chat-with-name'></span>",
-	"chat.placeholder": "schreibe hier etwas, und drücke Enter zum absenden",
-	"chat.send": "Senden",
 	"stats.online": "Online",
 	"stats.users": "Benutzer",
 	"stats.topics": "Themen",

public/language/de/global.json

@@ -27,5 +27,11 @@
 	"header.profile": "Profil",
 
 	"notifications.loading": "Benachrichtigungen laden",
-	"chats.loading": "Nachrichten werden geladen"
+	"chats.loading": "Nachrichten werden geladen",
+
+	"motd.welcome": "Willkommen auf NodeBB, der Diskussionsplattform der Zukunft.",
+	"motd.get": "Bekommen NodeBB",
+	"motd.fork": "Fork",
+	"motd.like": "Gefällt mir",
+	"motd.follow": "Folgen"
 }

public/language/de/language.json

@@ -0,0 +1,4 @@
+{
+	"name": "German",
+	"code": "de"
+}

public/language/de/modules.json

@@ -0,0 +1,6 @@
+{
+	"chat.chatting_with": "Chatten mit <span id='chat-with-name'></span>",
+	"chat.placeholder": "schreibe hier etwas, und drücke Enter zum absenden",
+	"chat.send": "Senden",
+	"chat.no_active": "Sie haben keine aktiven Chats."
+}

public/language/de/notifications.json

@@ -1,7 +1,6 @@
 {
 	"title": "Benachrichtigungen",
 	"back_to_home": "Zurück zur Startseite",
-	"mark_all_as_read": "Alles als gelesen markieren",
 	"outgoing_link": "Externer Link",
 	"outgoing_link_message": "Du verlässt nun",
 	"continue_to": "Gehe weiter zu",

public/language/de/topic.json

@@ -33,8 +33,7 @@
 	"favourites.has_no_favourites":"Du hast noch keine Favoriten.",
 
 	"posted_by": "Geposted von",
-	"loading": "Lade",
-	"more_posts": "Mehr Posts",
+	"loading_more_posts": "Lade Mehr Posts",
 	"move_topic": "Thema verschieben",
 	"topic_will_be_moved_to": "Dieses Thema wird verschoben nach",
 

public/language/en/footer.json

@@ -1,7 +1,4 @@
 {
-	"chat.chatting_with": "Chat with <span id=\"chat-with-name\"></span>",
-	"chat.placeholder": "type chat message here, press enter to send",
-	"chat.send": "Send",
 	"stats.online": "Online",
 	"stats.users": "Users",
 	"stats.topics": "Topics",

public/language/en/global.json

@@ -27,5 +27,11 @@
 	"header.profile": "Profile",
 
 	"notifications.loading": "Loading Notifications",
-	"chats.loading": "Loading Chats"
+	"chats.loading": "Loading Chats",
+
+	"motd.welcome": "Welcome to NodeBB, the discussion platform of the future.",
+	"motd.get": "Get NodeBB",
+	"motd.fork": "Fork",
+	"motd.like": "Like",
+	"motd.follow": "Follow"
 }

public/language/en/language.json

@@ -0,0 +1,4 @@
+{
+	"name": "English",
+	"code": "en"
+}

public/language/en/modules.json

@@ -0,0 +1,6 @@
+{
+	"chat.chatting_with": "Chat with <span id=\"chat-with-name\"></span>",
+	"chat.placeholder": "type chat message here, press enter to send",
+	"chat.send": "Send",
+	"chat.no_active": "You have no active chats."
+}

public/language/en/notifications.json

@@ -1,7 +1,6 @@
 {
 	"title": "Notifications",
-	"back_to_home": "back to NodeBB",
-	"mark_all_as_read": "Mark All as Read",
+	"back_to_home": "Back to NodeBB",
 	"outgoing_link": "Outgoing Link",
 	"outgoing_link_message": "You are now leaving",
 	"continue_to": "Continue to",

public/language/en/topic.json

@@ -12,30 +12,41 @@
 	"reply": "Reply",
 	"edit": "Edit",
 	"delete": "Delete",
+	"move": "Move",
+	"fork": "Fork",
 	"banned": "banned",
 	"link": "Link",
+	"share": "Share",
+	"tools": "Tools",
 
 	"thread_tools.title": "Thread Tools",
+	"thread_tools.markAsUnreadForAll": "Mark Unread",
 	"thread_tools.pin": "Pin Thread",
 	"thread_tools.lock": "Lock Thread",
 	"thread_tools.move": "Move Thread",
+	"thread_tools.fork": "Fork Thread",
 	"thread_tools.delete": "Delete Thread",
 
 	"load_categories": "Loading Categories",
 	"disabled_categories_note": "Disabled Categories are greyed out",
 	"confirm_move": "Move",
+	"confirm_fork": "Fork",
 
 	"favourite": "Favourite",
-	"favourites": "Favorites",
+	"favourites": "Favourites",
 	"favourites.not_logged_in.title": "Not Logged In",
 	"favourites.not_logged_in.message": "Please log in in order to favourite this post",
 	"favourites.has_no_favourites": "You don't have any favourites, favourite some posts to see them here!",
 
 	"posted_by": "posted by",
-	"loading": "Loading",
-	"more_posts": "More Posts",
+	"loading_more_posts": "Loading More Posts",
 	"move_topic": "Move Topic",
+	"move_post": "Move Post",
+	"fork_topic": "Fork Topic",
 	"topic_will_be_moved_to": "This topic will be moved to the category",
+	"fork_topic_instruction": "Click the posts you want to fork",
+	"fork_no_pids": "No posts selected!",
+	"fork_success": "Succesfully forked topic!",
 
 	"reputation": "Reputation",
 	"posts": "Posts"

public/language/en/user.json

@@ -1,12 +1,14 @@
 {
 	"banned": "Banned",
 	"offline": "Offline",
+	"username": "User Name",
 	"email": "Email",
 	"fullname": "Full Name",
 	"website": "Website",
 	"location": "Location",
 	"age": "Age",
 	"joined": "Joined",
+	"lastonline": "Last Online",
 	"profile_views": "Profile views",
 	"reputation": "Reputation",
 	"posts": "Posts",

public/language/es/footer.json

@@ -1,7 +1,4 @@
 {
-	"chat.chatting_with": "Chatear con <span id='chat-with-name'></span>",
-	"chat.placeholder": "ingresa tu mensaje aqui, y presiona enter para enviar",
-	"chat.send": "Enviar",
 	"stats.online": "Online",
 	"stats.users": "Usuarios",
 	"stats.topics": "Temas",

public/language/es/global.json

@@ -8,7 +8,7 @@
 	"404.message": "Al parecer lo que estas buscando no existe. Te recomendamos que vuelvas al <a href='/''>inicio</a>.",
 	"500.title": "Error Interno.",
 	"500.message": "Ooops! Algo salio mal!, No te alarmes. Nuestros simios hiperinteligentes lo solucionarán",
-	
+
 	"register": "Registrarse",
 	"login": "Conectarse",
 
@@ -27,5 +27,11 @@
 	"header.profile": "Perfil",
 
 	"notifications.loading": "Cargando Notificaciones",
-	"chats.loading": "Cargando Chats"
+	"chats.loading": "Cargando Chats",
+
+	"motd.welcome": "Bienvenido a NodeBB, la plataforma de debate sobre el futuro.",
+	"motd.get": "Obtener NodeBB",
+	"motd.fork": "Fork",
+	"motd.like": "Me gusta",
+	"motd.follow": "Seguir"
 }

public/language/es/language.json

@@ -0,0 +1,4 @@
+{
+	"name": "Spanish",
+	"code": "es"
+}

public/language/es/modules.json

@@ -0,0 +1,6 @@
+{
+	"chat.chatting_with": "Chatear con <span id='chat-with-name'></span>",
+	"chat.placeholder": "ingresa tu mensaje aqui, y presiona enter para enviar",
+	"chat.send": "Enviar",
+	"chat.no_active": "No tiene conversaciones activas."
+}

public/language/es/notifications.json

@@ -1,7 +1,6 @@
 {
 	"title": "Notificaciones",
-	"back_to_home": "volver al Inicio",
-	"mark_all_as_read": "Marcar todo como leeido",
+	"back_to_home": "Volver al Inicio",
 	"outgoing_link": "Link Externo",
 	"outgoing_link_message": "Estas saliendo del sitio",
 	"continue_to": "Continuar",

public/language/es/topic.json

@@ -32,8 +32,7 @@
 	"favourites.has_no_favourites": "No tienes favoritos, puedes agregar alguno y volver a verlos aqui!",
 
 	"posted_by": "Publicado por",
-	"loading": "Cargando",
-	"more_posts": "Más posts",
+	"loading_more_posts": "Cargando más posts",
 	"move_topic": "Mover Tema",
 	"topic_will_be_moved_to": "Este tema sera movido a la categoría",
 

public/language/fr/category.json

@@ -7,7 +7,7 @@
 	"posts": "messages",
 	"views": "vues",
 	"posted": "posté",
-	"browsing": "naviguer",
+	"browsing": "parcourt",
 	"no_replies": "Personne n'a répondu",
 	"replied": "répondu",
 	"last_edited_by": "dernière édition par"

public/language/fr/footer.json

@@ -1,8 +1,5 @@
 {
-	"chat.chatting_with": "Chat avec <span id=\"chat-with-name\"></span>",
-	"chat.placeholder": "taper le message ici, presser entrer pour envoyer",
-	"chat.send": "Envoyer",
-	"stats.online": "Online",
+	"stats.online": "En ligne",
 	"stats.users": "Utilisateurs",
 	"stats.topics": "Sujets",
 	"stats.posts": "Message",

public/language/fr/global.json

@@ -27,5 +27,11 @@
 	"header.profile": "Profile",
 
 	"notifications.loading": "Chargement des Notifications",
-	"chats.loading": "Chargement des Chats"
+	"chats.loading": "Chargement des Chats",
+
+	"motd.welcome": "Bienvenue sur NodeBB, la plate-forme de discussion de l'avenir.",
+	"motd.get": "Obtenir NodeBB",
+	"motd.fork": "Fork",
+	"motd.like": "J'aime",
+	"motd.follow": "Suivre"
 }

public/language/fr/language.json

@@ -0,0 +1,4 @@
+{
+	"name": "French",
+	"code": "fr"
+}

public/language/fr/login.json

@@ -4,7 +4,7 @@
 	"password": "Mot de passe",
 	"remember_me": "Se souvenir de moi?",
 	"forgot_password": "Mot de passe oublié?",
-	"alternative_logins": "Connexion Alternative",
+	"alternative_logins": "Connexions Alternatives",
 	"failed_login_attempt": "Echèc d'authentification, veuillez réessayer.",
 	"login_successful": "Vous êtes maintenant connecté!"
 }

public/language/fr/modules.json

@@ -0,0 +1,6 @@
+{
+	"chat.chatting_with": "Chat avec <span id=\"chat-with-name\"></span>",
+	"chat.placeholder": "taper le message ici, presser entrer pour envoyer",
+	"chat.send": "Envoyer",
+	"chat.no_active": "Vous n'avez pas aucune discussion active."
+}

public/language/fr/notifications.json

@@ -1,9 +1,8 @@
 {
 	"title": "Notifications",
-	"back_to_home": "retour à NodeBB",
-	"mark_all_as_read": "Tout marquer comme lu",
+	"back_to_home": "Retour à NodeBB",
 	"outgoing_link": "Lien Sortant",
 	"outgoing_link_message": "Vous quitter NodeBB",
 	"continue_to": "Continuer vers",
-	"return_to": "Retour vers"
+	"return_to": "Retour vers "
 }

public/language/fr/recent.json

@@ -2,4 +2,4 @@
 	"day": "Jour",
 	"week": "Semaine",
 	"month": "Mois"
-}
+}

public/language/fr/register.json

@@ -6,11 +6,11 @@
 	"email_address": "Adresse Email",
 	"email_address_placeholder": "Entrer l'addresse Email",
 	"username": "Nom d'utilisateur",
-	"username_placeholder": "Entré le Nom d'utilisateur",
+	"username_placeholder": "Entrer le Nom d'utilisateur",
 	"password": "Mot de passe",
 	"password_placeholder": "Entrer le Mot de passe",
 	"confirm_password": "Confirmer le Mot de passe",
 	"confirm_password_placeholder": "Confirmer le Mot de passe",
-	"register_now_button": "S'enregistrer maintenant",
+	"register_now_button": "S'enregistrer Maintenant",
 	"alternative_registration": "Enregistrement Alternatif"
-}
+}

public/language/fr/reset_password.json

@@ -4,7 +4,7 @@
 	"password_changed.title": "Mot de passe modifié",
 	"password_changed.message": "<p>Mot de passe réinitialisé avec succès, veuillez vous <a href=\"/login\">reconnecter</a>.",
 	"wrong_reset_code.title": "Code de Réinisialisation Incorrect",
-	"wrong_reset_code.message": "Le Code de Réinisialisation est Incorrect. Veillez réessayer, ou <a href=\"/reset\">demander un nouveau Code de Réinisialisation</a>.",
+	"wrong_reset_code.message": "Le Code de Réinisialisation est Incorrect. Veuillez réessayer, ou <a href=\"/reset\">demander un nouveau Code de Réinisialisation</a>.",
 	"new_password": "Nouveau Mot de passe",
 	"repeat_password": "Confirmer le Mot de passe",
 	"enter_email": "Veuillez entrer votre <strong>adresse email</strong> et vous recevrez un email avec les instruction pour réinitialiser votre compte.",

public/language/fr/topic.json

@@ -5,25 +5,30 @@
 	"no_topics_found": "Aucun sujet trouvé!",
 
 	"profile": "Profile",
-	"posted_by": "Envoyé by",
+	"posted_by": "Envoyé par",
 	"chat": "Chat",
 	"notify_me": "Être notifié des réponses dans ce sujet",
 	"quote": "Citer",
 	"reply": "Répondre",
 	"edit": "Editer",
 	"delete": "Supprimer",
-	"banned": "bannir",
+	"move": "Déplacer",
+	"fork": "Scinder",
+	"banned": "bannis",
 	"link": "Lien",
 
 	"thread_tools.title": "Outils du Fil",
+	"thread_tools.markAsUnreadForAll": "Marqué comme non lu",
 	"thread_tools.pin": "Epingler le fil",
 	"thread_tools.lock": "Verrouiller le fil",
 	"thread_tools.move": "Déplacer le fil",
+	"thread_tools.fork": "Scinder le fil",
 	"thread_tools.delete": "Supprimer le fil",
 
 	"load_categories": "Chargement des Categories",
 	"disabled_categories_note": "Les Catégories Désactivées sont grisées",
 	"confirm_move": "Déplacer",
+	"confirm_fork": "Scinder",
 
 	"favourite": "Favoris",
 	"favourites": "Favoris",
@@ -32,11 +37,15 @@
 	"favourites.has_no_favourites": "Vous n'avez aucun Favoris, mettre en favoris des messages pour les voir apparaître ici!",
 
 	"posted_by": "posté par",
-	"loading": "Chargement",
-	"more_posts": "d'autres Messages",
+	"loading_more_posts": "Chargement d'autres Messages",
 	"move_topic": "Déplacer le Sujet",
+	"move_post": "Déplacer le Post",
+	"fork_topic": "Scinder le Topic",
 	"topic_will_be_moved_to": "Ce sujet sera déplacé vers la catégorie",
+	"fork_topic_instruction": "Cliquer sur les postes à scinder",
+	"fork_no_pids": "Aucun poste sélectionné!",
+	"fork_success": "Topic scinder!",
 
-	"reputation": "réputation",
-	"posts": "messages"
+	"reputation": "Réputation",
+	"posts": "Messages"
 }

public/language/fr/unread.json

@@ -2,4 +2,4 @@
 	"no_unread_topics": "Aucun sujet non lu.",
 	"mark_all_read": "Marquer tout comme lu",
 	"load_more": "Charger la suite"
-}
+}

public/language/fr/user.json

@@ -1,36 +1,41 @@
 {
 	"banned": "Banni",
 	"offline": "Hors-ligne",
-	"email": "email",
+	"username": "Nom d'utilisateur",
+	"email": "Email",
 	"fullname": "Nom",
 	"website": "Site Web",
 	"location": "Emplacement",
-	"age": "age",
-	"joined": "adhésion",
-	"profil_views": "vues du profil",
-	"reputation": "réputation",
-	"posts": "messages",
-	"followers": "suiveurs",
-	"following": "suivis",
-	"signature": "signature",
-	"gravatar": "gravatar",
-	"birthday": "anniversaire",
+	"age": "Age",
+	"joined": "Adhésion",
+	"lastonline": "Dernière Connection",
+	"profil_views": "Vues du profil",
+	"reputation": "Réputation",
+	"posts": "Messages",
+	"followers": "Suiveurs",
+	"following": "Suivis",
+	"signature": "Signature",
+	"gravatar": "Gravatar",
+	"birthday": "Anniversaire",
 
-	"change_picture": "changer d'image",
-	"edit": "editer",
-	"uploaded_picture": "images uploadées",
-	"upload_new_picture": "uploader une nouvelle image",
-	"change_password": "chnger le mot de passe",
-	"confirm_password": "confirmer le mot de passe",
-	"password": "mot de passe",
+	"change_picture": "Changer d'image",
+	"edit": "Editer",
+	"uploaded_picture": "Image uploadée",
+	"upload_new_picture": "Uploader une nouvelle image",
+	"change_password": "Changer le mot de passe",
+	"confirm_password": "Confirmer le mot de passe",
+	"password": "Mot de passe",
 
-	"upload_picture": "Uploader un image",
-	"upload_a_picture": "Uploader un image",
+	"upload_picture": "Uploader une image",
+	"upload_a_picture": "Uploader une image",
 	"image_spec": "Vous pouvez uploader seulement des fichiers de types PNG, JPG, ou GIF en dessous de 256kb.",
 
 	"settings": "paramètres",
-	"show_my_email": "montrer mon email",
+	"show_my_email": "Montrer mon email",
 
-	"has_no_follower": "Cet utilisateur n'a aucun suiver :(",
-	"follows_no_one": "Cet utilisateur ne suit personne :("
+	"has_no_follower": "Cet utilisateur n'a aucun suiveur :(",
+	"follows_no_one": "Cet utilisateur ne suit personne :(",
+
+	"email_hidden": "Email masqué",
+	"hidden": "masqué"
 }

public/language/fr/users.json

@@ -1,9 +1,9 @@
 {
 	"latest_users": "Derniers Utilisateurs",
-	"top_posters": "Meilleurs Publieur",
+	"top_posters": "Meilleurs Publieurs",
 	"most_reputation": "Meilleur Réputation",
 	"online": "En Ligne",
 	"search": "Rechercher",
 	"enter_username": "Entrer un nom d'utilisateur pour rechercher",
 	"load_more": "Charger la suite"
-}
+}

public/language/it/category.json

@@ -0,0 +1,14 @@
+{
+	"new_topic_button": "Nuova Discussione",
+	"no_topics": "<strong>Non ci sono discussioni in questa categoria.</strong><br />Perché non ne inizi una?",
+	"sidebar.recent_replies": "Risposte Recenti",
+	"sidebar.active_participants": "Partecipanti Attivi",
+	"sidebar.moderators": "Moderatori",
+	"posts": "post",
+	"views": "visualizzazioni",
+	"posted": "inserito",
+	"browsing": "navigazione",
+	"no_replies": "Non ha ancora risposto nessuno",
+	"replied": "risposto",
+	"last_edited_by": "ultima modifica di"
+}

public/language/it/footer.json

@@ -0,0 +1,7 @@
+{
+	"stats.online": "Online",
+	"stats.users": "Utenti",
+	"stats.topics": "Discussioni",
+	"stats.posts": "Post",
+	"success": "successo"
+}

public/language/it/global.json

@@ -0,0 +1,37 @@
+{
+	"home": "Home",
+	"search": "Cerca",
+	"buttons.close": "Chiudi",
+	"403.title": "Accesso Proibito",
+	"403.message": "Non hai accesso alla pagina che stavi cercando di aprire. Probabilmente devi <a href='/login'>effettuare il log in</a>?",
+	"404.title": "Non trovato",
+	"404.message": "La pagina che stavi cercando di aprire non esiste. Ritorna alla <a href='/'>pagina iniziale</a>.",
+	"500.title": "Errore interno.",
+	"500.message": "Oops! Qualcosa non funziona come si deve!",
+
+	"register": "Registrazione",
+	"login": "Login",
+
+	"logout": "Logout",
+	"logout.title": "Disconnessione avvenuta.",
+	"logout.message": "Logout effettuato con successo",
+
+	"save_changes": "Salva",
+	"close": "Chiudi",
+
+	"header.admin": "Amministratore",
+	"header.recent": "Recenti",
+	"header.unread": "Non letti",
+	"header.users": "Utenti",
+	"header.search": "Cerca",
+	"header.profile": "Profilo",
+
+	"notifications.loading": "Caricamento delle Notifiche",
+	"chats.loading": "Caricamento delle Chat",
+
+	"motd.welcome": "Benvenuti al NodeBB, la piattaforma di discussione del futuro.",
+	"motd.get": "Ottenere NodeBB",
+	"motd.fork": "Fork",
+	"motd.like": "Mi piace",
+	"motd.follow": "Segui"
+}

public/language/it/language.json

@@ -0,0 +1,4 @@
+{
+	"name": "Italiano",
+	"code": "it"
+}

public/language/it/login.json

@@ -0,0 +1,10 @@
+{
+	"login": "Login",
+	"username": "Nome utente",
+	"password": "Password",
+	"remember_me": "Memorizzami?",
+	"forgot_password": "Password dimenticata?",
+	"alternative_logins": "Login Alternativi",
+	"failed_login_attempt": "Tentativo di login fallito; prova ancora.",
+	"login_successful": "Login avvenuto con successo!"
+}

public/language/it/modules.json

@@ -0,0 +1,6 @@
+{
+	"chat.chatting_with": "Chatta con <span id=\"chat-with-name\"></span>",
+	"chat.placeholder": "scrivi un messaggio qui e premi Invio",
+	"chat.send": "Invia",
+	"chat.no_active": "Non hai le chat attive."
+}

public/language/it/notifications.json

@@ -0,0 +1,8 @@
+{
+	"title": "Notifiche",
+	"back_to_home": "Torna alla pagina iniziale",
+	"outgoing_link": "Link in uscita",
+	"outgoing_link_message": "Ci stai abbandonando",
+	"continue_to": "Continua verso",
+	"return_to": "Ritorna a "
+}

public/language/it/recent.json

@@ -0,0 +1,5 @@
+{
+	"day": "Giorno",
+	"week": "Settimana",
+	"month": "Mese"
+}

public/language/it/register.json

@@ -0,0 +1,16 @@
+{
+	"register": "Registrazione",
+	"help.email": "Come opzione predefinita, il tuo indirizzo email non verrà reso pubblico.",
+	"help.username_restrictions": "Un nome utente unico, di almeno %1 caratteri e al massimo di %2. Gli altri utenti ti possono menzionare usando @<span id='yourUsername'>username</span>.",
+	"help.minimum_password_length": "La lunghezza della password deve essere di almeno %1 caratteri.",
+	"email_address": "Indirizzo Email",
+	"email_address_placeholder": "Inserisci l'indirizzo email",
+	"username": "Nome utente",
+	"username_placeholder": "Inserisci il Nome utente",
+	"password": "Password",
+	"password_placeholder": "Inserisci la Password",
+	"confirm_password": "Conferma la Password",
+	"confirm_password_placeholder": "Conferma la Password",
+	"register_now_button": "Registrati",
+	"alternative_registration": "Altri metodi di registrazione"
+}

public/language/it/reset_password.json

@@ -0,0 +1,13 @@
+{
+	"reset_password": "Resetta la Password",
+	"update_password": "Cambia la Password",
+	"password_changed.title": "Password Modificata",
+	"password_changed.message": "<p>La password è stata resettata con successo. <a href=\"/login\">Effettua di nuovo il log in</a>.",
+	"wrong_reset_code.title": "Codice di reset non corretto",
+	"wrong_reset_code.message": "Il codice di reset ricevuto non è corretto. Prova ancora, o <a href=\"/reset\">richiedi un nuovo codice</a>.",
+	"new_password": "Nuova Password",
+	"repeat_password": "Conferma la Password",
+	"enter_email": "Inserisci il tuo <strong>indirizzo email</strong> e ti invieremo un'email con le istruzioni per resettare il tuo account.",
+	"password_reset_sent": "Password Reset Inviata",
+	"invalid_email": "Email invalida / L'email non esiste!"
+}

public/language/it/topic.json

@@ -0,0 +1,50 @@
+{
+	"topic": "Discussione",
+	"topics": "Discussioni",
+
+	"no_topics_found": "Nessuna discussione trovata!",
+
+	"profile": "Profilo",
+	"posted_by": "Scritto da",
+	"chat": "Chat",
+	"notify_me": "Ricevi notifiche di nuove risposte in questa discussione",
+	"quote": "Citazione",
+	"reply": "Rispondi",
+	"edit": "Modifica",
+	"delete": "Cancella",
+	"move": "Muovi",
+	"fork": "Fork",
+	"banned": "bannato",
+	"link": "Link",
+
+	"thread_tools.title": "Strumenti per il Thread",
+	"thread_tools.pin": "Appendi il Thread",
+	"thread_tools.lock": "Blocca il Thread",
+	"thread_tools.move": "Sposta il Thread",
+	"thread_tools.fork": "Fork Thread",
+	"thread_tools.delete": "Elimina il Thread",
+
+	"load_categories": "Caricamento delle Categorie",
+	"disabled_categories_note": "Le Categorie disabilitate sono in grigio",
+	"confirm_move": "Sposta",
+	"confirm_fork": "Fork",
+
+	"favourite": "Preferito",
+	"favourites": "Preferiti",
+	"favourites.not_logged_in.title": "Non collegato/a",
+	"favourites.not_logged_in.message": "Log in per aggiungere questo post ai preferiti",
+	"favourites.has_no_favourites": "Non hai ancun post preferito; aggiungi qualche post ai preferiti per vederli qui!",
+
+	"posted_by": "scritto da",
+	"loading_more_posts": "Caricamento altri post",
+	"move_topic": "Spsota Discussione",
+	"move_post": "Sposta Post",
+	"fork_topic": "Fork Topic",
+	"topic_will_be_moved_to": "Questa discussione verrà spostata nella categoria",
+	"fork_topic_instruction": "Clicca sui post che vuoi forkare",
+	"fork_no_pids": "Nessun post selezionato!",
+	"fork_success": "Discussione forkata con successo!",
+
+	"reputation": "Reputazione",
+	"posts": "Post"
+}

public/language/it/unread.json

@@ -0,0 +1,5 @@
+{
+	"no_unread_topics": "Non ci sono discussioni non lette.",
+	"mark_all_read": "Segna tutto come già letto",
+	"load_more": "Carica Altro"
+}

public/language/it/user.json

@@ -0,0 +1,41 @@
+{
+	"banned": "Bannato",
+	"offline": "Non in linea",
+	"username": "Nome Utente",
+	"email": "Email",
+	"fullname": "Nome e Cognome",
+	"website": "Sito Internet",
+	"location": "Località",
+	"age": "Età",
+	"joined": "Iscrizione",
+	"lastonline": "Ultima volta in linea",
+	"profile_views": "Visite al profilo",
+	"reputation": "Reputazione",
+	"posts": "Post",
+	"followers": "Da chi è seguito",
+	"following": "Chi segue",
+	"signature": "Firma",
+	"gravatar": "Gravatar",
+	"birthday": "Data di nascita",
+
+	"change_picture": "Cambia la foto",
+	"edit": "Modifica",
+	"uploaded_picture": "Foto caricata",
+	"upload_new_picture": "Carica una nuova foto",
+	"change_password": "Cambia la Password",
+	"confirm_password": "Conferma la Password",
+	"password": "Password",
+
+	"upload_picture": "Carica foto",
+	"upload_a_picture": "Carica una foto",
+	"image_spec": "È possibile caricare solo immagini in formato PNG, JPG, o GIF, non più grandi di 256kb.",
+
+	"settings": "impostazioni",
+	"show_email": "Mostra la mia Email",
+
+	"has_no_follower": "Questo utente non è seguito da nessuno :(",
+	"follows_no_one": "Questo utente non segue nessuno :(",
+
+	"email_hidden": "Email Nascosta",
+	"hidden": "nascosta"
+}

public/language/it/users.json

@@ -0,0 +1,9 @@
+{
+	"latest_users": "Ultimi Utenti",
+	"top_posters": "Maggiori contributori",
+	"most_reputation": "Reputazione più alta",
+	"online": "In linea",
+	"search": "Cerca",
+	"enter_username": "Inserisci il nome utente da cercare",
+	"load_more": "Carica di più"
+}

public/language/zh_cn/category.json

@@ -0,0 +1,14 @@
+{
+	"new_topic_button": "新主题",
+	"no_topics": "<strong>这个版面还没有任何内容。</strong><br />赶紧来发帖吧！",
+	"sidebar.recent_replies": "最近回复",
+	"sidebar.active_participants": "活跃用户",
+	"sidebar.moderators": "版主",
+	"posts": "帖子",
+	"views": "浏览",
+	"posted": "发布",
+	"browsing": "正在浏览",
+	"no_replies": "还没有回复",
+	"replied": "回复",
+	"last_edited_by": "最后编辑"
+}

public/language/zh_cn/footer.json

@@ -0,0 +1,7 @@
+{
+	"stats.online": "在线",
+	"stats.users": "用户",
+	"stats.topics": "主题",
+	"stats.posts": "帖子",
+	"success": "成功"
+}

public/language/zh_cn/global.json

@@ -0,0 +1,31 @@
+{
+	"home": "主页",
+	"search": "搜索",
+	"buttons.close": "关闭",
+	"403.title": "禁止访问",
+	"403.message": "你没有该页面的访问权限，可能是因为你尚未<a href='/login'>登录</a>。",
+	"404.title": "无法找到该页",
+	"404.message": "你所查找的页面并不存在，返回<a href='/'>主页</a>。",
+	"500.title": "内部错误",
+	"500.message": "不好！看来是哪里出错了！",
+
+	"register": "注册",
+	"login": "登录",
+
+	"logout": "退出",
+	"logout.title": "你已经退出。",
+	"logout.message": "你已经成功退出登录。",
+
+	"save_changes": "保存修改",
+	"close": "关闭",
+
+	"header.admin": "管理",
+	"header.recent": "最近",
+	"header.unread": "未读",
+	"header.users": "用户",
+	"header.search": "搜索",
+	"header.profile": "设置",
+
+	"notifications.loading": "消息载入中",
+	"chats.loading": "聊天载入中"
+}

public/language/zh_cn/language.json

@@ -0,0 +1,4 @@
+{
+	"name": "简体中文",
+	"code": "zh_cn"
+}

public/language/zh_cn/login.json

@@ -0,0 +1,10 @@
+{
+	"login": "登录",
+	"username": "用户名",
+	"password": "密码",
+	"remember_me": "记住我？",
+	"forgot_password": "忘记密码？",
+	"alternative_logins": "其他登录方式",
+	"failed_login_attempt": "登录失败，请再尝试。",
+	"login_successful": "你已成功登录！"
+}

public/language/zh_cn/modules.json

@@ -0,0 +1,6 @@
+{
+	"chat.chatting_with": "和<span id=\"chat-with-name\"></span>聊天中",
+	"chat.placeholder": "在这里输入消息，按Enter发送",
+	"chat.send": "发送",
+	"chat.no_active": "暂无聊天"
+}

public/language/zh_cn/notifications.json

@@ -0,0 +1,9 @@
+{
+	"title": "消息",
+	"back_to_home": "返回主页",
+	"mark_all_as_read": "全部标记为已读",
+	"outgoing_link": "站外链接",
+	"outgoing_link_message": "你正在离开本站。",
+	"continue_to": "继续前往",
+	"return_to": "返回"
+}

public/language/zh_cn/recent.json

@@ -0,0 +1,5 @@
+{
+	"day": "今日",
+	"week": "本周",
+	"month": "本月"
+}

public/language/zh_cn/register.json

@@ -0,0 +1,16 @@
+{
+	"register": "注册",
+	"help.email": "默认情况下，你的邮箱不会公开。",
+	"help.username_restrictions": "用户名由%1到%2个字符组成。其他人可以通过 @<span id='yourUsername'>用户名</span> 点名你。",
+	"help.minimum_password_length": "密码必须至少包含%1个字符。",
+	"email_address": "Email",
+	"email_address_placeholder": "输入邮箱地址",
+	"username": "用户名",
+	"username_placeholder": "输入用户名",
+	"password": "密码",
+	"password_placeholder": "输入密码",
+	"confirm_password": "确认密码",
+	"confirm_password_placeholder": "再次输入密码",
+	"register_now_button": "现在注册",
+	"alternative_registration": "其他方式注册"
+}

public/language/zh_cn/reset_password.json

@@ -0,0 +1,13 @@
+{
+	"reset_password": "重置密码",
+	"update_password": "更新密码",
+	"password_changed.title": "密码已更改",
+	"password_changed.message": "<p>密码重置成功，请重新<a href=\"/login\">登录</a>。",
+	"wrong_reset_code.title": "验证码不正确",
+	"wrong_reset_code.message": "您输入的验证码有误，请重新输入，或<a href=\"/reset\">申请新的验证码</a>。",
+	"new_password": "新的密码",
+	"repeat_password": "确认密码",
+	"enter_email": "请输入您的<strong>Email地址</strong>，我们会发送邮件告诉您如何重置密码。",
+	"password_reset_sent": "密码重置邮件已发送。",
+	"invalid_email": "非法的邮箱地址/邮箱不存在！"
+}

public/language/zh_cn/topic.json

@@ -0,0 +1,50 @@
+{
+	"topic": "主题",
+	"topics": "主题",
+
+	"no_topics_found": "没有找到主题！",
+
+	"profile": "资料",
+	"posted_by": "发表",
+	"chat": "聊天",
+	"notify_me": "该主题有新回复时通知我",
+	"quote": "引用",
+	"reply": "回复",
+	"edit": "编辑",
+	"delete": "删除",
+	"move": "移动",
+	"fork": "作为主题",
+	"banned": "封禁",
+	"link": "链接",
+
+	"thread_tools.title": "管理工具",
+	"thread_tools.pin": "置顶帖子",
+	"thread_tools.lock": "锁定帖子",
+	"thread_tools.move": "移动帖子",
+	"thread_tools.fork": "作为主题",
+	"thread_tools.delete": "删除帖子",
+
+	"load_categories": "版面载入中",
+	"disabled_categories_note": "停用的版面为灰色",
+	"confirm_move": "移动",
+	"confirm_fork": "作为主题",
+
+	"favourite": "收藏",
+	"favourites": "收藏",
+	"favourites.not_logged_in.title": "未登录",
+	"favourites.not_logged_in.message": "收藏帖子之前请先登录。",
+	"favourites.has_no_favourites": "你还没有任何收藏，收藏的帖子将会出现在这里！",
+
+	"posted_by": "发布",
+	"loading_more_posts": "载入更多帖子",
+	"move_topic": "移动主题",
+	"move_post": "移动帖子",
+	"fork_topic": "作为主题",
+	"topic_will_be_moved_to": "这个主题将会被移动到",
+	"fork_topic_instruction": "点击要作为主题的帖子",
+	"fork_no_pids": "尚未选择帖子！",
+	"fork_success": "成功将帖子作为主题！",
+
+	"reputation": "声望",
+	"posts": "发帖数"
+}

public/language/zh_cn/unread.json

@@ -0,0 +1,5 @@
+{
+	"no_unread_topics": "没有未读主题。",
+	"mark_all_read": "标记全部为已读",
+	"load_more": "载入更多"
+}

public/language/zh_cn/user.json

@@ -0,0 +1,41 @@
+{
+	"banned": "封禁",
+	"offline": "下线",
+	"username": "用户名",
+	"email": "Email",
+	"fullname": "姓名",
+	"website": "网站",
+	"location": "地址",
+	"age": "年龄",
+	"joined": "加入时间",
+	"lastonline": "最后在线",
+	"profile_views": "资料被查看",
+	"reputation": "声望",
+	"posts": "发帖数",
+	"followers": "被关注",
+	"following": "关注",
+	"signature": "签名",
+	"gravatar": "Gravatar头像",
+	"birthday": "生日",
+
+	"change_picture": "改变头像",
+	"edit": "编辑",
+	"uploaded_picture": "已有头像",
+	"upload_new_picture": "上传新头像",
+	"change_password": "更改密码",
+	"confirm_password": "确认密码",
+	"password": "密码",
+
+	"upload_picture": "上传头像",
+	"upload_a_picture": "上传一张照片",
+	"image_spec": "你可以上传PNG，JPG或GIF格式的图像，文件小于256kb。",
+
+	"settings": "设置",
+	"show_email": "显示我的邮箱",
+
+	"has_no_follower": "该用户还没有被任何人关注。",
+	"follows_no_one": "该用户还没有关注过任何人。",
+
+	"email_hidden": "邮箱被隐藏",
+	"hidden": "隐藏"
+}

public/language/zh_cn/users.json

@@ -0,0 +1,9 @@
+{
+	"latest_users": "最近用户",
+	"top_posters": "发帖最多",
+	"most_reputation": "声望最高",
+	"online": "在线",
+	"search": "搜索",
+	"enter_username": "输入你想找的用户名",
+	"load_more": "载入更多"
+}

public/src/ajaxify.js

@@ -48,6 +48,10 @@ var ajaxify = {};
 		window.onscroll = null;
 		// end
 
+		if ($('#content').hasClass('ajaxifying')) {
+			templates.cancelRequest();
+		}
+
 		// Remove trailing slash
 		url = url.replace(/\/$/, "");
 
@@ -174,7 +178,7 @@ var ajaxify = {};
 				} else if (window.location.pathname !== '/outgoing') {
 					// External Link
 
-					if (config.useOutgoingLinksPage == true) {
+					if (config.useOutgoingLinksPage) {
 						ajaxify.go('outgoing?url=' + encodeURIComponent(this.href));
 						e.preventDefault();
 					}

public/src/app.js

@@ -23,7 +23,7 @@ var socket,
 				} else {
 					var max_reconnection_attemps = 5;
 					var reconnection_delay = 200;
-					socket = io.connect(RELATIVE_PATH, {
+					socket = io.connect('', {
 						'max reconnection attempts': max_reconnection_attemps,
 						'reconnection delay': reconnection_delay
 					});
@@ -36,9 +36,9 @@ var socket,
 						app.uid = data.uid;
 
 						app.showLoginMessage();
-						socket.emit('api:updateHeader', {
+						socket.emit('meta.updateHeader', {
 							fields: ['username', 'picture', 'userslug']
-						});
+						}, app.updateHeader);
 					});
 
 					socket.on('event:alert', function (data) {
@@ -77,16 +77,16 @@ var socket,
 							}
 							app.enterRoom(room, true);
 
-							socket.emit('reconnected');
+							socket.emit('meta.reconnected');
 
 							setTimeout(function() {
 								reconnectEl.removeClass('active').addClass("hide");
 							}, 3000);
 						}
 
-						socket.emit('api:updateHeader', {
+						socket.emit('meta.updateHeader', {
 							fields: ['username', 'picture', 'userslug']
-						});
+						}, app.updateHeader);
 					});
 
 					socket.on('event:disconnect', function() {
@@ -111,42 +111,6 @@ var socket,
 						});
 					});
 
-					socket.on('api:user.get_online_users', function (users) {
-						jQuery('a.username-field').each(function () {
-							if (this.processed === true)
-								return;
-
-							var el = jQuery(this),
-								uid = el.parents('li').attr('data-uid');
-
-							if (uid && jQuery.inArray(uid, users) !== -1) {
-								el.find('i').remove();
-								el.prepend('<i class="fa fa-circle"></i>');
-							} else {
-								el.find('i').remove();
-								el.prepend('<i class="fa fa-circle-o"></i>');
-							}
-
-							el.processed = true;
-						});
-						jQuery('button .username-field').each(function () {
-							//DRY FAIL
-							if (this.processed === true)
-								return;
-
-							var el = jQuery(this),
-								uid = el.parents('li').attr('data-uid');
-
-							if (uid && jQuery.inArray(uid, users) !== -1) {
-								el.parent().addClass('btn-success');
-							} else {
-								el.parent().addClass('btn-danger');
-							}
-
-							el.processed = true;
-						});
-					});
-
 					socket.on('event:banned', function() {
 						app.alert({
 							title: 'Banned',
@@ -158,6 +122,8 @@ var socket,
 						setTimeout(app.logout, 1000);
 					});
 
+					socket.on('meta.updateHeader', app.updateHeader);
+
 					app.enterRoom('global');
 				}
 			},
@@ -178,17 +144,6 @@ var socket,
 		return text.replace(/(\d)(?=(\d\d\d)+(?!\d))/g, "$1,");
 	};
 
-	// Willingly stolen from: http://phpjs.org/functions/strip_tags/
-	app.strip_tags = function (input, allowed) {
-		allowed = (((allowed || "") + "").toLowerCase().match(/<[a-z][a-z0-9]*>/g) || []).join(''); // making sure the allowed arg is a string containing only tags in lowercase (<a><b><c>)
-		var tags = /<\/?([a-z][a-z0-9]*)\b[^>]*>/gi,
-			commentsAndPhpTags = /<!--[\s\S]*?-->|<\?(?:php)?[\s\S]*?\?>/gi;
-
-		return input.replace(commentsAndPhpTags, '').replace(tags, function ($0, $1) {
-			return allowed.indexOf('<' + $1.toLowerCase() + '>') > -1 ? $0 : '';
-		});
-	};
-
 	// use unique alert_id to have multiple alerts visible at a time, use the same alert_id to fade out the current instance
 	// type : error, success, info, warning/notify
 	// title = bolded title text
@@ -282,7 +237,7 @@ var socket,
 				return;
 			}
 
-			socket.emit('event:enter_room', {
+			socket.emit('meta.rooms.enter', {
 				'enter': room,
 				'leave': app.currentRoom
 			});
@@ -295,10 +250,24 @@ var socket,
 		var uids = [];
 
 		jQuery('.post-row').each(function () {
-			uids.push(this.getAttribute('data-uid'));
+			var uid = $(this).attr('data-uid');
+			if(uids.indexOf(uid) === -1) {
+				uids.push(uid);
+			}
 		});
 
-		socket.emit('api:user.get_online_users', uids);
+		socket.emit('user.getOnlineUsers', uids, function (err, users) {
+			jQuery('button .username-field').each(function (index, element) {
+				var el = jQuery(this),
+					uid = el.parents('li').attr('data-uid');
+
+				if (uid && jQuery.inArray(uid, users) !== -1) {
+					el.parent().addClass('btn-success').removeClass('btn-danger');
+				} else {
+					el.parent().addClass('btn-danger').removeClass('btn-success');
+				}
+			});
+		});
 	};
 
 	function highlightNavigationLink() {
@@ -402,14 +371,16 @@ var socket,
 		}
 
 		require(['chat'], function (chat) {
-			var chatModal;
 			if (!chat.modalExists(touid)) {
-				chatModal = chat.createModal(username, touid);
+				chat.createModal(username, touid, loadAndCenter);
 			} else {
-				chatModal = chat.getModal(touid);
+				loadAndCenter(chat.getModal(touid));
+			}
+
+			function loadAndCenter(chatModal) {
+				chat.load(chatModal.attr('UUID'));
+				chat.center(chatModal);
 			}
-			chat.load(chatModal.attr('UUID'));
-			chat.center(chatModal);
 		});
 	};
 
@@ -430,10 +401,13 @@ var socket,
 			interval: undefined,
 			titles: []
 		};
-	app.alternatingTitle = function (title) {
-		if (typeof title !== 'string') return;
 
-		if (title.length > 0) {
+	app.alternatingTitle = function (title) {
+		if (typeof title !== 'string') {
+			return;
+		}
+
+		if (title.length > 0 && !app.isFocused) {
 			titleObj.titles[1] = title;
 			if (titleObj.interval) {
 				clearInterval(titleObj.interval);
@@ -445,7 +419,9 @@ var socket,
 			if (titleObj.interval) {
 				clearInterval(titleObj.interval);
 			}
-			if (titleObj.titles[0]) window.document.title = titleObj.titles[0];
+			if (titleObj.titles[0]) {
+				window.document.title = titleObj.titles[0];
+			}
 		}
 	};
 
@@ -456,12 +432,83 @@ var socket,
 			url = a.pathname.slice(1);
 		}
 
-		socket.emit('api:meta.buildTitle', url, function(title, numNotifications) {
+		socket.emit('meta.buildTitle', url, function(err, title, numNotifications) {
 			titleObj.titles[0] = (numNotifications > 0 ? '(' + numNotifications + ') ' : '') + title;
 			app.alternatingTitle('');
 		});
 	};
 
+	app.updateHeader = function(err, data) {
+		$('#search-button').off().on('click', function(e) {
+			e.stopPropagation();
+			$('#search-fields').removeClass('hide').show();
+			$(this).hide();
+			$('#search-fields input').focus();
+
+			$('#search-form').on('submit', function() {
+				$('#search-fields').hide();
+				$('#search-button').show();
+			});
+
+			$('#search-fields input').on('blur', function() {
+				$('#search-fields').hide();
+				$('#search-button').show();
+			});
+			return false;
+		});
+
+		var loggedInMenu = $('#logged-in-menu'),
+			isLoggedIn = data.uid > 0,
+			allowGuestSearching = (data.config || {}).allowGuestSearching === '1';
+
+		if (isLoggedIn) {
+			$('.nodebb-loggedin').show();
+			$('.nodebb-loggedout').hide();
+
+			$('#logged-out-menu').addClass('hide');
+			$('#logged-in-menu').removeClass('hide');
+
+			$('#search-button').removeClass("hide").show();
+
+			var userLabel = loggedInMenu.find('#user_label');
+
+			if (userLabel.length) {
+				if (data.userslug) {
+					userLabel.find('#user-profile-link').attr('href', RELATIVE_PATH + '/user/' + data.userslug);
+				}
+				if (data.picture) {
+					userLabel.find('img').attr('src', data.picture);
+				}
+				if (data.username) {
+					userLabel.find('span').html(data.username);
+				}
+
+				$('#logout-link').on('click', app.logout);
+			}
+		} else {
+			if (allowGuestSearching) {
+				$('#search-button').removeClass("hide").show();
+				$('#mobile-search-button').removeClass("hide").show();
+			} else {
+				$('#search-button').addClass("hide").hide();
+				$('#mobile-search-button').addClass("hide").hide();
+			}
+
+			$('.nodebb-loggedin').hide();
+			$('.nodebb-loggedout').show();
+
+			$('#logged-out-menu').removeClass('hide');
+			$('#logged-in-menu').addClass('hide');
+
+		}
+
+		$('#main-nav a,#user-control-list a,#logged-out-menu li a,#logged-in-menu .visible-xs').off('click').on('click', function() {
+			if($('.navbar .navbar-collapse').hasClass('in')) {
+				$('.navbar-header button').click();
+			}
+		});
+	};
+
 	jQuery('document').ready(function () {
 		$('#search-form').on('submit', function () {
 			var input = $(this).find('input');
@@ -479,6 +526,8 @@ var socket,
 
 			app.alternatingTitle('');
 		});
+
+		templates.setGlobal('relative_path', RELATIVE_PATH);
 	});
 
 	showWelcomeMessage = location.href.indexOf('loggedin') !== -1;

public/src/forum/account.js

@@ -35,31 +35,31 @@ define(['forum/accountheader'], function(header) {
 			}
 
 			followBtn.on('click', function() {
-				socket.emit('api:user.follow', {
+				socket.emit('user.follow', {
 					uid: theirid
-				}, function(success) {
-					if (success) {
-						followBtn.addClass('hide');
-						unfollowBtn.removeClass('hide');
-						app.alertSuccess('You are now following ' + username + '!');
-					} else {
-						app.alertError('There was an error following' + username + '!');
+				}, function(err) {
+					if(err) {
+						return app.alertError('There was an error following' + username + '!');
 					}
+
+					followBtn.addClass('hide');
+					unfollowBtn.removeClass('hide');
+					app.alertSuccess('You are now following ' + username + '!');
 				});
 				return false;
 			});
 
 			unfollowBtn.on('click', function() {
-				socket.emit('api:user.unfollow', {
+				socket.emit('user.unfollow', {
 					uid: theirid
-				}, function(success) {
-					if (success) {
-						followBtn.removeClass('hide');
-						unfollowBtn.addClass('hide');
-						app.alertSuccess('You are no longer following ' + username + '!');
-					} else {
-						app.alertError('There was an error unfollowing ' + username + '!');
+				}, function(err) {
+					if(err) {
+						return app.alertError('There was an error unfollowing ' + username + '!');
 					}
+
+					followBtn.removeClass('hide');
+					unfollowBtn.addClass('hide');
+					app.alertSuccess('You are no longer following ' + username + '!');
 				});
 				return false;
 			});
@@ -68,13 +68,9 @@ define(['forum/accountheader'], function(header) {
 				app.openChat(username, theirid);
 			});
 
-			$('.user-recent-posts .topic-row').on('click', function() {
-				ajaxify.go($(this).attr('topic-url'));
-			});
+			socket.on('user.isOnline', Account.handleUserOnline);
 
-			socket.on('api:user.isOnline', Account.handleUserOnline);
-
-			socket.emit('api:user.isOnline', theirid, Account.handleUserOnline);
+			socket.emit('user.isOnline', theirid, Account.handleUserOnline);
 
 			socket.on('event:new_post', function(data) {
 				var html = templates.prepare(templates['account'].blocks['posts']).parse(data);
@@ -85,7 +81,7 @@ define(['forum/accountheader'], function(header) {
 		});
 	};
 
-	Account.handleUserOnline = function(data) {
+	Account.handleUserOnline = function(err, data) {
 		var onlineStatus = $('.account-online-status');
 
 		if (data.online) {

public/src/forum/accountedit.js

@@ -15,6 +15,7 @@ define(['forum/accountheader', 'uploader'], function(header, uploader) {
 
 			var userData = {
 				uid: $('#inputUID').val(),
+				username: $('#inputUsername').val(),
 				email: $('#inputEmail').val(),
 				fullname: $('#inputFullname').val(),
 				website: $('#inputWebsite').val(),
@@ -23,7 +24,7 @@ define(['forum/accountheader', 'uploader'], function(header, uploader) {
 				signature: $('#inputSignature').val()
 			};
 
-			socket.emit('api:user.updateProfile', userData, function(err, data) {
+			socket.emit('user.updateProfile', userData, function(err, data) {
 				if (data.success) {
 					app.alertSuccess('Your profile has been updated successfully!');
 					if (data.picture) {
@@ -35,7 +36,7 @@ define(['forum/accountheader', 'uploader'], function(header, uploader) {
 						gravatarPicture = data.gravatarpicture;
 					}
 				} else {
-					app.alertError('There was an error updating your profile! ' + err.error);
+					app.alertError('There was an error updating your profile! ' + err.message);
 				}
 			});
 			return false;
@@ -43,7 +44,11 @@ define(['forum/accountheader', 'uploader'], function(header, uploader) {
 
 
 		function getSignatureCharsLeft() {
-			return '(' + $('#inputSignature').val().length + '/' + config.maximumSignatureLength + ')';
+			if($('#inputSignature').length) {
+				return '(' + $('#inputSignature').val().length + '/' + config.maximumSignatureLength + ')';
+			} else {
+				return '';
+			}
 		}
 
 		$('#signatureCharCountLeft').html(getSignatureCharsLeft());
@@ -95,7 +100,7 @@ define(['forum/accountheader', 'uploader'], function(header, uploader) {
 		$('#uploadPictureBtn').on('click', function() {
 
 			$('#change-picture-modal').modal('hide');
-			uploader.open(RELATIVE_PATH + '/user/uploadpicture', function(imageUrlOnServer) {
+			uploader.open(RELATIVE_PATH + '/user/uploadpicture', {}, function(imageUrlOnServer) {
 				imageUrlOnServer = imageUrlOnServer + '?' + new Date().getTime();
 
 				$('#user-current-picture').attr('src', imageUrlOnServer);
@@ -103,9 +108,9 @@ define(['forum/accountheader', 'uploader'], function(header, uploader) {
 
 				uploadedPicture = imageUrlOnServer;
 
-				socket.emit('api:updateHeader', {
+				socket.emit('meta.updateHeader', {
 					fields: ['username', 'picture', 'userslug']
-				});
+				}, app.updateHeader);
 			});
 
 
@@ -169,7 +174,7 @@ define(['forum/accountheader', 'uploader'], function(header, uploader) {
 			$('#changePasswordBtn').on('click', function() {
 
 				if (passwordvalid && passwordsmatch && currentPassword.val()) {
-					socket.emit('api:user.changePassword', {
+					socket.emit('user.changePassword', {
 						'currentPassword': currentPassword.val(),
 						'newPassword': password.val()
 					}, function(err) {
@@ -181,7 +186,7 @@ define(['forum/accountheader', 'uploader'], function(header, uploader) {
 						passwordvalid = false;
 
 						if (err) {
-							app.alertError(err.error);
+							app.alertError(err.message);
 							return;
 						}
 
@@ -201,9 +206,9 @@ define(['forum/accountheader', 'uploader'], function(header, uploader) {
 			type: type
 		};
 
-		socket.emit('api:user.changePicture', userData, function(success) {
-			if (!success) {
-				app.alertError('There was an error changing picture!');
+		socket.emit('user.changePicture', userData, function(err) {
+			if(err) {
+				app.alertError(err.message);
 			}
 		});
 	}

public/src/forum/accountheader.js

@@ -29,11 +29,11 @@ define(function() {
 	AccountHeader.createMenu = function() {
 		var userslug = $('.account-username-box').attr('data-userslug');
 		var links = $('<div class="account-sub-links inline-block pull-right">\
-			<span id="settingsLink" class="pull-right"><a href="/user/' + userslug + '/settings">settings</a></span>\
-			<span id="favouritesLink" class="pull-right"><a href="/user/' + userslug + '/favourites">favourites</a></span>\
-			<span class="pull-right"><a href="/user/' + userslug + '/followers">followers</a></span>\
-			<span class="pull-right"><a href="/user/' + userslug + '/following">following</a></span>\
-			<span id="editLink" class="pull-right"><a href="/user/' + userslug + '/edit">edit</a></span>\
+			<span id="settingsLink" class="pull-right"><a href="' + RELATIVE_PATH + '/user/' + userslug + '/settings">settings</a></span>\
+			<span id="favouritesLink" class="pull-right"><a href="' + RELATIVE_PATH + '/user/' + userslug + '/favourites">favourites</a></span>\
+			<span class="pull-right"><a href="' + RELATIVE_PATH + '/user/' + userslug + '/followers">followers</a></span>\
+			<span class="pull-right"><a href="' + RELATIVE_PATH + '/user/' + userslug + '/following">following</a></span>\
+			<span id="editLink" class="pull-right"><a href="' + RELATIVE_PATH + '/user/' + userslug + '/edit">edit</a></span>\
 		</div>');
 
 		$('.account-username-box').append(links);

public/src/forum/accountsettings.js

@@ -10,12 +10,11 @@ define(['forum/accountheader'], function(header) {
 				showemail: $('#showemailCheckBox').is(':checked') ? 1 : 0
 			};
 
-			socket.emit('api:user.saveSettings', settings, function(err) {
-				if (!err) {
-					app.alertSuccess('Settings saved!');
-				} else {
-					app.alertError('There was an error saving settings!');
+			socket.emit('user.saveSettings', settings, function(err) {
+				if (err) {
+					return app.alertError('There was an error saving settings!');
 				}
+				app.alertSuccess('Settings saved!');
 			});
 			return false;
 		});