Merge remote-tracking branch 'refs/remotes/origin/3.0'

# Conflicts:
#	wcfsetup/install/files/js/3rdParty/redactor2/plugins/combined.min.js
#	wcfsetup/install/files/js/WCF.Combined.min.js
#	wcfsetup/install/files/js/WoltLabSuite.Core.min.js

diff --cc wcfsetup/install/files/js/WCF.js
Simple merge

diff --cc wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Dialog.js
index 5fa0d62512bf69bcb6fd1b14ba98721942f79429,7d0a26ea01713768cb4a97b39029cb1543063af9..9c4777563995d117894b68c026efc398fdf65fe0
--- 1/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Dialog.js
--- 2/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Dialog.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Dialog.js
@@@ -25,15 -23,12 +25,16 @@@ define
        var _activeDialog = null;
        var _container = null;
        var _dialogs = new Dictionary();
 -      var _dialogObjects = new ObjectMap();
        var _dialogFullHeight = false;
 +      var _dialogObjects = new ObjectMap();
 +      var _dialogToObject = new Dictionary();
        var _keyupListener = null;
        var _staticDialogs = elByClass('jsStaticDialog');
+       var _validCallbacks = ['onBeforeClose', 'onClose', 'onShow'];
        
 +      // list of supported `input[type]` values for dialog submit
 +      var _validInputTypes = ['number', 'password', 'search', 'tel', 'text', 'url'];
 +      
        /**
         * @exports     WoltLabSuite/Core/Ui/Dialog
         */