Skip to content

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

Merge branch '0.6.x' 

Conflicts:
	converse.min.js
	docs/html/searchindex.js
parents 8713e2cc 7a3f0e92
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 25 deletions
CHANGES.rst
View file @ 1fa47c66
Changelog
=========
0.6.6 (2013-10-08)
0.6.6 (2013-10-16)
------------------
* Bugfix: Presence stanza must be sent out after roster has been initialized [jcbrand]
* Bugfix: Don't reconnect while still disconnecting, causes endless authentication loops. [jcbrand]
* Dutch translation [maartenkling]
0.6.5 (2013-10-08)
......
README.rst
View file @ 1fa47c66
......@@ -77,6 +77,12 @@ Licence
``Converse.js`` is released under both the MIT_ and GPL_ licenses.
------
Donate
------
Bitcoins: 16FsPqE9DhFTryxrUenpsGX4LJ1TPu8GqS
.. _Converse.js: http://conversejs.org
.. _strophe.js: http://strophe.im/strophejs
.. _backbone.js: http:/backbonejs.org
......
bower.json
View file @ 1fa47c66
{
"name": "converse",
"version": "0.6.5",
"version": "0.6.6",
"devDependencies": {
"jasmine": "https://github.com/jcbrand/jasmine.git#1_3_x"
},
......
build.js
View file @ 1fa47c66
......@@ -14,6 +14,7 @@
"fr": "locale/fr/LC_MESSAGES/fr",
"hu": "locale/hu/LC_MESSAGES/hu",
"it": "locale/it/LC_MESSAGES/it",
"nl": "locale/nl/LC_MESSAGES/nl",
"pt_BR": "locale/pt_BR/LC_MESSAGES/pt_BR",
"ru": "locale/ru/LC_MESSAGES/ru",
"jquery.tinysort": "components/tinysort/src/jquery.tinysort",
......
converse.min.js
View file @ 1fa47c66
This source diff could not be displayed because it is too large. You can view the blob instead.
docs/html/.buildinfo
View file @ 1fa47c66
# 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: 083755f35f9ab853ad615aefaae02f0e
config: 619e5f84e981950155ae238c5fc1fbf2
tags: fbb0d17656682115ca4d033fb2f83ba1
docs/html/genindex.html
View file @ 1fa47c66
......@@ -9,7 +9,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Index &mdash; Converse.js 0.6.5 documentation</title>
<title>Index &mdash; Converse.js 0.6.6 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.5',
VERSION: '0.6.6',
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.5 documentation" href="index.html" />
<link rel="top" title="Converse.js 0.6.6 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.5 documentation</a> &raquo;</li>
<li><a href="index.html">Converse.js 0.6.6 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.5 documentation</a> &raquo;</li>
<li><a href="index.html">Converse.js 0.6.6 documentation</a> &raquo;</li>
</ul>
</div>
</div>
......
docs/html/index.html
View file @ 1fa47c66
......@@ -7,7 +7,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Quickstart (to get a demo up and running) &mdash; Converse.js 0.6.5 documentation</title>
<title>Quickstart (to get a demo up and running) &mdash; Converse.js 0.6.6 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.5',
VERSION: '0.6.6',
COLLAPSE_INDEX: false,
FILE_SUFFIX: '.html',
HAS_SOURCE: true
......@@ -24,7 +24,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.5 documentation" href="#" />
<link rel="top" title="Converse.js 0.6.6 documentation" href="#" />
</head>
<body>
<div id="header_wrap" class="outer">
......@@ -49,7 +49,7 @@
<li class="right" style="margin-right: 10px">
<a href="genindex.html" title="General Index"
accesskey="I">index</a></li>
<li><a href="#">Converse.js 0.6.5 documentation</a> &raquo;</li>
<li><a href="#">Converse.js 0.6.6 documentation</a> &raquo;</li>
</ul>
</div>
<section id="main_content" class="inner">
......@@ -669,7 +669,7 @@ those hoops you had to jump through.</p>
<li class="right" style="margin-right: 10px">
<a href="genindex.html" title="General Index"
>index</a></li>
<li><a href="#">Converse.js 0.6.5 documentation</a> &raquo;</li>
<li><a href="#">Converse.js 0.6.6 documentation</a> &raquo;</li>
</ul>
</div>
</div>
......
docs/html/objects.inv
View file @ 1fa47c66
# Sphinx inventory version 2
# Project: Converse.js
# Version: 0.6.5
# Version: 0.6.6
# The remainder of this file is compressed using zlib.
xm
{"];
......
docs/html/search.html
View file @ 1fa47c66
......@@ -7,7 +7,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Search &mdash; Converse.js 0.6.5 documentation</title>
<title>Search &mdash; Converse.js 0.6.6 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.5',
VERSION: '0.6.6',
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.5 documentation" href="index.html" />
<link rel="top" title="Converse.js 0.6.6 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.5 documentation</a> &raquo;</li>
<li><a href="index.html">Converse.js 0.6.6 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.5 documentation</a> &raquo;</li>
<li><a href="index.html">Converse.js 0.6.6 documentation</a> &raquo;</li>
</ul>
</div>
</div>
......
docs/source/conf.py
View file @ 1fa47c66
......@@ -48,9 +48,9 @@ copyright = u'2013, JC Brand'
# built documents.
#
# The short X.Y version.
version = '0.6.5'
version = '0.6.6'
# The full version, including alpha/beta/rc tags.
release = '0.6.5'
release = '0.6.6'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
......
index.html
View file @ 1fa47c66
......@@ -19,8 +19,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.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>
<a class="zip_download_link" href="https://github.com/jcbrand/converse.js/archive/v0.6.6.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.6.tar.gz">Download the latest release as a tar.gz file</a>
</section>
</header>
</div>
......
package.json
View file @ 1fa47c66
{
"name": "converse.js",
"version": "0.6.5",
"version": "0.6.6",
"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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7