From: Alexander Ebert <ebert@woltlab.com>
Date: Tue, 21 Feb 2017 16:06:59 +0000 (+0100)
Subject: Initial commit for the 3.1 branch
X-Git-Tag: 3.1.0_Alpha_1~642
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=33c3bb4b2d4ece2464f84445a4a3a294bd667103;p=GitHub%2FWoltLab%2FWCF.git

Initial commit for the 3.1 branch
---

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index 85abe5adb0..3619d85f32 100644
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -5,8 +5,8 @@
 		<packagedescription>Free CMS and web-framework, designed for awesome websites and communities.</packagedescription>
 		<packagedescription language="de">Freies CMS und Web-Framework, das eindrucksvolle Websites und Communities ermöglicht.</packagedescription>
 		<isapplication>1</isapplication>
-		<version>3.0.2 pl 1</version> <!-- codename: vortex -->
-		<date>2017-02-16</date>
+		<version>3.1.0 Alpha 1</version> <!-- codename: tornado -->
+		<date>2017-02-21</date>
 	</packageinformation>
 	
 	<authorinformation>
@@ -42,57 +42,4 @@
 		<instruction type="box" />
 		<instruction type="script">acp/post_install.php</instruction>
 	</instructions>
-	
-	<instructions type="update" fromversion="2.1.12">
-		<instruction type="file">files_pre_update.tar</instruction>
-		<instruction type="script">acp/update_com.woltlab.wcf_3.0_pre_sql.php</instruction>
-		<instruction type="sql">update_part1.sql</instruction>
-		
-		<instruction type="script" run="standalone" flushCache="false">acp/update_com.woltlab.wcf_3.0_noop.php</instruction>
-		
-		<instruction type="file">files.tar</instruction>
-		<instruction type="script" flushCache="false">acp/update_com.woltlab.wcf_3.0_appConfig.php</instruction>
-		
-		<instruction type="script" run="standalone" flushCache="false">acp/update_com.woltlab.wcf_3.0_columnLength.php</instruction>
-		<instruction type="sql" run="standalone">update_1.sql</instruction>
-		<instruction type="sql" run="standalone">update_2.sql</instruction>
-		<instruction type="script" run="standalone" flushCache="false">acp/update_com.woltlab.wcf_3.0_dropColumns.php</instruction>
-		<instruction type="sql" run="standalone">update_3.sql</instruction>
-		<instruction type="sql" run="standalone">update_4.sql</instruction>
-		<instruction type="sql" run="standalone">update_5.sql</instruction>
-		
-		<instruction type="acpTemplate">acptemplates.tar</instruction>
-		<instruction type="template">templates.tar</instruction>
-		<instruction type="language" run="standalone">language/*.xml</instruction>
-		
-		<instruction type="packageInstallationPlugin">packageInstallationPlugin.xml</instruction>
-		<instruction type="objectTypeDefinition">objectTypeDefinition.xml</instruction>
-		<instruction type="objectType">objectType.xml</instruction>
-		<instruction type="aclOption">aclOption.xml</instruction>
-		<instruction type="acpMenu">acpMenu.xml</instruction>
-		<instruction type="acpSearchProvider">acpSearchProvider.xml</instruction>
-		<instruction type="bbcode">bbcode.xml</instruction>
-		<instruction type="clipboardAction">clipboardAction.xml</instruction>
-		<instruction type="coreObject">coreObject.xml</instruction>
-		<instruction type="cronjob">cronjob.xml</instruction>
-		<instruction type="eventListener">eventListener.xml</instruction>
-		<instruction type="option">option.xml</instruction>
-		<instruction type="smiley">smiley.xml</instruction>
-		<instruction type="userGroupOption">userGroupOption.xml</instruction>
-		<instruction type="userNotificationEvent">userNotificationEvent.xml</instruction>
-		<instruction type="userOption">userOption.xml</instruction>
-		
-		<instruction type="page">page.xml</instruction>
-		<instruction type="menu">menu.xml</instruction>
-		<instruction type="menuItem">menuItem.xml</instruction>
-		<instruction type="box">box.xml</instruction>
-		
-		<instruction type="style">defaultStyle.tar</instruction>
-		
-		<instruction type="script">acp/update_com.woltlab.wcf_3.0_post_sql.php</instruction>
-	</instructions>
-	
-	<instructions type="update" fromversion="3.0.2">
-		<instruction type="file">files_update.tar</instruction>
-	</instructions>
 </package>
diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index ae5acb94b7..dc83cee441 100644
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -46,7 +46,7 @@ if (!@ini_get('date.timezone')) {
 }
 
 // define current woltlab suite version
-define('WCF_VERSION', '3.0.2 pl 1');
+define('WCF_VERSION', '3.1.0 Alpha 1');
 
 // define current unix timestamp
 define('TIME_NOW', time());