Home Explore Help
Register Sign In
im-changing.ru
/
converse.js
mirror of https://github.com/conversejs/converse.js.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Merge branch '0.6.x'

Conflicts:
	converse.min.js
	docs/html/searchindex.js
JC Brand 11 years ago
parent
8713e2cc7a 7a3f0e92f4
commit
1fa47c6633
13 changed files with 32 additions and 24 deletions
Split View Show Diff Stats
  1. 2 1
      CHANGES.rst
  2. 6 0
      README.rst
  3. 1 1
      bower.json
  4. 1 0
      build.js
  5. 0 0
      converse.min.js
  6. 1 1
      docs/html/.buildinfo
  7. 5 5
      docs/html/genindex.html
  8. 5 5
      docs/html/index.html
  9. 1 1
      docs/html/objects.inv
  10. 5 5
      docs/html/search.html
  11. 2 2
      docs/source/conf.py
  12. 2 2
      index.html
  13. 1 1
      package.json

+ 2 - 1
CHANGES.rst
View File 

@@ -1,10 +1,11 @@
 
 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)

+ 6 - 0
README.rst
View File 

@@ -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

+ 1 - 1
bower.json
View File 

@@ -1,6 +1,6 @@
 
 {
 
   "name": "converse",
 
-  "version": "0.6.5",
 
+  "version": "0.6.6",
 
   "devDependencies": {
 
     "jasmine": "https://github.com/jcbrand/jasmine.git#1_3_x"
 
   },

+ 1 - 0
build.js
View File 

@@ -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",

File diff suppressed because it is too large
+ 0 - 0
converse.min.js


+ 1 - 1
docs/html/.buildinfo
View File 

@@ -1,4 +1,4 @@
 
 # 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

+ 5 - 5
docs/html/genindex.html
View File 

@@ -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>

+ 5 - 5
docs/html/index.html
View File 

@@ -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>

+ 1 - 1
docs/html/objects.inv
View File 

@@ -1,6 +1,6 @@
 
 # Sphinx inventory version 2
 
 # Project: Converse.js
 
-# Version: 0.6.5
 
+# Version: 0.6.6
 
 # The remainder of this file is compressed using zlib.
 
 xÚmÎÁ
 
 à à{Ÿ"°³ƒ]÷;

+ 5 - 5
docs/html/search.html
View File 

@@ -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>

+ 2 - 2
docs/source/conf.py
View File 

@@ -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.

+ 2 - 2
index.html
View File 

@@ -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>

+ 1 - 1
package.json
View File 

@@ -1,6 +1,6 @@
 
 {
 
   "name": "converse.js",
 
-  "version": "0.6.5",
 
+  "version": "0.6.6",
 
   "description": "Browser based XMPP instant messaging client",
 
   "main": "main.js",
 
   "directories": {

Some files were not shown because too many files changed in this diff