Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  DE strings, correction of a typo
  diabok-themes: fixed bug in green-wide and dark-wide
  diabook-themes: small fix in nets_aside, group_aside and delete obsolete .tpls in subfolders
  diabook-themes: bugfix in admin-section
  allow bbcode representation of html symbols such as © by wrapping in bb brackets
  protect jappixmini/proxy from typo check, more work on email2 connector

* master:

1 files changed, 0 insertions, 46 deletions

diff --git a/view/theme/diabook/diabook-green/js/jquery.autogrow.textarea.js b/view/theme/diabook/diabook-green/js/jquery.autogrow.textarea.js
deleted file mode 100644
index 806e34f51..000000000
--- a/view/theme/diabook/diabook-green/js/jquery.autogrow.textarea.js
+++ /dev/null
@@ -1,46 +0,0 @@
-(function($) {
-
-    /*
-     * Auto-growing textareas; technique ripped from Facebook
-     */
-    $.fn.autogrow = function(options) {
-        
-        this.filter('textarea').each(function() {
-            
-            var $this       = $(this),
-                minHeight   = $this.height(),
-                lineHeight  = $this.css('lineHeight');
-            
-            var shadow = $('<div></div>').css({
-                position:   'absolute',
-                top:        -10000,
-                left:       -10000,
-                width:      $(this).width(),
-                fontSize:   $this.css('fontSize'),
-                fontFamily: $this.css('fontFamily'),
-                lineHeight: $this.css('lineHeight'),
-                resize:     'none'
-            }).appendTo(document.body);
-            
-            var update = function() {
-                
-                var val = this.value.replace(/</g, '&lt;')
-                                    .replace(/>/g, '&gt;')
-                                    .replace(/&/g, '&amp;')
-                                    .replace(/\n/g, '<br/>');
-                
-                shadow.html(val);
-                $(this).css('height', Math.max(shadow.height() + 20, minHeight));
-            }
-            
-            $(this).change(update).keyup(update).keydown(update);
-            
-            update.apply(this);
-            
-        });
-        
-        return this;
-        
-    }
-    
-})(jQuery);
\ No newline at end of file