diff --git a/CHANGES.rst b/CHANGES.rst index 87d926635..dfd3b71ae 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -7,6 +7,11 @@ Changelog * Don't load OTR crypto if the browser doesn't have a CSRNG [jcbrand] * Don't break when crypto libraries aren't defined. [jcbrand] * Check if canvas is supported before trying to render the user avatar [jcbrand] +* Use newest strophe.muc plugin. Fixes #85 [jcbrand] + +.. note :: + If you are using the development libraries, you'll need to run ```bower update``` + to fetch the newest strophe.muc.plugin (for bugfix of #85). 0.7.0 (2013-11-13) ------------------ @@ -30,7 +35,7 @@ Features: * Simplified boilerplate markup [jcbrand] * New configuration settings, ``xhr_custom_status_url`` and ``xhr_user_search_url`` [jcbrand] -.. Note :: +.. note :: This release introduces a backward incompatible change. The boilerplate HTML needed in your webpage for converse.js to work has been reduced to a single div:
diff --git a/bower.json b/bower.json index 255ad6df8..d2207c3a8 100644 --- a/bower.json +++ b/bower.json @@ -17,7 +17,7 @@ "strophe.roster": "https://raw.github.com/jcbrand/strophejs-plugins/75c8693992bc357c699b6d615eeb396e799f5c02/roster/strophe.roster.js", "strophe.vcard": "https://raw.github.com/jcbrand/strophejs-plugins/75c8693992bc357c699b6d615eeb396e799f5c02/vcard/strophe.vcard.js", "strophe.disco": "https://raw.github.com/jcbrand/strophejs-plugins/75c8693992bc357c699b6d615eeb396e799f5c02/disco/strophe.disco.js", - "strophe.muc": "https://raw.github.com/jcbrand/strophejs-plugins/75c8693992bc357c699b6d615eeb396e799f5c02/muc/strophe.muc.js", + "strophe.muc": "https://raw.github.com/strophe/strophejs-plugins/02310ad1b8da2962cd05b0f4bceaecca134efed4/muc/strophe.muc.js", "otr": "0.2.7", "crypto-js": "~3.1.2", "almond": "~0.2.6" diff --git a/converse.min.js b/converse.min.js index fd04d481f..32846d4a7 100644 --- a/converse.min.js +++ b/converse.min.js @@ -160,4 +160,4 @@ in order to offer easy upgrades -- jsgettext.berlios.de * Dual licensed under the MIT and GPL Licenses */ -function hex_sha1(e){return binb2hex(core_sha1(str2binb(e),e.length*chrsz))}function b64_sha1(e){return binb2b64(core_sha1(str2binb(e),e.length*chrsz))}function str_sha1(e){return binb2str(core_sha1(str2binb(e),e.length*chrsz))}function hex_hmac_sha1(e,t){return binb2hex(core_hmac_sha1(e,t))}function b64_hmac_sha1(e,t){return binb2b64(core_hmac_sha1(e,t))}function str_hmac_sha1(e,t){return binb2str(core_hmac_sha1(e,t))}function sha1_vm_test(){return hex_sha1("abc")=="a9993e364706816aba3e25717850c26c9cd0d89d"}function core_sha1(e,t){e[t>>5]|=128<<24-t%32,e[(t+64>>9<<4)+15]=t;var n=new Array(80),r=1732584193,i=-271733879,s=-1732584194,o=271733878,u=-1009589776,a,f,l,c,h,p,d,v;for(a=0;at |