From: Alexander Ebert <ebert@woltlab.com>
Date: Sat, 21 Feb 2015 17:40:16 +0000 (+0100)
Subject: Preparing internal release 2.1.0 RC 2
X-Git-Tag: 2.1.0_RC_2~10
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=368caf635842410e45a765db714e938418bb7965;p=GitHub%2FWoltLab%2FWCF.git

Preparing internal release 2.1.0 RC 2
---

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index c4c11b0d64..d04f2b8398 100644
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -6,7 +6,7 @@
 		<packagedescription language="de"><![CDATA[Freies Web-Framework, das für komplexe Community-Anwendungen entworfen und entwickelt wurde.]]></packagedescription>
 		<isapplication>1</isapplication>
 		<version>2.1.0 RC 2</version> <!-- codename: typhoon -->
-		<date>2015-02-16</date>
+		<date>2015-02-21</date>
 	</packageinformation>
 	
 	<authorinformation>
@@ -43,7 +43,7 @@
 		<instruction type="script">acp/post_install.php</instruction>
 	</instructions>
 	
-	<instructions type="update" fromversion="2.0.10 pl 2">
+	<instructions type="update" fromversion="2.0.11">
 		<!-- pre-update check to prevent update from WCF < 2.0.10 -->
 		<instruction type="file">pre_update_check.tar</instruction>
 		<instruction type="script" run="standalone">acp/pre_update_com.woltlab.wcf_2.1.php</instruction>
@@ -91,6 +91,13 @@
 	
 	<instructions type="update" fromversion="2.1.0 RC 1">
 		<instruction type="file">files_update.tar</instruction>
+		<instruction type="template">templates_update.tar</instruction>
+		
 		<instruction type="script">acp/update_accessibleGroups_com.woltlab.wcf_2.1.0_rc_2.php</instruction>
+		
+		<instruction type="option">option.xml</instruction>
+		<instruction type="userGroupOption">userGroupOption.xml</instruction>
+		
+		<instruction type="language" run="standalone">language/*.xml</instruction>
 	</instructions>
 </package>
diff --git a/com.woltlab.wcf/update_2.1.0_rc_1.sql b/com.woltlab.wcf/update_2.1.0_rc_1.sql
deleted file mode 100644
index c23b98edb8..0000000000
--- a/com.woltlab.wcf/update_2.1.0_rc_1.sql
+++ /dev/null
@@ -1 +0,0 @@
-UPDATE wcf1_bbcode_media_provider SET regex = 'https?://vimeo\\.com/(?P<ID>\\d+)', html = '<iframe src="https://player.vimeo.com/video/{$ID}" width="400" height="225" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>' WHERE title = 'Vimeo';
\ No newline at end of file