Commit 90be11ae authored by JC Brand's avatar JC Brand

New release: 0.6.5.

Bumped version
Updated release date in CHANGES.rst
Minified CSS and JS
Generate HTML docs
parent a01d5102
Changelog Changelog
========= =========
0.6.5 (Unreleased) 0.6.5 (2013-10-08)
------------------ ------------------
* Fetch vCards asynchronously once a roster contact is added [jcbrand] * Fetch vCards asynchronously once a roster contact is added [jcbrand]
......
...@@ -40,7 +40,7 @@ pot: ...@@ -40,7 +40,7 @@ pot:
merge: merge:
find ./locale -maxdepth 1 -mindepth 1 -type d -exec msgmerge {}/LC_MESSAGES/converse.po ./locale/converse.pot -U \; 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)\"/ bower.json
sed -i s/\"version\":\ \"[0-9]\.[0-9]\.[0-9]\"/\"version\":\ \"$(VERSION)\"/ package.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 sed -i s/v[0-9]\.[0-9]\.[0-9]\.zip/v$(VERSION)\.zip/ index.html
...@@ -48,9 +48,7 @@ bump: ...@@ -48,9 +48,7 @@ bump:
sed -i s/version\ =\ \'[0-9]\.[0-9]\.[0-9]\'/version\ =\ \'$(VERSION)\'/ docs/source/conf.py 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/release\ =\ \'[0-9]\.[0-9]\.[0-9]\'/release\ =\ \'$(VERSION)\'/ docs/source/conf.py
sed -i "s/(Unreleased)/(`date +%Y-%m-%d`)/" CHANGES.rst sed -i "s/(Unreleased)/(`date +%Y-%m-%d`)/" CHANGES.rst
grunt minify
release:
r.js -o build.js && grunt cssmin
clean: clean:
-rm -rf $(BUILDDIR)/* -rm -rf $(BUILDDIR)/*
......
{ {
"name": "converse", "name": "converse",
"version": "0.6.4", "version": "0.6.5",
"devDependencies": { "devDependencies": {
"jasmine": "https://github.com/jcbrand/jasmine.git#1_3_x" "jasmine": "https://github.com/jcbrand/jasmine.git#1_3_x"
}, },
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
# Sphinx build info version 1 # 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. # 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 tags: fbb0d17656682115ca4d033fb2f83ba1
...@@ -465,17 +465,35 @@ JS file so that it will include the new settings. Please refer to the ...@@ -465,17 +465,35 @@ JS file so that it will include the new settings. Please refer to the
Configuration variables 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 animate
------- -------
Default = True Default = ``true``
Show animations, for example when opening and closing chat boxes. Show animations, for example when opening and closing chat boxes.
auto_list_rooms auto_list_rooms
--------------- ---------------
Default = False Default = ``false``
If true, and the XMPP server on which the current user is logged in supports 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. 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. ...@@ -489,7 +507,7 @@ option will create lots of extra connection traffic.
auto_subscribe auto_subscribe
-------------- --------------
Default = False Default = ``false``
If true, the user will automatically subscribe back to any contact requests. 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 ...@@ -504,6 +522,8 @@ See `here <http://metajack.im/2008/09/08/which-bosh-server-do-you-need>`_ for mo
debug debug
----- -----
Default = ``false``
If set to true, debugging output will be logged to the browser console. If set to true, debugging output will be logged to the browser console.
fullname fullname
...@@ -515,7 +535,7 @@ logged in user, otherwise the user's vCard will be fetched. ...@@ -515,7 +535,7 @@ logged in user, otherwise the user's vCard will be fetched.
hide_muc_server hide_muc_server
--------------- ---------------
Default = false Default = ``false``
Hide the ``server`` input field of the form inside the ``Room`` panel of the 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 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 ...@@ -530,7 +550,7 @@ Specify the locale/language. The language must be in the ``locales`` object. Ref
prebind prebind
-------- --------
Default = false Default = ``false``
Use this option when you want to attach to an existing XMPP connection that was Use this option when you want to attach to an existing XMPP connection that was
already authenticated (usually on the backend before page load). already authenticated (usually on the backend before page load).
...@@ -550,7 +570,7 @@ Additionally, you have to specify ``bosh_service_url``. ...@@ -550,7 +570,7 @@ Additionally, you have to specify ``bosh_service_url``.
show_controlbox_by_default show_controlbox_by_default
-------------------------- --------------------------
Default = false Default = ``false``
The "controlbox" refers to the special chatbox containing your contacts roster, The "controlbox" refers to the special chatbox containing your contacts roster,
status widget, chatrooms and other controls. status widget, chatrooms and other controls.
...@@ -561,11 +581,18 @@ the page with class *toggle-online-users*. ...@@ -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 If this options is set to true, the controlbox will by default be shown upon
page load. 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 xhr_user_search
--------------- ---------------
Default = False Default = ``false``
There are two ways to add users. There are two ways to add users.
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <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/stylesheet.css" type="text/css" />
<link rel="stylesheet" href="_static/pygments.css" type="text/css" /> <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<script type="text/javascript"> <script type="text/javascript">
var DOCUMENTATION_OPTIONS = { var DOCUMENTATION_OPTIONS = {
URL_ROOT: '', URL_ROOT: '',
VERSION: '0.6.4', VERSION: '0.6.5',
COLLAPSE_INDEX: false, COLLAPSE_INDEX: false,
FILE_SUFFIX: '.html', FILE_SUFFIX: '.html',
HAS_SOURCE: true HAS_SOURCE: true
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<script type="text/javascript" src="_static/jquery.js"></script> <script type="text/javascript" src="_static/jquery.js"></script>
<script type="text/javascript" src="_static/underscore.js"></script> <script type="text/javascript" src="_static/underscore.js"></script>
<script type="text/javascript" src="_static/doctools.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> </head>
<body> <body>
<div id="header_wrap" class="outer"> <div id="header_wrap" class="outer">
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
<li class="right" style="margin-right: 10px"> <li class="right" style="margin-right: 10px">
<a href="#" title="General Index" <a href="#" title="General Index"
accesskey="I">index</a></li> 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> </ul>
</div> </div>
<section id="main_content" class="inner"> <section id="main_content" class="inner">
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
<li class="right" style="margin-right: 10px"> <li class="right" style="margin-right: 10px">
<a href="#" title="General Index" <a href="#" title="General Index"
>index</a></li> >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> </ul>
</div> </div>
</div> </div>
......
This diff is collapsed.
# Sphinx inventory version 2 # Sphinx inventory version 2
# Project: Converse.js # Project: Converse.js
# Version: 0.6.4 # Version: 0.6.5
# The remainder of this file is compressed using zlib. # The remainder of this file is compressed using zlib.
xm xm
{"]; {"];
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <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/stylesheet.css" type="text/css" />
<link rel="stylesheet" href="_static/pygments.css" type="text/css" /> <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<script type="text/javascript"> <script type="text/javascript">
var DOCUMENTATION_OPTIONS = { var DOCUMENTATION_OPTIONS = {
URL_ROOT: '', URL_ROOT: '',
VERSION: '0.6.4', VERSION: '0.6.5',
COLLAPSE_INDEX: false, COLLAPSE_INDEX: false,
FILE_SUFFIX: '.html', FILE_SUFFIX: '.html',
HAS_SOURCE: true HAS_SOURCE: true
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<script type="text/javascript" src="_static/underscore.js"></script> <script type="text/javascript" src="_static/underscore.js"></script>
<script type="text/javascript" src="_static/doctools.js"></script> <script type="text/javascript" src="_static/doctools.js"></script>
<script type="text/javascript" src="_static/searchtools.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"> <script type="text/javascript">
jQuery(function() { Search.loadIndex("searchindex.js"); }); jQuery(function() { Search.loadIndex("searchindex.js"); });
</script> </script>
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
<li class="right" style="margin-right: 10px"> <li class="right" style="margin-right: 10px">
<a href="genindex.html" title="General Index" <a href="genindex.html" title="General Index"
accesskey="I">index</a></li> 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> </ul>
</div> </div>
<section id="main_content" class="inner"> <section id="main_content" class="inner">
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
<li class="right" style="margin-right: 10px"> <li class="right" style="margin-right: 10px">
<a href="genindex.html" title="General Index" <a href="genindex.html" title="General Index"
>index</a></li> >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> </ul>
</div> </div>
</div> </div>
......
This diff is collapsed.
...@@ -48,9 +48,9 @@ copyright = u'2013, JC Brand' ...@@ -48,9 +48,9 @@ copyright = u'2013, JC Brand'
# built documents. # built documents.
# #
# The short X.Y version. # The short X.Y version.
version = '0.6.4' version = '0.6.5'
# The full version, including alpha/beta/rc tags. # 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 # The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages. # for a list of supported languages.
......
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
<h1 id="project_title"><a href="http://conversejs.org">Converse.js</a></h1> <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> <h2 id="project_tagline">An XMPP chat client for your website</h2>
<section id="downloads"> <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="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.4.tar.gz">Download the latest release as a tar.gz 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> </section>
</header> </header>
</div> </div>
......
...@@ -167,7 +167,7 @@ ...@@ -167,7 +167,7 @@
<dd class="available-chatroom"> <dd class="available-chatroom">
<a class="open-room" <a class="open-room"
data-room-jid="converse.js@conference.opkode.im" 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" <a class="room-info icon-room-info"
data-room-jid="converse.js@conference.opkode.im" data-room-jid="converse.js@conference.opkode.im"
title="Show more information on this room" href="#">&nbsp;</a> title="Show more information on this room" href="#">&nbsp;</a>
......
{ {
"name": "converse.js", "name": "converse.js",
"version": "0.6.4", "version": "0.6.5",
"description": "Browser based XMPP instant messaging client", "description": "Browser based XMPP instant messaging client",
"main": "main.js", "main": "main.js",
"directories": { "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