Merge branch 'master' into groups

Conflicts:
	converse.js

Makefile

@@ -75,7 +75,6 @@ stamp-bower: stamp-npm bower.json
 clean::
 	rm -f stamp-npm stamp-bower
 	rm -rf node_modules components
-	-rm -rf $(BUILDDIR)/*
 
 dev: clean
 	npm install

converse.js

@@ -104,7 +104,7 @@
             if ($.browser.webkit) {
                 var conversejs = document.getElementById('conversejs');
                 conversejs.style.display = 'none';
-                conversejs.offsetHeight = conversejs.offsetHeight; // no need to store this anywhere, the reference is enough
+                conversejs.style.height = conversejs.offsetHeight;
                 conversejs.style.display = 'block';
             }
         }

docs/CHANGES.rst

@@ -6,11 +6,10 @@ Changelog
 
 .. note::
     1. Converse.js is now relicensed under the `Mozilla Public License <http://www.mozilla.org/MPL/2.0/>`_.
-    2. Configuration options for the chat toolbar have changed.
-       Please refer to the `relevant documentation <http://devbox:8890/docs/html/index.html#visible-toolbar-buttons>`_.
-    3. This release drops support for IE8.
+    2. Configuration options for the chat toolbar have changed. Please refer to the `relevant documentation <http://devbox:8890/docs/html/index.html#visible-toolbar-buttons>`_.
+    3. This release has reduced support for IE8 (some features won't work).
+    4. Events have been renamed to remove "on" prefix (sorry for any inconvenience).
 
-* Events have been renamed to remove "on" prefix (which is redundant when used with 'on' method). [jcbrand]
 * Simplified Chinese Translations [Lancelot]
 * No initial HTML markup is now needed in the document body for converse.js to work. [jcbrand]
 * All date handling is now done with moment.js. [jcbrand]
@@ -29,6 +28,8 @@ Changelog
 * #180 RID and SID undefined [g8g3]
 * #191 No messages history [heban]
 * #192 Error: xhr_user_search_url is not defined. [jcbrand]
+* #196 [Safari v7.0.5] TypeError: Attempted to assign to readonly property. [g8g3]
+
 
 0.7.4 (2014-03-05)
 ------------------

docs/source/index.rst

@@ -407,11 +407,18 @@ directory:
 
     make dev
 
+Or alternatively, if you don't have GNU Make:
+
+::
+
+    npm install
+    bower update
+
 This will first install the Node.js development tools (like Grunt and Bower)
 and then use Bower to install all of Converse.js's front-end dependencies.
 
 The front-end dependencies are those javascript files on which
-Converse.js directly depends and which will therefore be loaded in the browser.
+Converse.js directly depends and which will be loaded in the browser.
 
 If you are curious to know what the different dependencies are:
 
@@ -428,7 +435,7 @@ If you are curious to know what the different dependencies are:
     which contains all the front-end dependencies of Converse.js.
     If this directory does NOT exist, something must have gone wrong.
     Double-check the output of ```make dev``` to see if there are any errors
-    listed.
+    listed. For support, you can write to the mailing list: conversejs@librelist.com
 
 
 With AMD and require.js (recommended)