Skip to content

C
converse.js
Commit d94fd7ca authored by JC Brand's avatar JC Brand
Browse files
Options

Merge branch '0.6.x' into gh-pages 

Conflicts:
	docs/doctrees/index.doctree
	docs/html/searchindex.js
parents 095a0270 90be11ae
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 3688 additions and 653 deletions
CHANGES.rst
View file @ d94fd7ca
Changelog
=========
0.6.5 (2013-10-08)
------------------
* Fetch vCards asynchronously once a roster contact is added [jcbrand]
* Hungarian translation [w3host]
* Russian translation [bkocherov]
* Update CSS to avoid clash with bootstrap [seocam]
* New config option ``allow_muc`` toggles multi-user chat (MUC) [jcbrand]
* New config option ``allow_contact_requests`` toggles user adding [jcbrand]
* New config option ``show_only_online_users`` [jcbrand]
0.6.4 (2013-09-15)
------------------
- Add icon for the unavailable chat state. [jcbrand]
- Chat state descriptions weren't translation aware. [jcbrand]
- Clear messages from localStorage when user types "/clear". [jcbrand]
- The 'xa' chat state wasn't being handled properly. [jcbrand]
- Updated pt-BR translations [seocam]
- Updated af and de translations [jcbrand]
* Add icon for the unavailable chat state. [jcbrand]
* Chat state descriptions weren't translation aware. [jcbrand]
* Clear messages from localStorage when user types "/clear". [jcbrand]
* The 'xa' chat state wasn't being handled properly. [jcbrand]
* Updated pt-BR translations [seocam]
* Updated af and de translations [jcbrand]
0.6.3 (2013-09-12)
------------------
......@@ -17,100 +28,100 @@ Changelog
NB: This release contains an important security fix. Please don't use older
versions of the 0.6 branch.
- French translations. [tdesvenain]
- Bugfix: Messages were stored against buddy JID and not own JID. [jcbrand]
* French translations. [tdesvenain]
* Bugfix: Messages were stored against buddy JID and not own JID. [jcbrand]
0.6.2 (2013-08-29)
------------------
- Bugfix. The remove icon wasn't appearing in the contacts roster. [jcbrand]
- Bugfix. With auto_subscribe=True, the "Pending Contacts" header didn't disappear
* Bugfix. The remove icon wasn't appearing in the contacts roster. [jcbrand]
* Bugfix. With auto_subscribe=True, the "Pending Contacts" header didn't disappear
after a new user was accepted. [jcbrand]
0.6.1 (2013-08-28)
------------------
- IE9 and IE8 CSS fixes. [jcbrand]
- Bugfix: Pencil icon not visible (for setting status update). [jcbrand]
- Bugfix: RID, JID and SID initialization values were being ignored. [jcbrand]
- Bugfix: Fall back to English if a non-existing locale was specified. [jcbrand]
* IE9 and IE8 CSS fixes. [jcbrand]
* Bugfix: Pencil icon not visible (for setting status update). [jcbrand]
* Bugfix: RID, JID and SID initialization values were being ignored. [jcbrand]
* Bugfix: Fall back to English if a non-existing locale was specified. [jcbrand]
0.6.0 (2013-08-26)
------------------
- #39 Documentation for minifying JS is wrong. [jcbrand]
- #41 prebind and show_controlbox_by_default true fails. [jcbrand]
- With prebinding, attaching to the connection now happens inside Converse and
* #39 Documentation for minifying JS is wrong. [jcbrand]
* #41 prebind and show_controlbox_by_default true fails. [jcbrand]
* With prebinding, attaching to the connection now happens inside Converse and
not as a separate step after initialization. [jcbrand]
- Register presence and message handlers before fetching the roster. Otherwise
* Register presence and message handlers before fetching the roster. Otherwise
some presence notifications might be missed. [jcbrand]
- Add a debug option (logs to the browser console). [jcbrand]
- Use font icons from http://icomoon.io [jcbrand]
- Added a static mockup to aid CSS/design process. [jcbrand]
- Save language codes with hyphens. Thanks to @seocam. [jcbrand]
- The combined and minified JS file now uses almond and not require.js. [jcbrand]
* Add a debug option (logs to the browser console). [jcbrand]
* Use font icons from http://icomoon.io [jcbrand]
* Added a static mockup to aid CSS/design process. [jcbrand]
* Save language codes with hyphens. Thanks to @seocam. [jcbrand]
* The combined and minified JS file now uses almond and not require.js. [jcbrand]
0.5.2 (2013-08-05)
------------------
- Important security update. Don't expose the Strophe connection object globally. [jcbrand]
* Important security update. Don't expose the Strophe connection object globally. [jcbrand]
0.5.1 (2013-08-04)
------------------
- #13, #14: Messages sent between to GTalk accounts weren't being received. [jcbrand]
- #32: Default status was offline when user didn't have contacts. [jcbrand]
- Attach panels to the DOM upon initialize. [jcbrand]
* #13, #14: Messages sent between to GTalk accounts weren't being received. [jcbrand]
* #32: Default status was offline when user didn't have contacts. [jcbrand]
* Attach panels to the DOM upon initialize. [jcbrand]
0.5.0 (2013-07-30)
------------------
- #09 Remove dependency on AMD/require.js [jcbrand]
- #22 Fixed compare operator in strophe.muc [sonata82]
- #23 Add Italian translations [ctrlaltca]
- #24 Add Spanish translations [macagua]
- #25 Using span with css instead of img [matheus-morfi]
- #26 Only the first minute digit shown in chatbox. [jcbrand]
- #28 Add Brazilian Portuguese translations [matheus-morfi]
- Use Bower to manage 3rd party dependencies. [jcbrand]
* #09 Remove dependency on AMD/require.js [jcbrand]
* #22 Fixed compare operator in strophe.muc [sonata82]
* #23 Add Italian translations [ctrlaltca]
* #24 Add Spanish translations [macagua]
* #25 Using span with css instead of img [matheus-morfi]
* #26 Only the first minute digit shown in chatbox. [jcbrand]
* #28 Add Brazilian Portuguese translations [matheus-morfi]
* Use Bower to manage 3rd party dependencies. [jcbrand]
0.4.0 (2013-06-03)
------------------
- CSS tweaks: fixed overflowing text in status message and chatrooms list. [jcbrand]
- Bugfix: Couldn't join chatroom when clicking from a list of rooms. [jcbrand]
- Add better support for kicking or banning users from chatrooms. [jcbrand]
- Fixed alignment of chat messages in Firefox. [jcbrand]
- More intelligent fetching of vCards. [jcbrand]
- Fixed a race condition bug. Make sure that the roster is populated before sending initial presence. [jcbrand]
- Reconnect automatically when the connection drops. [jcbrand]
- Add support for internationalization. [jcbrand]
* CSS tweaks: fixed overflowing text in status message and chatrooms list. [jcbrand]
* Bugfix: Couldn't join chatroom when clicking from a list of rooms. [jcbrand]
* Add better support for kicking or banning users from chatrooms. [jcbrand]
* Fixed alignment of chat messages in Firefox. [jcbrand]
* More intelligent fetching of vCards. [jcbrand]
* Fixed a race condition bug. Make sure that the roster is populated before sending initial presence. [jcbrand]
* Reconnect automatically when the connection drops. [jcbrand]
* Add support for internationalization. [jcbrand]
0.3.0 (2013-05-21)
------------------
- Add vCard support [jcbrand]
- Remember custom status messages upon reload. [jcbrand]
- Remove jquery-ui dependency. [jcbrand]
- Use backbone.localStorage to store the contacts roster, open chatboxes and chat messages. [jcbrand]
- Fixed user status handling, which wasn't 100% according to the spec. [jcbrand]
- Separate messages according to day in chats. [jcbrand]
- Add support for specifying the BOSH bind URL as configuration setting. [jcbrand]
- #8 Improve the message counter to only increment when the window is not focused [witekdev]
- Make fetching of list of chatrooms on a server a configuration option. [jcbrand]
- Use service discovery to show all available features on a room. [jcbrand]
- Multi-user chatrooms are now configurable. [jcbrand]
* Add vCard support [jcbrand]
* Remember custom status messages upon reload. [jcbrand]
* Remove jquery-ui dependency. [jcbrand]
* Use backbone.localStorage to store the contacts roster, open chatboxes and chat messages. [jcbrand]
* Fixed user status handling, which wasn't 100% according to the spec. [jcbrand]
* Separate messages according to day in chats. [jcbrand]
* Add support for specifying the BOSH bind URL as configuration setting. [jcbrand]
* #8 Improve the message counter to only increment when the window is not focused [witekdev]
* Make fetching of list of chatrooms on a server a configuration option. [jcbrand]
* Use service discovery to show all available features on a room. [jcbrand]
* Multi-user chatrooms are now configurable. [jcbrand]
0.2.0 (2013-03-28)
------------------
- Performance enhancements and general script cleanup [ichim-david]
- Add "Connecting to chat..." info [alecghica]
- Various smaller improvements and bugfixes [jcbrand]
* Performance enhancements and general script cleanup [ichim-david]
* Add "Connecting to chat..." info [alecghica]
* Various smaller improvements and bugfixes [jcbrand]
0.1.0 (2012-06-12)
------------------
- Created [jcbrand]
* Created [jcbrand]
Gruntfile.js
View file @ d94fd7ca
......@@ -28,45 +28,6 @@ module.exports = function(grunt) {
dest: 'converse.min.css',
src: ['converse.css']
}
},
requirejs: {
compile: {
options: {
baseUrl: ".",
name: "main",
out: "converse.min.js",
paths: {
"require": "components/requirejs/require",
"jquery": "components/jquery/jquery",
"jed": "components/jed/jed",
"locales": "locale/locales",
"af": "locale/af/LC_MESSAGES/af",
"en": "locale/en/LC_MESSAGES/en",
"de": "locale/de/LC_MESSAGES/de",
"es": "locale/es/LC_MESSAGES/es",
"it": "locale/it/LC_MESSAGES/it",
"pt_BR": "locale/pt_BR/LC_MESSAGES/pt_BR",
"tinysort": "components/tinysort/src/jquery.tinysort",
"underscore": "components/underscore/underscore",
"backbone": "components/backbone/backbone",
"localstorage": "components/backbone.localStorage/backbone.localStorage",
"strophe": "components/strophe/strophe",
"strophe.muc": "components/strophe.muc/index",
"strophe.roster": "components/strophe.roster/index",
"strophe.vcard": "components/strophe.vcard/index",
"strophe.disco": "components/strophe.disco/index"
},
done: function(done, output) {
var duplicates = require('rjs-build-analysis').duplicates(output);
if (duplicates.length > 0) {
grunt.log.subhead('Duplicates found in requirejs build:');
grunt.log.warn(duplicates);
done(new Error('r.js built duplicate modules, please check the excludes option.'));
}
done();
}
}
}
}
});
grunt.loadNpmTasks('grunt-contrib-cssmin');
......@@ -105,7 +66,22 @@ module.exports = function(grunt) {
});
});
grunt.registerTask('minify', 'Create a new release', ['cssmin', 'requirejs']);
grunt.registerTask('jsmin', 'Create a new release', function () {
var done = this.async();
var child_process = require('child_process');
var exec = child_process.exec;
exec('./node_modules/requirejs/bin/r.js -o build.js',
function (err, stdout, stderr) {
if (err) {
grunt.log.write('build failed with error code '+err.code);
grunt.log.write(stderr);
}
grunt.log.write(stdout);
done();
});
});
grunt.registerTask('minify', 'Create a new release', ['cssmin', 'jsmin']);
grunt.registerTask('check', 'Perform all checks (e.g. before releasing)', function () {
grunt.task.run('jshint', 'test');
......
Makefile
View file @ d94fd7ca
......@@ -40,7 +40,7 @@ pot:
merge:
find ./locale -maxdepth 1 -mindepth 1 -type d -exec msgmerge {}/LC_MESSAGES/converse.po ./locale/converse.pot -U \;
bump:
release:
sed -i s/\"version\":\ \"[0-9]\.[0-9]\.[0-9]\"/\"version\":\ \"$(VERSION)\"/ bower.json
sed -i s/\"version\":\ \"[0-9]\.[0-9]\.[0-9]\"/\"version\":\ \"$(VERSION)\"/ package.json
sed -i s/v[0-9]\.[0-9]\.[0-9]\.zip/v$(VERSION)\.zip/ index.html
......@@ -48,9 +48,7 @@ bump:
sed -i s/version\ =\ \'[0-9]\.[0-9]\.[0-9]\'/version\ =\ \'$(VERSION)\'/ docs/source/conf.py
sed -i s/release\ =\ \'[0-9]\.[0-9]\.[0-9]\'/release\ =\ \'$(VERSION)\'/ docs/source/conf.py
sed -i "s/(Unreleased)/(`date +%Y-%m-%d`)/" CHANGES.rst
release:
r.js -o build.js && grunt cssmin
grunt minify
clean:
-rm -rf $(BUILDDIR)/*
......
README.rst
View file @ d94fd7ca
......@@ -31,7 +31,7 @@ It has the following features:
* Custom status messages
* Typing notifications
* Third person messages (/me )
* Translated into multiple languages (af, de, es, it, pt_BR)
* Translated into multiple languages (af, de, es, fr, it, hu, pt-BR, ru)
-----------
Screencasts
......
bower.json
View file @ d94fd7ca
{
"name": "converse",
"version": "0.6.4",
"version": "0.6.5",
"devDependencies": {
"jasmine": "https://github.com/jcbrand/jasmine.git#1_3_x"
},
......
build.js
View file @ d94fd7ca
......@@ -8,12 +8,14 @@
"jed": "components/jed/jed",
"locales": "locale/locales",
"af": "locale/af/LC_MESSAGES/af",
"en": "locale/en/LC_MESSAGES/en",
"de": "locale/de/LC_MESSAGES/de",
"en": "locale/en/LC_MESSAGES/en",
"es": "locale/es/LC_MESSAGES/es",
"fr": "locale/fr/LC_MESSAGES/fr",
"hu": "locale/hu/LC_MESSAGES/hu",
"it": "locale/it/LC_MESSAGES/it",
"pt_BR": "locale/pt_BR/LC_MESSAGES/pt_BR",
"ru": "locale/ru/LC_MESSAGES/ru",
"jquery.tinysort": "components/tinysort/src/jquery.tinysort",
"underscore": "components/underscore/underscore",
"backbone": "components/backbone/backbone",
......
converse.css
View file @ d94fd7ca
This diff is collapsed.
converse.js
View file @ d94fd7ca
This diff is collapsed.
converse.min.css
View file @ d94fd7ca
This source diff could not be displayed because it is too large. You can view the blob instead.
converse.min.js
View file @ d94fd7ca
This diff is collapsed.
docs/html/.buildinfo
View file @ d94fd7ca
# Sphinx build info version 1
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
config: 3cbbfab63ff6ab75d6a8455d9c72e0ee
config: 083755f35f9ab853ad615aefaae02f0e
tags: fbb0d17656682115ca4d033fb2f83ba1
docs/html/_sources/index.txt
View file @ d94fd7ca
......@@ -465,17 +465,35 @@ JS file so that it will include the new settings. Please refer to the
Configuration variables
=======================
allow_contact_requests
----------------------
Default = ``true``
Allow users to add one another as contacts. If this is set to false, the
**Add a contact** widget, **Contact Requests** and **Pending Contacts** roster
sections will all not appear. Additionally, all incoming contact requests will be
ignored.
allow_muc
---------
Default = ``true``
Allow multi-user chat (muc) in chatrooms. Setting this to ``false`` will remove
the ``Chatrooms`` tab from the control box.
animate
-------
Default = True
Default = ``true``
Show animations, for example when opening and closing chat boxes.
auto_list_rooms
---------------
Default = False
Default = ``false``
If true, and the XMPP server on which the current user is logged in supports
multi-user chat, then a list of rooms on that server will be fetched.
......@@ -489,7 +507,7 @@ option will create lots of extra connection traffic.
auto_subscribe
--------------
Default = False
Default = ``false``
If true, the user will automatically subscribe back to any contact requests.
......@@ -504,6 +522,8 @@ See `here <http://metajack.im/2008/09/08/which-bosh-server-do-you-need>`_ for mo
debug
-----
Default = ``false``
If set to true, debugging output will be logged to the browser console.
fullname
......@@ -515,7 +535,7 @@ logged in user, otherwise the user's vCard will be fetched.
hide_muc_server
---------------
Default = false
Default = ``false``
Hide the ``server`` input field of the form inside the ``Room`` panel of the
controlbox. Useful if you want to restrict users to a specific XMPP server of
......@@ -530,7 +550,7 @@ Specify the locale/language. The language must be in the ``locales`` object. Ref
prebind
--------
Default = false
Default = ``false``
Use this option when you want to attach to an existing XMPP connection that was
already authenticated (usually on the backend before page load).
......@@ -550,7 +570,7 @@ Additionally, you have to specify ``bosh_service_url``.
show_controlbox_by_default
--------------------------
Default = false
Default = ``false``
The "controlbox" refers to the special chatbox containing your contacts roster,
status widget, chatrooms and other controls.
......@@ -561,11 +581,18 @@ the page with class *toggle-online-users*.
If this options is set to true, the controlbox will by default be shown upon
page load.
show_only_online_users
----------------------
Default = ``false``
If set to ``true``, only online users will be shown in the contacts roster.
Users with any other status (e.g. away, busy etc.) will not be shown.
xhr_user_search
---------------
Default = False
Default = ``false``
There are two ways to add users.
......
docs/html/genindex.html
View file @ d94fd7ca
......@@ -9,7 +9,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Index &mdash; Converse.js 0.6.4 documentation</title>
<title>Index &mdash; Converse.js 0.6.5 documentation</title>
<link rel="stylesheet" href="_static/stylesheet.css" type="text/css" />
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />
......@@ -17,7 +17,7 @@
<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT: '',
VERSION: '0.6.4',
VERSION: '0.6.5',
COLLAPSE_INDEX: false,
FILE_SUFFIX: '.html',
HAS_SOURCE: true
......@@ -26,7 +26,7 @@
<script type="text/javascript" src="_static/jquery.js"></script>
<script type="text/javascript" src="_static/underscore.js"></script>
<script type="text/javascript" src="_static/doctools.js"></script>
<link rel="top" title="Converse.js 0.6.4 documentation" href="index.html" />
<link rel="top" title="Converse.js 0.6.5 documentation" href="index.html" />
</head>
<body>
<div id="header_wrap" class="outer">
......@@ -51,7 +51,7 @@
<li class="right" style="margin-right: 10px">
<a href="#" title="General Index"
accesskey="I">index</a></li>
<li><a href="index.html">Converse.js 0.6.4 documentation</a> &raquo;</li>
<li><a href="index.html">Converse.js 0.6.5 documentation</a> &raquo;</li>
</ul>
</div>
<section id="main_content" class="inner">
......@@ -80,7 +80,7 @@
<li class="right" style="margin-right: 10px">
<a href="#" title="General Index"
>index</a></li>
<li><a href="index.html">Converse.js 0.6.4 documentation</a> &raquo;</li>
<li><a href="index.html">Converse.js 0.6.5 documentation</a> &raquo;</li>
</ul>
</div>
</div>
......
docs/html/index.html
View file @ d94fd7ca
This diff is collapsed.
docs/html/objects.inv
View file @ d94fd7ca
# Sphinx inventory version 2
# Project: Converse.js
# Version: 0.6.4
# Version: 0.6.5
# The remainder of this file is compressed using zlib.
xm
{"];
......
docs/html/search.html
View file @ d94fd7ca
......@@ -7,7 +7,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Search &mdash; Converse.js 0.6.4 documentation</title>
<title>Search &mdash; Converse.js 0.6.5 documentation</title>
<link rel="stylesheet" href="_static/stylesheet.css" type="text/css" />
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />
......@@ -15,7 +15,7 @@
<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT: '',
VERSION: '0.6.4',
VERSION: '0.6.5',
COLLAPSE_INDEX: false,
FILE_SUFFIX: '.html',
HAS_SOURCE: true
......@@ -25,7 +25,7 @@
<script type="text/javascript" src="_static/underscore.js"></script>
<script type="text/javascript" src="_static/doctools.js"></script>
<script type="text/javascript" src="_static/searchtools.js"></script>
<link rel="top" title="Converse.js 0.6.4 documentation" href="index.html" />
<link rel="top" title="Converse.js 0.6.5 documentation" href="index.html" />
<script type="text/javascript">
jQuery(function() { Search.loadIndex("searchindex.js"); });
</script>
......@@ -55,7 +55,7 @@
<li class="right" style="margin-right: 10px">
<a href="genindex.html" title="General Index"
accesskey="I">index</a></li>
<li><a href="index.html">Converse.js 0.6.4 documentation</a> &raquo;</li>
<li><a href="index.html">Converse.js 0.6.5 documentation</a> &raquo;</li>
</ul>
</div>
<section id="main_content" class="inner">
......@@ -100,7 +100,7 @@
<li class="right" style="margin-right: 10px">
<a href="genindex.html" title="General Index"
>index</a></li>
<li><a href="index.html">Converse.js 0.6.4 documentation</a> &raquo;</li>
<li><a href="index.html">Converse.js 0.6.5 documentation</a> &raquo;</li>
</ul>
</div>
</div>
......
docs/html/searchindex.js
View file @ d94fd7ca
This diff is collapsed.
docs/source/conf.py
View file @ d94fd7ca
......@@ -48,9 +48,9 @@ copyright = u'2013, JC Brand'
# built documents.
#
# The short X.Y version.
version = '0.6.4'
version = '0.6.5'
# The full version, including alpha/beta/rc tags.
release = '0.6.4'
release = '0.6.5'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
......
docs/source/index.rst
View file @ d94fd7ca
......@@ -465,17 +465,35 @@ JS file so that it will include the new settings. Please refer to the
Configuration variables
=======================
allow_contact_requests
----------------------
Default = ``true``
Allow users to add one another as contacts. If this is set to false, the
**Add a contact** widget, **Contact Requests** and **Pending Contacts** roster
sections will all not appear. Additionally, all incoming contact requests will be
ignored.
allow_muc
---------
Default = ``true``
Allow multi-user chat (muc) in chatrooms. Setting this to ``false`` will remove
the ``Chatrooms`` tab from the control box.
animate
-------
Default = True
Default = ``true``
Show animations, for example when opening and closing chat boxes.
auto_list_rooms
---------------
Default = False
Default = ``false``
If true, and the XMPP server on which the current user is logged in supports
multi-user chat, then a list of rooms on that server will be fetched.
......@@ -489,7 +507,7 @@ option will create lots of extra connection traffic.
auto_subscribe
--------------
Default = False
Default = ``false``
If true, the user will automatically subscribe back to any contact requests.
......@@ -504,6 +522,8 @@ See `here <http://metajack.im/2008/09/08/which-bosh-server-do-you-need>`_ for mo
debug
-----
Default = ``false``
If set to true, debugging output will be logged to the browser console.
fullname
......@@ -515,7 +535,7 @@ logged in user, otherwise the user's vCard will be fetched.
hide_muc_server
---------------
Default = false
Default = ``false``
Hide the ``server`` input field of the form inside the ``Room`` panel of the
controlbox. Useful if you want to restrict users to a specific XMPP server of
......@@ -530,7 +550,7 @@ Specify the locale/language. The language must be in the ``locales`` object. Ref
prebind
--------
Default = false
Default = ``false``
Use this option when you want to attach to an existing XMPP connection that was
already authenticated (usually on the backend before page load).
......@@ -550,7 +570,7 @@ Additionally, you have to specify ``bosh_service_url``.
show_controlbox_by_default
--------------------------
Default = false
Default = ``false``
The "controlbox" refers to the special chatbox containing your contacts roster,
status widget, chatrooms and other controls.
......@@ -561,11 +581,18 @@ the page with class *toggle-online-users*.
If this options is set to true, the controlbox will by default be shown upon
page load.
show_only_online_users
----------------------
Default = ``false``
If set to ``true``, only online users will be shown in the contacts roster.
Users with any other status (e.g. away, busy etc.) will not be shown.
xhr_user_search
---------------
Default = False
Default = ``false``
There are two ways to add users.
......
index.html
View file @ d94fd7ca
......@@ -18,8 +18,8 @@
<h1 id="project_title"><a href="http://conversejs.org">Converse.js</a></h1>
<h2 id="project_tagline">An XMPP chat client for your website</h2>
<section id="downloads">
<a class="zip_download_link" href="https://github.com/jcbrand/converse.js/archive/v0.6.4.zip">Download the latest release as a .zip file</a>
<a class="tar_download_link" href="https://github.com/jcbrand/converse.js/archive/v0.6.4.tar.gz">Download the latest release as a tar.gz file</a>
<a class="zip_download_link" href="https://github.com/jcbrand/converse.js/archive/v0.6.5.zip">Download the latest release as a .zip file</a>
<a class="tar_download_link" href="https://github.com/jcbrand/converse.js/archive/v0.6.5.tar.gz">Download the latest release as a tar.gz file</a>
</section>
</header>
</div>
......@@ -53,7 +53,7 @@
<li>Custom status messages</li>
<li>Typing notifications</li>
<li>Third person messages (/me )</li>
<li>Translated into multiple languages (af, de, es, fr, it, pt-BR)</li>
<li>Translated into multiple languages (af, de, es, fr, it, hu, pt-BR, ru)</li>
</ul>
<h2>Screencasts</h2>
......
locale/hu/LC_MESSAGES/converse.json 0 → 100644
View file @ d94fd7ca
This diff is collapsed.
locale/hu/LC_MESSAGES/converse.po 0 → 100644
View file @ d94fd7ca
This diff is collapsed.
locale/hu/LC_MESSAGES/hu.js 0 → 100644
View file @ d94fd7ca
(function(root, factory) {
var translations = {
"domain" : "converse",
"locale_data" : {
"converse" : {
"" : {
"Project-Id-Version" : "Converse.js 0.4",
"Report-Msgid-Bugs-To" : "",
"POT-Creation-Date" : "2013-09-24 23:22+0200",
"PO-Revision-Date" : "2013-09-25 22:42+0200",
"Last-Translator" : "Krisztian Kompar <w3host@w3host.hu>",
"Language-Team" : "Hungarian",
"Language" : "hu",
"MIME-Version" : "1.0",
"Content-Type" : "text/plain; charset=UTF-8",
"Content-Transfer-Encoding" : "8bit",
"domain" : "converse",
"lang" : "hu",
"plural_forms" : "nplurals=2; plural=(n != 1);"
},
"Disconnected" : [ null, "Szétkapcsolva" ],
"Error" : [ null, "Hiba" ],
"Connecting" : [ null, "Kapcsolódás" ],
"Connection Failed" : [ null, "Kapcsolódási hiba" ],
"Authenticating" : [ null, "Azonosítás" ],
"Authentication Failed" : [ null, "Azonosítási hiba" ],
"Disconnecting" : [ null, "Szétkapcsolás" ],
"me" : [ null, "én" ],
"%1$s is typing" : [ null, "%1$s gépel" ],
"Show this menu" : [ null, "Mutasd ezt a menüt" ],
"Write in the third person" : [ null, "" ],
"Remove messages" : [ null, "Üzenet törlése" ],
"Personal message" : [ null, "Saját üzenet" ],
"Contacts" : [ null, "Kapcsolatok" ],
"Online" : [ null, "Elérhető" ],
"Busy" : [ null, "Foglalt" ],
"Away" : [ null, "Távol" ],
"Offline" : [ null, "Nem elérhető" ],
"Click to add new chat contacts" : [ null,
"Új kapcsolatok hozzáadása" ],
"Add a contact" : [ null, "Új kapcsolat" ],
"Contact username" : [ null, "Felhasználónév" ],
"Add" : [ null, "Hozzáadás" ],
"Contact name" : [ null, "Kapcsolat neve" ],
"Search" : [ null, "Keresés" ],
"No users found" : [ null, "Nincs találat" ],
"Click to add as a chat contact" : [ null,
"Csevegő kapcsolatként hozzáad" ],
"Click to open this room" : [ null, "Belépés a csevegő szobába" ],
"Show more information on this room" : [ null,
"További információk a csevegő szobáról" ],
"Description:" : [ null, "Leírás:" ],
"Occupants:" : [ null, "Jelenlevők:" ],
"Features:" : [ null, "Tulajdonságok" ],
"Requires authentication" : [ null, "Azonosítás szükséges" ],
"Hidden" : [ null, "Rejtett" ],
"Requires an invitation" : [ null, "Meghívás szükséges" ],
"Moderated" : [ null, "Moderált" ],
"Non-anonymous" : [ null, "NEM névtelen" ],
"Open room" : [ null, "Nyitott szoba" ],
"Permanent room" : [ null, "Állandó szoba" ],
"Public" : [ null, "Nyílvános" ],
"Semi-anonymous" : [ null, "Félig névtelen" ],
"Temporary room" : [ null, "Ideiglenes szoba" ],
"Unmoderated" : [ null, "Moderálatlan" ],
"Rooms" : [ null, "Szobák" ],
"Room name" : [ null, "A szoba neve" ],
"Nickname" : [ null, "Becenév" ],
"Server" : [ null, "Szerver" ],
"Join" : [ null, "Csatlakozás" ],
"Show rooms" : [ null, "Létező szobák" ],
"No rooms on %1$s" : [ null,
"Nincs csevegő szoba a(z) %1$s szerveren" ],
"Rooms on %1$s" : [ null, "Csevegő szobák a(z) %1$s szerveren" ],
"Set chatroom topic" : [ null, "Csevegőszoba téma beállítás" ],
"Kick user from chatroom" : [ null,
"Felhasználó kiléptetése a csevegő szobából" ],
"Ban user from chatroom" : [ null,
"Felhasználó kitíltása a csevegő szobából" ],
"Message" : [ null, "Üzenet" ],
"Save" : [ null, "Mentés" ],
"Cancel" : [ null, "Mégsem" ],
"An error occurred while trying to save the form." : [ null,
"Hiba történt az adatok mentése közben." ],
"This chatroom requires a password" : [ null,
"A csevegő szoba belépéshez jelszó szükséges" ],
"Password: " : [ null, "Jelszó:" ],
"Submit" : [ null, "Küldés" ],
"This room is not anonymous" : [ null,
"Ez a szoba NEM névtelen" ],
"This room now shows unavailable members" : [ null,
"Ez a szoba mutatja az elérhetetlen tagokat" ],
"This room does not show unavailable members" : [ null,
"Ez a szoba nem mutatja az elérhetetlen tagokat" ],
"Non-privacy-related room configuration has changed" : [ null,
"A szoba általános konfigurációja módosult" ],
"Room logging is now enabled" : [ null,
"A szobába a belépés lehetséges" ],
"Room logging is now disabled" : [ null,
"A szobába a belépés szünetel" ],
"This room is now non-anonymous" : [ null,
"Ez a szoba most NEM névtelen" ],
"This room is now semi-anonymous" : [ null,
"Ez a szoba most félig névtelen" ],
"This room is now fully-anonymous" : [ null,
"Ez a szoba most teljesen névtelen" ],
"A new room has been created" : [ null,
"Létrejött egy új csevegő szoba" ],
"Your nickname has been changed" : [ null,
"A beceneved módosításra került" ],
"<strong>%1$s</strong> has been banned" : [ null,
"A szobából kitíltva: <strong>%1$s</strong>" ],
"<strong>%1$s</strong> has been kicked out" : [ null,
"A szobából kidobva: <strong>%1$s</strong>" ],
"<strong>%1$s</strong> has been removed because of an affiliation change" : [
null,
"Taglista módosítás miatt a szobából kiléptetve: <strong>%1$s</strong>" ],
"<strong>%1$s</strong> has been removed for not being a member" : [
null,
"A taglistán nem szerepel így a szobából kiléptetve: <strong>%1$s</strong>" ],
"You have been banned from this room" : [ null,
"Ki lettél tíltva ebből a szobából" ],
"You have been kicked from this room" : [ null,
"Ki lettél dobva ebből a szobából" ],
"You have been removed from this room because of an affiliation change" : [
null,
"Taglista módosítás miatt kiléptettünk a csevegő szobából" ],
"You have been removed from this room because the room has changed to members-only and you're not a member" : [
null,
"Kiléptettünk a csevegő szobából, mert mostantól csak a taglistán szereplők lehetnek jelen." ],
"You have been removed from this room because the MUC (Multi-user chat) service is being shut down." : [
null,
"Kiléptettünk a csevegő szobából, mert a MUC (Multi-User Chat) szolgáltatás leállításra került." ],
"You are not on the member list of this room" : [ null,
"Nem szerepelsz a csevegő szoba taglistáján" ],
"No nickname was specified" : [ null,
"Nem lett megadva becenév" ],
"You are not allowed to create new rooms" : [ null,
"Nem lehet új csevegő szobát létrehozni" ],
"Your nickname doesn't conform to this room's policies" : [
null,
"A beceneved ütközik a csevegő szoba szabályzataival" ],
"Your nickname is already taken" : [ null,
"A becenevedet már valaki használja" ],
"This room does not (yet) exist" : [ null,
"Ez a szoba (még) nem létezik" ],
"This room has reached it's maximum number of occupants" : [
null,
"Ez a csevegő szoba elérte a maximális jelenlevők számát" ],
"Topic set by %1$s to: %2$s" : [ 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" ],
"Click to chat with this contact" : [ null,
"Csevegés indítása ezzel a kapcsolatunkkal" ],
"Click to remove this contact" : [ null, "A kapcsolat törlése" ],
"This contact is busy" : [ null, "Elfoglalt" ],
"This contact is online" : [ null, "Online" ],
"This contact is offline" : [ null, "Nincs bejelentkezve" ],
"This contact is unavailable" : [ null, "Elérhetetlen" ],
"This contact is away for an extended period" : [ null,
"Hosszabb ideje távol" ],
"This contact is away" : [ null, "Távol" ],
"Contact requests" : [ null, "Kapcsolat felvételi kérés" ],
"My contacts" : [ null, "Kapcsolatok:" ],
"Pending contacts" : [ null, "Függőben levő kapcsolatok" ],
"Custom status" : [ null, "Egyedi státusz" ],
"Click to change your chat status" : [ null,
"Saját státusz beállítása" ],
"Click here to write a custom status message" : [ null,
"Egyedi státusz üzenet írása" ],
"online" : [ null, "online" ],
"busy" : [ null, "elfoglalt" ],
"away for long" : [ null, "hosszú ideje távol" ],
"away" : [ null, "távol" ],
"I am %1$s" : [ null, "%1$s vagyok" ],
"Sign in" : [ null, "Belépés" ],
"XMPP/Jabber Username:" : [ null, "XMPP/Jabber azonosító:" ],
"Password:" : [ null, "Jelszó:" ],
"Log In" : [ null, "Belépés" ],
"BOSH Service URL:" : [ null, "BOSH szerver URL" ],
"Online Contacts" : [ null, "Online kapcsolatok" ]
}
}
};
if (typeof define === 'function' && define.amd) {
define("hu", [ 'jed' ], function() {
return factory(new Jed(translations));
});
} else {
if (!window.locales) {
window.locales = {};
}
window.locales.de = factory(new Jed(translations));
}
}(this, function(hu) {
return hu;
}));
locale/locales.js
View file @ d94fd7ca
......@@ -14,8 +14,10 @@
"en": "locale/en/LC_MESSAGES/en",
"es": "locale/es/LC_MESSAGES/es",
"fr": "locale/fr/LC_MESSAGES/fr",
"hu": "locale/hu/LC_MESSAGES/hu",
"it": "locale/it/LC_MESSAGES/it",
"pt_BR": "locale/pt_BR/LC_MESSAGES/pt_BR"
"pt_BR": "locale/pt_BR/LC_MESSAGES/pt_BR",
"ru": "locale/ru/LC_MESSAGES/ru"
}
});
......@@ -26,17 +28,21 @@
'en',
'es',
'fr',
'hu',
'it',
'pt_BR'
], function (jed, af, de, en, es, fr, it, pt_BR) {
'pt_BR',
'ru'
], function (jed, af, de, en, es, fr, hu, it, pt_BR, ru) {
root.locales = {
'af': af,
'de': de,
'en': en,
'es': es,
'fr': fr,
'hu': hu,
'it': it,
'pt-br': pt_BR
'pt-br': pt_BR,
'ru': ru
};
});
})(this);
locale/ru/LC_MESSAGES/converse.json 0 → 100644
View file @ d94fd7ca
This diff is collapsed.
locale/ru/LC_MESSAGES/converse.po 0 → 100644
View file @ d94fd7ca
This diff is collapsed.
locale/ru/LC_MESSAGES/ru.js 0 → 100644
View file @ d94fd7ca
This diff is collapsed.
mock.js
View file @ d94fd7ca
......@@ -28,17 +28,17 @@
},
'vcard': {
'get': function (callback, jid) {
var firstname, lastname;
var fullname;
if (!jid) {
jid = 'dummy@localhost';
firstname = 'Max';
lastname = 'Mustermann';
fullname = 'Max Mustermann' ;
} else {
var name = jid.split('@')[0].replace('.', ' ').split(' ');
firstname = name[0].charAt(0).toUpperCase()+name[0].slice(1);
lastname = name[1].charAt(0).toUpperCase()+name[1].slice(1);
var name = jid.split('@')[0].replace(/\./g, ' ').split(' ');
var last = name.length-1;
name[0] = name[0].charAt(0).toUpperCase()+name[0].slice(1);
name[last] = name[last].charAt(0).toUpperCase()+name[last].slice(1);
fullname = name.join(' ');
}
var fullname = firstname+' '+lastname;
var vcard = $iq().c('vCard').c('FN').t(fullname);
callback(vcard.tree());
}
......
mockup.html
View file @ d94fd7ca
......@@ -167,7 +167,7 @@
<dd class="available-chatroom">
<a class="open-room"
data-room-jid="converse.js@conference.opkode.im"
title="Click to open this room" href="#">converse.js (2)</a>
title="Click to open this room" href="#">Special chatroom with a long name (2)</a>
<a class="room-info icon-room-info"
data-room-jid="converse.js@conference.opkode.im"
title="Show more information on this room" href="#">&nbsp;</a>
......
package.json
View file @ d94fd7ca
{
"name": "converse.js",
"version": "0.6.4",
"version": "0.6.5",
"description": "Browser based XMPP instant messaging client",
"main": "main.js",
"directories": {
......@@ -35,5 +35,8 @@
"bower": "~1.0.0",
"grunt-contrib-requirejs": "~0.4.1",
"grunt-contrib-cssmin": "~0.6.1"
},
"dependencies": {
"requirejs": "~2.1.8"
}
}
spec/MainSpec.js
View file @ d94fd7ca
This diff is collapsed.
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7