Merge branch 'master' into release/0.4.3origin/release/0.4.3

Conflicts:
	package.json

9 files changed, 193 insertions, 27 deletions

diff --git a/.eslintrc b/.eslintrc
index 85c4a70..4dc9815 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -5,7 +5,6 @@
 
     "rules": {
         "no-underscore-dangle": 0,
-        "global-strict": [2, "always"],
         "quotes": [2, "single"],
         "strict": [2, "global"],
 
diff --git a/.travis.yml b/.travis.yml
index fbbe737..f5937f4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,7 @@
+sudo: false
+
 language: node_js
 
 node_js:
-  - node
+  - "0.12"
+  - "0.10"
diff --git a/app/models/user.js b/app/models/user.js
index 8cc0dc0..6eceda5 100644
--- a/app/models/user.js
+++ b/app/models/user.js
@@ -6,7 +6,7 @@
 
 var bcrypt = require('bcryptjs'),
     crypto = require('crypto'),
-    md5 = require('MD5'),
+    md5 = require('md5'),
     hash = require('node_hash'),
     mongoose = require('mongoose'),
     uniqueValidator = require('mongoose-unique-validator'),
diff --git a/app/xmpp/events/message-created.js b/app/xmpp/events/message-created.js
index d682a3f..d23d96a 100644
--- a/app/xmpp/events/message-created.js
+++ b/app/xmpp/events/message-created.js
@@ -27,7 +27,7 @@ module.exports = EventListener.extend({
             }
 
             var stanza = new Stanza.Message({
-                id: msg._id,
+                id: id,
                 type: 'groupchat',
                 to: connection.getRoomJid(room.slug),
                 from: connection.getRoomJid(room.slug, user.username)
diff --git a/app/xmpp/events/usermessage-created.js b/app/xmpp/events/usermessage-created.js
index b198dae..59a21fe 100644
--- a/app/xmpp/events/usermessage-created.js
+++ b/app/xmpp/events/usermessage-created.js
@@ -25,7 +25,7 @@ module.exports = EventListener.extend({
             }
 
             var stanza = new Stanza.Message({
-                id: msg._id,
+                id: id,
                 type: 'chat',
                 to: connection.getUserJid(user.username),
                 from: connection.getUserJid(owner.username)
diff --git a/locales/pl.json b/locales/pl.json
new file mode 100644
index 0000000..e49373e
--- /dev/null
+++ b/locales/pl.json
@@ -0,0 +1,83 @@
+{
+	"Sign In": "Zaloguj",
+	"Sign in": "Zaloguj",
+	"Username or Email": "Nazwa użytkownika lub email",
+	"Password": "Hasło",
+	"I need an account": "Potrzebuję konta",
+	"Register": "Zarejestruj",
+	"Username": "Nazwa użytkownika",
+	"Email": "Email",
+	"Display Name": "Wyświetlana nazwa",
+	"First Name": "Imię",
+	"Last Name": "Nazwisko",
+	"Confirm Password": "Potwierdź hasło",
+	"I already have an account": "Mam już konto",
+	"From Toronto with Love": "Z Toronto z miłością",
+	"Photos by %s and Friends": "Zdjęcia %s i przyjaciele",
+	"Fork me on GitHub": "Fork me on GitHub",
+	"Edit Profile": "Edytuj Profil",
+	"Account Settings": "Ustawienia konta",
+	"Notifications": "Powiadomienia",
+	"Auth Tokens": "Tokeny uwierzytelniania",
+	"Logout": "Wyloguj",
+	"Disconnected": "Rozłączony",
+	"Connected": "Połączony",
+	"All Rooms": "Wszystkie pokoje",
+	"Loading": "Wczytywanie",
+	"New Password": "Nowe hasło",
+	"Confirm New Password": "Potwierdź nowe hasło",
+	"Current Password": "Aktualne hasło",
+	"Required": "Wymagane",
+	"Save": "Zapisz",
+	"This room requires password to enter": "Ten pokój wymaga wpisania hasła",
+	"Edit Room": "Edytuj pokój",
+	"Chat History": "Historia czatu",
+	"Upload Files": "Wyślij pliki",
+	"Giphy": "Giphy",
+	"Got something to say?": "Masz coś do powiedzenia?",
+	"Send": "Wyślij",
+	"Who's Here": "Kto tutaj jest",
+	"Files": "Pliki",
+	"Name": "Nazwa",
+	"Description": "Opis",
+	"Participants": "Uczestnicy",
+	"Archive Room": "Pokój archiwalny",
+	"Password required": "Wymagane hasło",
+	"Room %s requires a password.": "Pokój %s wymaga hasła.",
+	"Cancel": "Anuluj",
+	"Enter": "Wejdź",
+	"Desktop Notifications are": "Powiadomienia pulpitu są",
+	"enabled": "włączone",
+	"Use your browser settings to disable them": "Użyj ustawień przeglądarki aby je zablokować",
+	"Enable Desktop Notifications": "Włącz powiadomienia pulpitu",
+	"blocked": "zablokowane",
+	"Please check your browser settings": "Proszę sprawdzić ustawienia przeglądarki",
+	"Profile Settings": "Ustawienia profilu",
+	"XMPP/Jabber Connection Details": "Szczegóły połączenia XMPP/Jabber",
+	"Connection Details": "Szczegóły połączenia",
+	"Host": "Host",
+	"Port": "Port",
+	"Conference Host": "Gospodarz konferencji",
+	"Supported Clients": "Obsługiwani klienci",
+	"Desktop": "Pulpit",
+	"Search": "Znajdź",
+	"Upload": "Wyslij",
+	"Select Files": "Wybierz pliki",
+	"Room": "Pokój",
+	"Post in room?": "Wysłać do pokoju?",
+	"Authentication tokens": "Tokeny uwierzytelniania",
+	"Auth tokens are used to access the Let's Chat API.": "Tokeny uwierzytelniania pozwalają na dostęp do API Let's Chat",
+	"Generate token": "Wygeneruj token",
+	"Revoke token": "Odrzuć token",
+	"Your generated token is below. It will not be shown again.": "Twój wygenerowany token znajduje się poniżej. Nie będzie już ponownie pokazany.",
+	"Add Room": "Dodaj pokój",
+	"Slug": "Slug",
+	"XMPP/Jabber": "XMPP/Jabber",
+	"Private?": "Prywatny?",
+	"Empty for public room": "Pusty dla pokoju publicznego",
+	"Toggle Navigation": "Przełącz nawigację",
+	"Home": "Home",
+	"Toggle Sidebar": "Przełącz panel boczny",
+	"Close": "Zamknij",
+	"Transcript for": "Zapis dla"
+}
\ No newline at end of file
diff --git a/locales/ru.json b/locales/ru.json
new file mode 100644
index 0000000..cfdacfb
--- /dev/null
+++ b/locales/ru.json
@@ -0,0 +1,82 @@
+{
+	"Sign In": "Авторизация",
+	"Sign in": "Войти",
+	"Username or Email": "Логин или Email",
+	"Password": "Пароль",
+	"I need an account": "Мне нужен аккаунт",
+	"Register": "Регистрация",
+	"Username": "Логин",
+	"Email": "Email",
+	"Display Name": "Отображаемое имя",
+	"First Name": "Имя",
+	"Last Name": "Фамилия",
+	"Confirm Password": "Повторите пароль",
+	"I already have an account": "У меня уже есть аккаунт",
+	"From Toronto with Love": "Из Торонто с любовью",
+	"Photos by %s and Friends": "Фотографии %s и друзей",
+	"Fork me on GitHub": "Форкни меня на GitHub",
+	"Edit Profile": "Редактировать профиль",
+	"Account Settings": "Настройки аккаунта",
+	"Notifications": "Оповещения",
+	"Auth Tokens": "Auth Tokens",
+	"Logout": "Выйти",
+	"Disconnected": "Отключен",
+	"Connected": "Подключен",
+	"All Rooms": "Все комнаты",
+	"Loading": "Загрузка",
+	"New Password": "Новый пароль",
+	"Confirm New Password": "Повторите новый пароль",
+	"Current Password": "Нынешний пароль",
+	"Required": "Обязательно",
+	"Save": "Сохранить",
+	"This room requires password to enter": "Для входа в эту комнату нужно ввести пароль",
+	"Edit Room": "Настройки комнаты",
+	"Chat History": "История чата",
+	"Upload Files": "Загрузить файлы",
+	"Giphy": "Giphy",
+	"Got something to say?": "Есть что сказать?",
+	"Send": "Отправить",
+	"Who's Here": "Кто здесь",
+	"Files": "Файлы",
+	"Name": "Название",
+	"Description": "Описание",
+	"Participants": "Участники",
+	"Archive Room": "Отправить в архив",
+	"Password required": "Нужен пароль",
+	"Room %s requires a password.": "Комната %s запрашивает пароль.",
+	"Cancel": "Отменить",
+	"Enter": "Войти",
+	"Desktop Notifications are": "Оповещения",
+	"enabled": "включены",
+	"Use your browser settings to disable them": "Отключите их в настройках браузера",
+	"Enable Desktop Notifications": "Включить оповещения",
+	"blocked": "заблокированы",
+	"Please check your browser settings": "Пожалуйста, проверьте настройки вашего браузера",
+	"Profile Settings": "Настройки профиля",
+	"XMPP/Jabber Connection Details": "Детали соединения XMPP/Jabber",
+	"Connection Details": "Информация о подключении",
+	"Host": "Хост",
+	"Port": "Порт",
+	"Conference Host": "Хост конференции",
+	"Supported Clients": "Поддерживаемые клиенты",
+	"Desktop": "Desktop",
+	"Search": "Поиск",
+	"Upload": "Загрузить",
+	"Select Files": "Выбрать файлы",
+	"Room": "Комната",
+	"Post in room?": "Разместить в комнате?",
+	"Authentication tokens": "Токены аутентификации",
+	"Auth tokens are used to access the Let's Chat API.": "Токены аутентификации используются для предоставления доступа к API Let's Chat.",
+	"Generate token": "Сгенерировать токен",
+	"Revoke token": "Отозвать токен",
+	"Your generated token is below. It will not be shown again.": "Ваш сгенерированный токен. Он более не будет показан.",
+	"Add Room": "Создать комнату",
+	"Slug": "Slug",
+	"XMPP/Jabber": "XMPP/Jabber",
+	"Private?": "Приватно?",
+	"Empty for public room": "Empty for public room",
+	"Toggle Navigation": "Переключить навигацию",
+	"Home": "Домой",
+	"Toggle Sidebar": "Переключить боковую панель",
+	"Close": "Закрыть"
+}
diff --git a/media/js/views/window.js b/media/js/views/window.js
index 0e109c4..f7cda80 100644
--- a/media/js/views/window.js
+++ b/media/js/views/window.js
@@ -115,8 +115,7 @@
                 name = (room && room.get('name')) || 'Rooms';
             }
             if (name) {
-                this.title = $('<pre />').text(name).html() +
-                ' \u00B7 ' + this.originalTitle;
+                this.title = name + ' \u00B7 ' + this.originalTitle;
             } else {
                 this.title = this.originalTitle;
             }
diff --git a/package.json b/package.json
index b4ff5a4..ad62d9e 100644
--- a/package.json
+++ b/package.json
@@ -58,46 +58,46 @@
   },
   "homepage": "https://github.com/sdelements/lets-chat",
   "dependencies": {
-    "MD5": "^1.2.2",
+    "md5": "^2.0.0",
     "async": "^1.4.2",
-    "bcryptjs": "^2.2.1",
-    "body-parser": "^1.13.3",
-    "colors": "^1.1.2",
+    "bcryptjs": "~2.2.2",
+    "body-parser": "^1.14.0",
+    "colors": "~1.1.2",
     "compression": "^1.5.2",
-    "connect-assets": "^4.8.0",
+    "connect-assets": "^5.0.1",
     "connect-mongo": "^0.8.2",
-    "cookie-parser": "^1.3.5",
-    "express.oi": "0.0.19",
-    "helmet": "^0.10.0",
+    "cookie-parser": "^1.4.0",
+    "express.oi": "^0.0.19",
+    "helmet": "^0.11.0",
     "i18n": "^0.5.0",
-    "js-yaml": "^3.3.1",
+    "js-yaml": "^3.4.2",
     "less": "^2.5.1",
     "lodash": "^3.10.1",
     "migroose": "^0.5.0",
     "migroose-cli": "^0.1.0",
     "moment": "^2.10.6",
-    "mongoose": "^4.0.8",
-    "mongoose-unique-validator": "^0.4.1",
+    "mongoose": "~4.1.8",
+    "mongoose-unique-validator": "~0.4.1",
     "mongoose-validate": "0.0.5",
     "multer": "^0.1.8",
     "node-uuid": "^1.4.3",
-    "node-xmpp-core": "^1.0.0-alpha14",
-    "node-xmpp-server": "^1.0.0-alpha12",
+    "node-xmpp-core": "2.0.0",
+    "node-xmpp-server": "1.0.2",
     "node_hash": "^0.2.0",
     "nunjucks": "^1.3.4",
     "on-finished": "^2.3.0",
-    "passport": "^0.2.2",
-    "passport-http": "^0.2.2",
-    "passport-http-bearer": "^1.0.1",
-    "passport-local": "^1.0.0",
-    "passport.socketio": "^3.5.1",
-    "require-directory": "^2.1.1",
+    "passport": "0.2.2",
+    "passport-http": "0.2.2",
+    "passport-http-bearer": "1.0.1",
+    "passport-local": "1.0.0",
+    "passport.socketio": "3.5.1",
+    "require-directory": "~2.1.1",
     "require-tree": "^1.0.1"
   },
   "devDependencies": {
     "grunt": "~0.4.5",
     "grunt-bower": "~0.20.0",
     "grunt-bower-task": "~0.4.0",
-    "eslint": "^0.24.1"
+    "eslint": "^1.5.0"
   }
 }