[MERGE]sync with trunk.

bzr revid: dka@tinyerp.com-20140328131834-1bhu74vaihxvp0sb
2014-03-28 18:48:34 +05:30
parent 9950cdde14 a224b88d80
commit 92875602b4
5667 changed files with 14914 additions and 22732 deletions
@@ -76,8 +76,8 @@ openerp.mail = function (session) {
         */
        get_text2html: function (text) {
            return text
-                .replace(/[\n\r]/g,'<br/>')
                .replace(/((?:https?|ftp):\/\/[\S]+)/g,'<a href="$1">$1</a> ')
+                .replace(/[\n\r]/g,'<br/>')                
        },

        /* Returns the complete domain with "&"