Merge branch 'hotfix/3.5.26'

Author: leofeyer

assets/tinymce4/skins/contao/content.min.css

@@ -11,15 +11,18 @@
 	],
 	"require": {
 		"php": ">=5.4.0",
-		"leafo/scssphp": "~0.1",
-		"michelf/php-markdown": "~1.4",
+		"leafo/scssphp": "^0.6",
+		"michelf/php-markdown": "^1.4",
 		"matthiasmullie/minify": "^1.3.35",
-		"oyejorge/less.php": "~1.7",
-		"phpspec/php-diff": "~1.0",
-		"simplepie/simplepie": "~1.3",
-		"swiftmailer/swiftmailer": "^5.4.5",
-		"tecnickcom/tcpdf": "~6.0",
-		"true/punycode": "~1.0",
-		"contao-components/compass": "~0.12"
+		"oyejorge/less.php": "^1.7",
+		"phpspec/php-diff": "^1.0",
+		"simplepie/simplepie": "^1.3",
+		"swiftmailer/swiftmailer": "^5.4",
+		"tecnickcom/tcpdf": "^6.0",
+		"true/punycode": "^2.0",
+		"contao-components/compass": "^0.12"
+	},
+	"conflict": {
+		"swiftmailer/swiftmailer": "<5.4.5"
 	}
 }

composer.json

@@ -13,7 +13,7 @@
  * Core version
  */
 define('VERSION', '3.5');
-define('BUILD', '25');
+define('BUILD', '26');
 define('LONG_TERM_SUPPORT', true);
 
 

composer.lock

@@ -1,6 +1,46 @@
 Contao Open Source CMS changelog
 ================================
 
+Version 3.5.26 (2017-04-20)
+---------------------------
+
+### Fixed
+Prevent endless loops in the book navigation module (see #8665).
+
+### Fixed
+Limit the maximum size of dimensionless SVGs in the back end (see #8684).
+
+### Fixed
+Correctly handle custom namespaces when combining DCA files (see #8682).
+
+### Fixed
+Also check the X-Forwarded-Proto header when determining HTTPS (see #8691).
+
+### Fixed
+Correctly support 64 character template names everywhere (see #6819).
+
+### Updated
+Updated the Punycode library to version 2 (see #8693).
+
+### Fixed
+Correctly use the en dash in the calendar modules (see #8690).
+
+### Fixed
+Remove the UTF-8 BOM when combining files (see #8689).
+
+### Fixed
+Do not add the CORS headers in the install tool (see #8681).
+
+### Fixed
+Correctly move folders with an "@" in their name (see #8674).
+
+### Fixed
+Correctly redirect to the last page visited upon login (see #8632).
+
+### Fixed
+Back port the e-mail extraction improvements (see #8679).
+
+
 Version 3.5.25 (2017-03-20)
 ---------------------------