Commit 4c123d51 authored by JC Brand's avatar JC Brand

New release: 1.0.5

parent 561c138e
......@@ -5,7 +5,9 @@
3. Run `make release VERSION=1.0.5`
4. Do a `git diff` to check if things look sane.
4. Do a quick manual test with the `dist` files (via `index.html`)
5. Run `git push && git push --tags`
6. Update http://conversejs.org
7. Create `1.0.5` directory for the CDN.
8. Run `npm publish`
5. `git commit -m "New release 1.0.5"`
6. `git tag -s v1.0.5
7. Run `git push && git push --tags`
8. Update http://conversejs.org
9. Create `1.0.5` directory for the CDN.
10. Run `npm publish`
{
"name": "converse.js",
"description": "Web-based XMPP/Jabber chat client written in javascript",
"version": "1.0.4",
"version": "1.0.5",
"license": "MPL-2.0",
"devDependencies": {
"jasmine": "https://github.com/jcbrand/jasmine.git#1_3_x",
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -178,6 +178,24 @@ __p += '<div class="chatroom-form-container">\n <form class="pure-form pure-f
return __p
};
this["templates"]["chatroom_nickname_form"] = function(obj) {
obj || (obj = {});
var __t, __p = '', __e = _.escape;
with (obj) {
__p += '<div class="chatroom-form-container">\n <form class="pure-form converse-form chatroom-form">\n <fieldset>\n <label>' +
((__t = (heading)) == null ? '' : __t) +
'</label>\n <p class="validation-message">' +
((__t = (validation_message)) == null ? '' : __t) +
'</p>\n <input type="text" required="required" name="nick" class="new-chatroom-nick" placeholder="' +
((__t = (label_nickname)) == null ? '' : __t) +
'"/>\n </fieldset>\n <fieldset>\n <input type="submit" class="pure-button button-primary" name="join" value="' +
((__t = (label_join)) == null ? '' : __t) +
'"/>\n </fieldset>\n </form>\n</div>\n';
}
return __p
};
this["templates"]["chatroom_password_form"] = function(obj) {
obj || (obj = {});
var __t, __p = '', __e = _.escape;
......@@ -616,25 +634,33 @@ function print() { __p += __j.call(arguments, '') }
with (obj) {
__p += '<li class="' +
((__t = (role)) == null ? '' : __t) +
' occupant" id="' +
((__t = (id)) == null ? '' : __t) +
'"\n ';
if (role === "moderator") { ;
__p += '\n title="' +
((__t = (desc_moderator)) == null ? '' : __t) +
' ' +
((__t = (hint_occupant)) == null ? '' : __t) +
'"\n ';
} ;
__p += '\n ';
if (role === "occupant") { ;
__p += '\n title="' +
((__t = (desc_occupant)) == null ? '' : __t) +
' ' +
((__t = (hint_occupant)) == null ? '' : __t) +
'"\n ';
} ;
__p += '\n ';
if (role === "visitor") { ;
__p += '\n title="' +
((__t = (desc_visitor)) == null ? '' : __t) +
' ' +
((__t = (hint_occupant)) == null ? '' : __t) +
'"\n ';
} ;
__p += '\n>' +
__p += '>' +
((__t = (nick)) == null ? '' : __t) +
'</li>\n';
......@@ -914,13 +940,7 @@ __p += '<form class="pure-form pure-form-stacked converse-form add-chatroom" act
((__t = (label_room_name)) == null ? '' : __t) +
'</label>\n <input type="text" name="chatroom" class="new-chatroom-name" placeholder="' +
((__t = (label_room_name)) == null ? '' : __t) +
'"/>\n <label>' +
((__t = (label_nickname)) == null ? '' : __t) +
'</label> <input type="text" name="nick" class="new-chatroom-nick" placeholder="' +
((__t = (label_nickname)) == null ? '' : __t) +
'"/>\n <input type="submit" class="pure-button button-primary" name="join" value="' +
((__t = (label_join)) == null ? '' : __t) +
'"/>\n </fieldset>\n <fieldset>\n ';
'"/>\n ';
if (server_input_type != 'hidden') { ;
__p += '\n <label' +
((__t = (server_label_global_attr)) == null ? '' : __t) +
......@@ -932,6 +952,8 @@ __p += '\n <input type="' +
((__t = (server_input_type)) == null ? '' : __t) +
'" name="server" class="new-chatroom-server" placeholder="' +
((__t = (label_server)) == null ? '' : __t) +
'"/>\n <input type="submit" class="pure-button button-primary" name="join" value="' +
((__t = (label_join)) == null ? '' : __t) +
'"/>\n <input type="button" class="pure-button button-secondary" name="show" id="show-rooms" value="' +
((__t = (label_show_rooms)) == null ? '' : __t) +
'"/>\n </fieldset>\n</form>\n<dl id="available-chatrooms"></dl>\n';
......
# Changelog
## 1.0.5 (Unreleased)
## 1.0.5 (2016-07-28)
- In case of nickname conflict when joining a room, allow the user to choose a new one.
[jcbrand]
- Check whether the user has a reserved nickname before entering a room, and if so,
......
......@@ -48,9 +48,9 @@ copyright = u'2014, JC Brand'
# built documents.
#
# The short X.Y version.
version = '1.0.4'
version = '1.0.5'
# The full version, including alpha/beta/rc tags.
release = '1.0.4'
release = '1.0.5'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
......
......@@ -326,6 +326,10 @@
null,
"A fout het voorgekom terwyl probeer is om die vorm te stoor."
],
"Nickname": [
null,
"Bynaam"
],
"This chatroom requires a password": [
null,
"Hiedie kletskamer benodig 'n wagwoord"
......@@ -418,10 +422,6 @@
null,
"<strong>%1$s</strong> is nie 'n lid nie, en dus verwyder"
],
"Your nickname has been automatically changed to: <strong>%1$s</strong>": [
null,
"U bynaam is outomaties verander na: <strong>%1$s</strong>"
],
"Your nickname has been changed to: <strong>%1$s</strong>": [
null,
"U bynaam is verander na: <strong>%1$s</strong>"
......@@ -446,9 +446,9 @@
null,
"Jou bynaam voldoen nie aan die kamer se beleid nie"
],
"Your nickname is already taken": [
"The nickname you chose is reserved or currently in use, please choose a different one.": [
null,
"Jou bynaam is reeds geneem"
""
],
"This room does not (yet) exist": [
null,
......@@ -462,18 +462,6 @@
null,
"Onderwerp deur %1$s bygewerk na: %2$s"
],
"This user is a moderator": [
null,
"Hierdie gebruiker is 'n moderator"
],
"This user can send messages in this room": [
null,
"Hierdie gebruiker kan boodskappe na die kamer stuur"
],
"This user can NOT send messages in this room": [
null,
"Hierdie gebruiker kan NIE boodskappe na die kamer stuur nie"
],
"Invite": [
null,
"Nooi uit"
......@@ -494,10 +482,6 @@
null,
"Kamer naam"
],
"Nickname": [
null,
"Bynaam"
],
"Server": [
null,
"Bediener"
......
This diff is collapsed.
......@@ -311,6 +311,10 @@
null,
"S'ha produït un error en intentar desar el formulari."
],
"Nickname": [
null,
"Àlies"
],
"This chatroom requires a password": [
null,
"Aquesta sala de xat requereix una contrasenya"
......@@ -403,10 +407,6 @@
null,
"S'ha eliminat <strong>%1$s</strong> perquè no és membre"
],
"Your nickname has been automatically changed to: <strong>%1$s</strong>": [
null,
"El vostre àlies ha canviat automàticament a: <strong>%1$s</strong>"
],
"Your nickname has been changed to: <strong>%1$s</strong>": [
null,
"El vostre àlies ha canviat a: <strong>%1$s</strong>"
......@@ -431,9 +431,9 @@
null,
"El vostre àlies no s'ajusta a les polítiques d'aquesta sala"
],
"Your nickname is already taken": [
"The nickname you chose is reserved or currently in use, please choose a different one.": [
null,
"El vostre àlies ja està en ús"
""
],
"This room does not (yet) exist": [
null,
......@@ -443,18 +443,6 @@
null,
"Tema definit per %1$s en: %2$s"
],
"This user is a moderator": [
null,
"Aquest usuari és un moderador"
],
"This user can send messages in this room": [
null,
"Aquest usuari pot enviar missatges a aquesta sala"
],
"This user can NOT send messages in this room": [
null,
"Aquest usuari NO pot enviar missatges a aquesta sala"
],
"Occupants": [
null,
"Ocupants"
......@@ -471,10 +459,6 @@
null,
"Nom de la sala"
],
"Nickname": [
null,
"Àlies"
],
"Server": [
null,
"Servidor"
......
This diff is collapsed.
This diff is collapsed.
......@@ -295,6 +295,10 @@
null,
"Beim Speichern des Formulars ist ein Fehler aufgetreten."
],
"Nickname": [
null,
"Spitzname"
],
"This chatroom requires a password": [
null,
"Dieser Raum erfordert ein Passwort"
......@@ -387,10 +391,6 @@
null,
"<strong>%1$s</strong> ist kein Mitglied und wurde daher entfernt"
],
"Your nickname has been automatically changed to: <strong>%1$s</strong>": [
null,
"Ihr Spitzname wurde automatisiert geändert zu: <strong>%1$s</strong>"
],
"Your nickname has been changed to: <strong>%1$s</strong>": [
null,
"Ihr Spitzname wurde geändert zu: <strong>%1$s</strong>"
......@@ -415,9 +415,9 @@
null,
"Ungültiger Spitzname"
],
"Your nickname is already taken": [
"The nickname you chose is reserved or currently in use, please choose a different one.": [
null,
"Ihre Spitzname existiert bereits."
""
],
"This room does not (yet) exist": [
null,
......@@ -427,18 +427,6 @@
null,
"%1$s hat das Thema zu \"%2$s\" geändert"
],
"This user is a moderator": [
null,
"Dieser Benutzer ist ein Moderator"
],
"This user can send messages in this room": [
null,
"Dieser Benutzer kann Nachrichten in diesem Raum verschicken"
],
"This user can NOT send messages in this room": [
null,
"Dieser Benutzer kann keine Nachrichten in diesem Raum verschicken"
],
"Invite": [
null,
"Einladen"
......@@ -459,10 +447,6 @@
null,
"Raumname"
],
"Nickname": [
null,
"Spitzname"
],
"Server": [
null,
"Server"
......
This diff is collapsed.
......@@ -323,6 +323,14 @@
null,
"An error occurred while trying to save the form."
],
"Please choose your nickname": [
null,
""
],
"Nickname": [
null,
""
],
"This chatroom requires a password": [
null,
"This chatroom requires a password"
......@@ -415,7 +423,7 @@
null,
"<strong>%1$s</strong> has been removed for not being a member"
],
"Your nickname has been automatically changed to: <strong>%1$s</strong>": [
"Your nickname has been automatically set to: <strong>%1$s</strong>": [
null,
""
],
......@@ -443,9 +451,9 @@
null,
"Your nickname doesn't conform to this room's policies"
],
"Your nickname is already taken": [
"The nickname you chose is reserved or currently in use, please choose a different one.": [
null,
"Your nickname is already taken"
""
],
"This room does not (yet) exist": [
null,
......@@ -455,18 +463,6 @@
null,
"Topic set by %1$s to: %2$s"
],
"This user is a moderator": [
null,
"This user is a moderator"
],
"This user can send messages in this room": [
null,
"This user can send messages in this room"
],
"This user can NOT send messages in this room": [
null,
"This user can NOT send messages in this room"
],
"Invite": [
null,
""
......@@ -487,10 +483,6 @@
null,
""
],
"Nickname": [
null,
""
],
"Server": [
null,
"Server"
......
This diff is collapsed.
......@@ -255,6 +255,14 @@
null,
"Un error ocurrío mientras se guardaba el formulario."
],
"Please choose your nickname": [
null,
""
],
"Nickname": [
null,
"Apodo"
],
"This chatroom requires a password": [
null,
"Esta sala de chat requiere una contraseña."
......@@ -363,9 +371,9 @@
null,
"Su apodo no se ajusta a la política de esta sala"
],
"Your nickname is already taken": [
"The nickname you chose is reserved or currently in use, please choose a different one.": [
null,
"Su apodo ya ha sido tomando por otro usuario"
""
],
"This room does not (yet) exist": [
null,
......@@ -375,18 +383,6 @@
null,
"Tema fijado por %1$s a: %2$s"
],
"This user is a moderator": [
null,
"Este usuario es un moderador"
],
"This user can send messages in this room": [
null,
"Este usuario puede enviar mensajes en esta sala"
],
"This user can NOT send messages in this room": [
null,
"Este usuario NO puede enviar mensajes en esta"
],
"Invite": [
null,
""
......@@ -407,10 +403,6 @@
null,
"Nombre de sala"
],
"Nickname": [
null,
"Apodo"
],
"Server": [
null,
"Servidor"
......
This diff is collapsed.
......@@ -299,6 +299,10 @@
null,
"Une erreur est survenue lors de l'enregistrement du formulaire."
],
"Nickname": [
null,
"Alias"
],
"This chatroom requires a password": [
null,
"Ce salon nécessite un mot de passe."
......@@ -391,10 +395,6 @@
null,
"<strong>%1$s</strong> a été supprimé car il n'est pas membre"
],
"Your nickname has been automatically changed to: <strong>%1$s</strong>": [
null,
"Votre alias a été modifié automatiquement en: <strong>%1$s</strong>"
],
"Your nickname has been changed to: <strong>%1$s</strong>": [
null,
"Votre alias a été modifié en: <strong>%1$s</strong>"
......@@ -419,9 +419,9 @@
null,
"Votre alias n'est pas conforme à la politique de ce salon"
],
"Your nickname is already taken": [
"The nickname you chose is reserved or currently in use, please choose a different one.": [
null,
"Votre alias est déjà utilisé"
""
],
"This room does not (yet) exist": [
null,
......@@ -431,18 +431,6 @@
null,
"Le sujet '%2$s' a été défini par %1$s"
],
"This user is a moderator": [
null,
"Cet utilisateur est modérateur"
],
"This user can send messages in this room": [
null,
"Cet utilisateur peut envoyer des messages dans ce salon"
],
"This user can NOT send messages in this room": [
null,
"Cet utilisateur ne peut PAS envoyer de messages dans ce salon"
],
"Invite": [
null,
"Inviter"
......@@ -463,10 +451,6 @@
null,
"Nom du salon"
],
"Nickname": [
null,
"Alias"
],
"Server": [
null,
"Serveur"
......
This diff is collapsed.
......@@ -299,6 +299,10 @@
null,
"אירעה שגיאה במהלך ניסיון שמירת הטופס."
],
"Nickname": [
null,
"שם כינוי"
],
"This chatroom requires a password": [
null,
"חדר שיחה זה מצריך סיסמה"
......@@ -391,10 +395,6 @@
null,
"<strong>%1$s</strong> הוסר(ה) משום אי הימצאות במסגרת מעמד של חבר"
],
"Your nickname has been automatically changed to: <strong>%1$s</strong>": [
null,
"השם כינוי שלך שונה אוטומטית בשם: <strong>%1$s</strong>"
],
"Your nickname has been changed to: <strong>%1$s</strong>": [
null,
"השם כינוי שלך שונה בשם: <strong>%1$s</strong>"
......@@ -419,9 +419,9 @@
null,
"השם כינוי שלך לא תואם את המדינויות של חדר זה"
],
"Your nickname is already taken": [
"The nickname you chose is reserved or currently in use, please choose a different one.": [
null,
"השם כינוי שלך הינו תפוס"
""
],
"This room does not (yet) exist": [
null,
......@@ -431,18 +431,6 @@
null,
"נושא חדר זה נקבע על ידי %1$s אל: %2$s"
],
"This user is a moderator": [
null,
"משתמש זה הינו אחראי"
],
"This user can send messages in this room": [
null,
"משתמש זה מסוגל לשלוח הודעות בתוך חדר זה"
],
"This user can NOT send messages in this room": [
null,
"משתמש זה ﬥﬡ מסוגל לשלוח הודעות בתוך חדר זה"
],
"Invite": [
null,
"הזמנה"
......@@ -463,10 +451,6 @@
null,
"שם חדר"
],
"Nickname": [
null,
"שם כינוי"
],
"Server": [
null,
"שרת"
......
This diff is collapsed.
......@@ -310,6 +310,10 @@
null,
"Hiba történt az adatok mentése közben."
],
"Nickname": [
null,
"Becenév"
],
"This chatroom requires a password": [
null,
"A csevegőszobába belépéshez jelszó szükséges"
......@@ -402,10 +406,6 @@
null,
"A taglistán nem szerepel, így a szobából kiléptetve: <strong>%1$s</strong>"
],
"Your nickname has been automatically changed to: <strong>%1$s</strong>": [
null,
"A beceneved módosításra került a következőre: <strong>%1$s</strong>"
],
"Your nickname has been changed to: <strong>%1$s</strong>": [
null,
"A beceneved a következőre módosult: <strong>%1$s</strong>"
......@@ -430,9 +430,9 @@
null,
"A beceneved ütközik a csevegőszoba szabályzataival"
],
"Your nickname is already taken": [
"The nickname you chose is reserved or currently in use, please choose a different one.": [
null,
"A becenevedet már valaki használja"
""
],
"This room does not (yet) exist": [
null,
......@@ -442,18 +442,6 @@
null,
"A következő témát állította be %1$s: %2$s"
],
"This user is a moderator": [
null,
"Ez a felhasználó egy moderátor"
],
"This user can send messages in this room": [
null,
"Ez a felhasználó küldhet üzenetet ebbe a szobába"
],
"This user can NOT send messages in this room": [
null,
"Ez a felhasználó NEM küldhet üzenetet ebbe a szobába"
],
"Invite": [
null,
"Meghívás"
......@@ -474,10 +462,6 @@
null,
"Szoba neve"
],
"Nickname": [
null,
"Becenév"
],
"Server": [
null,
"Szerver"
......
This diff is collapsed.
......@@ -250,6 +250,14 @@
null,
"Kesalahan terjadi saat menyimpan formulir ini."
],
"Please choose your nickname": [
null,
""
],
"Nickname": [
null,
"Nama panggilan"
],
"This chatroom requires a password": [
null,
"Ruangan ini membutuhkan kata sandi"
......@@ -358,9 +366,9 @@
null,
"Nama panggilan anda tidak sesuai aturan ruangan ini"
],
"Your nickname is already taken": [
"The nickname you chose is reserved or currently in use, please choose a different one.": [
null,
"Nama panggilan anda telah digunakan orang lain"
""
],
"This room does not (yet) exist": [
null,
......@@ -370,18 +378,6 @@
null,
"Topik diganti oleh %1$s menjadi: %2$s"
],
"This user is a moderator": [
null,
"Pengguna ini adalah moderator"
],
"This user can send messages in this room": [
null,
"Pengguna ini dapat mengirim pesan di ruangan ini"
],
"This user can NOT send messages in this room": [
null,
"Pengguna ini tak dapat mengirim pesan di ruangan ini"
],
"Invite": [
null,
""
......@@ -398,10 +394,6 @@
null,
"Nama ruangan"
],
"Nickname": [
null,
"Nama panggilan"
],
"Server": [
null,
"Server"
......
This diff is collapsed.
......@@ -303,6 +303,14 @@
null,
"Errore durante il salvataggio del modulo"
],
"Please choose your nickname": [
null,
""
],
"Nickname": [
null,
"Soprannome"
],
"This chatroom requires a password": [
null,
"Questa stanza richiede una password"
......@@ -395,10 +403,6 @@
null,
"<strong>%1$s</strong> è stato rimosso in quanto non membro"
],
"Your nickname has been automatically changed to: <strong>%1$s</strong>": [
null,
"Il tuo nickname è stato cambiato automaticamente in: <strong>%1$s</strong>"
],
"Your nickname has been changed to: <strong>%1$s</strong>": [
null,
"Il tuo nickname è stato cambiato: <strong>%1$s</strong>"
......@@ -423,9 +427,9 @@
null,
"Il tuo soprannome non è conforme alle regole di questa stanza"
],
"Your nickname is already taken": [
"The nickname you chose is reserved or currently in use, please choose a different one.": [
null,
"Il tuo soprannome è già utilizzato"
""
],
"This room does not (yet) exist": [
null,
......@@ -435,18 +439,6 @@
null,
"Topic impostato da %1$s a: %2$s"
],
"This user is a moderator": [
null,
"Questo utente è un moderatore"
],
"This user can send messages in this room": [
null,
"Questo utente può inviare messaggi in questa stanza"
],
"This user can NOT send messages in this room": [
null,
"Questo utente NON può inviare messaggi in questa stanza"
],
"Invite": [
null,
"Invita"
......@@ -467,10 +459,6 @@
null,
"Nome stanza"
],
"Nickname": [
null,
"Soprannome"
],
"Server": [
null,
"Server"
......
This diff is collapsed.
......@@ -251,6 +251,14 @@
null,
"フォームを保存する際にエラーが発生しました。"
],
"Please choose your nickname": [
null,
""
],
"Nickname": [
null,
"ニックネーム"
],
"This chatroom requires a password": [
null,
"この談話室にはパスワードが必要です"
......@@ -359,9 +367,9 @@
null,
"ニックネームがこの談話室のポリシーに従っていません"
],
"Your nickname is already taken": [
"The nickname you chose is reserved or currently in use, please choose a different one.": [
null,
"ニックネームは既に使われています"
""
],
"This room does not (yet) exist": [
null,
......@@ -371,18 +379,6 @@
null,
"%1$s が話題を設定しました: %2$s"
],
"This user is a moderator": [
null,
"このユーザーは司会者です"
],
"This user can send messages in this room": [
null,
"このユーザーはこの談話室で発言できます"
],
"This user can NOT send messages in this room": [
null,
"このユーザーはこの談話室で発言できません"
],
"Invite": [
null,
""
......@@ -399,10 +395,6 @@
null,
"談話室の名前"
],
"Nickname": [
null,
"ニックネーム"
],
"Server": [
null,
"サーバー"
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
{
"name": "converse.js",
"version": "1.0.4",
"version": "1.0.5",
"description": "Browser based XMPP instant messaging client",
"main": "main.js",
"directories": {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment