Merge branch 'master' into delete-own-comments

Conflicts: CHANGES.rst
2015-01-29 21:14:05 +01:00
parent 06b20b8f81 0591f9ad2d
commit c852609111
20 changed files with 355 additions and 237 deletions
@@ -48,7 +48,7 @@
        /* Fetch the reply form inside the reply div */
        var reply_form = reply_div.find("form");

-        /* Change the id of the textarea of the reply form 
+        /* Change the id of the textarea of the reply form
         * To avoid conflict later between textareas with same id 'form-widgets-comment-text' while implementing a seperate instance of TinyMCE
         * */
        reply_form.find('#formfield-form-widgets-comment-text').attr('id', 'formfield-form-widgets-new-textarea'+comment_id );