From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Mon, 11 Mar 2019 13:04:39 +0000 (+0100)
Subject: Merge branch 'next' into attachment-autoscale
X-Git-Tag: 5.2.0_Alpha_1~124^2~11
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c6e09a5e461ee7bde4a9b1c9fbb711a970640a93;p=GitHub%2FWoltLab%2FWCF.git

Merge branch 'next' into attachment-autoscale
---

c6e09a5e461ee7bde4a9b1c9fbb711a970640a93
diff --cc constants.php
index e9e482ee89,fad8369f12..ee4f6be08e
--- a/constants.php
+++ b/constants.php
@@@ -244,8 -244,16 +244,21 @@@ define('MESSAGE_SIDEBAR_ENABLE_ARTICLES
  define('IMAGE_PROXY_ENABLE_PRUNE', 1);
  define('SEARCH_ENABLE_PAGES', 1);
  define('SEARCH_ENABLE_ARTICLES', 1);
 +define("ATTACHMENT_IMAGE_AUTOSCALE", 1);
 +define("ATTACHMENT_IMAGE_AUTOSCALE_MAX_WIDTH", 1024);
 +define("ATTACHMENT_IMAGE_AUTOSCALE_MAX_HEIGHT", 1024);
 +define("ATTACHMENT_IMAGE_AUTOSCALE_FILE_TYPE", '');
 +define("ATTACHMENT_IMAGE_AUTOSCALE_QUALITY", 80);
+ define('LOG_MISSING_LANGUAGE_ITEMS', 0);
+ define('PRUNE_IP_ADDRESS', 30);
+ define('BREADCRUMBS_HOME_USE_PAGE_TITLE', 1);
+ define('CONTACT_FORM_ENABLE_ATTACHMENTS', 0);
+ define('CONTACT_FORM_PRUNE_ATTACHMENTS', 180);
+ define('IMAGE_EXTERNAL_SOURCE_WHITELIST', '');
+ define('SEARCH_MAX_COMBINED_TAGS', 3);
+ define('ENABLE_PRODUCTION_DEBUG_MODE', 0);
+ define('BLACKLIST_SFS_ENABLE', 1);
+ define('BLACKLIST_SFS_USERNAME', '90percentile');
+ define('BLACKLIST_SFS_EMAIL_ADDRESS', 'moreThanOnce');
+ define('BLACKLIST_SFS_IP_ADDRESS', '90percentile');
+ define('BLACKLIST_SFS_ACTION', 'disable');
diff --cc wcfsetup/install/files/js/require.config.js
index a806a75fd8,1986a37789..1af435138c
--- a/wcfsetup/install/files/js/require.config.js
+++ b/wcfsetup/install/files/js/require.config.js
@@@ -4,7 -4,7 +4,8 @@@ requirejs.config(
  		enquire: '3rdParty/enquire',
  		favico: '3rdParty/favico',
  		'perfect-scrollbar': '3rdParty/perfect-scrollbar',
- 		'Pica': '3rdParty/pica'
++		'Pica': '3rdParty/pica',
+ 		prism: '3rdParty/prism',
  	},
  	shim: {
  		enquire: { exports: 'enquire' },