Started development of WCF 2.1

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b1e71ac8e7c6a6e9419cedfbec3d6b83b1c3d9cd..21ac539f696f1fabae6faa4f944dbc854349ca8c 100644 (file)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -3,8 +3,11 @@ CONTRIBUTING
 
 First of all: Thanks for your interest in contributing to WoltLab Community Framework! However, you have to meet some requirements in order to get your changes accepted.
 
+**Notice:** This is the unstable development tree of WCF, if you wish to submit pull requests for WCF 2.0.x, please select the branch "2.0". 
+
 General requirements
 --------------------
+- **API changes are undesirable**, we want to maintain full backwards compatibility to WCF 2.0.x
 - Testing is the key, you MUST try out your changes before submitting pull requests. It saves us and yourself a lot of time.
 - The code SHOULD be written by yourself, otherwise you have to check the license beforehand with regard to compatibility and give the proper credit to the original author.
 

diff --git a/README.md b/README.md
index 66b050da5d4d6603a50db0e41e549e017a9819c0..d7a1358b8600db7bbc5acfcd88c34d7ffcf4219b 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-WoltLab Community Framework 2.0
+WoltLab Community Framework 2.1
 ===============================
 
 WoltLab Community Framework is a free web-framework, designed and developed for complex community applications. The framework applies the latest and most modern technologies, it is structured completly object-oriented, constantly enhanced and forms the base for all WoltLab products.
@@ -6,7 +6,9 @@ WoltLab Community Framework is a free web-framework, designed and developed for
 Version notes
 -------------
 
-This is the stable tree of WCF, changes will be rejected unless they fix an existing issue without changing the API.
+This is the **unstable development** tree of WCF! You SHOULD NOT use it in an production environment.
+
+If you wish to access the **stable WCF 2.0.x** branch, please see here: [WCF 2.0.x](https://github.com/WoltLab/WCF/tree/2.0)
 
 Contribution
 ------------

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index ecadf109b286489e454cece673bbcd85d85e44bb..8671eac875b770b9e453f051965b686dcb443559 100644 (file)
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -5,7 +5,7 @@
                <packagedescription><![CDATA[Free web-framework, designed and developed for complex community applications.]]></packagedescription>
                <packagedescription language="de"><![CDATA[Freies Web-Framework, das für komplexe Community-Anwendungen entworfen und entwickelt wurde.]]></packagedescription>
                <isapplication>1</isapplication>
-               <version>2.0.4 pl 1</version> <!-- codename: maelstrom -->
+               <version>2.1.0 Alpha 1</version> <!-- codename: typhoon -->
                <date>2014-03-20</date>
        </packageinformation>
        
@@ -42,11 +42,4 @@
                <instruction type="aclOption">aclOption.xml</instruction>
                <instruction type="script">acp/post_install.php</instruction>
        </instructions>
-       
-       <instructions type="update" fromversion="2.0.4">
-               <instruction type="file">files_update.tar</instruction>
-               <instruction type="language">languages/*</instruction>
-               <instruction type="smiley">smiley.xml</instruction>
-               <instruction type="userOption">userOption.xml</instruction>
-       </instructions>
 </package>

diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index 4862d374d48fe80060b163cb3253c2b305388899..07a8af2c064e842cd804b61d7280559df189335a 100644 (file)
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -37,7 +37,7 @@ if (!@ini_get('date.timezone')) {
 }
 
 // define current wcf version
-define('WCF_VERSION', '2.0.4 pl 1 (Maelstrom)');
+define('WCF_VERSION', '2.1.0 Alpha 1 (Maelstrom)');
 
 // define current unix timestamp
 define('TIME_NOW', time());

diff --git a/wcfsetup/setup/db/install.sql b/wcfsetup/setup/db/install.sql
index fac6707b32802c3bb3b08c22550b8366e48b39be..1648aa969b5361fb86186836bce8aeecceaf93b6 100644 (file)
--- a/wcfsetup/setup/db/install.sql
+++ b/wcfsetup/setup/db/install.sql
@@ -1569,8 +1569,8 @@ INSERT INTO wcf1_user_group_option_value (groupID, optionID, optionValue) VALUES
 INSERT INTO wcf1_user_group_option_value (groupID, optionID, optionValue) VALUES (4, 3, '1');  -- Administrators
 
 -- default update servers
-INSERT INTO wcf1_package_update_server (serverURL, status, isDisabled, errorMessage, lastUpdateTime, loginUsername, loginPassword) VALUES ('http://update.woltlab.com/maelstrom/', 'online', 0, NULL, 0, '', '');
-INSERT INTO wcf1_package_update_server (serverURL, status, isDisabled, errorMessage, lastUpdateTime, loginUsername, loginPassword) VALUES ('http://store.woltlab.com/maelstrom/', 'online', 0, NULL, 0, '', '');
+INSERT INTO wcf1_package_update_server (serverURL, status, isDisabled, errorMessage, lastUpdateTime, loginUsername, loginPassword) VALUES ('http://update.woltlab.com/typhoon/', 'online', 0, NULL, 0, '', '');
+INSERT INTO wcf1_package_update_server (serverURL, status, isDisabled, errorMessage, lastUpdateTime, loginUsername, loginPassword) VALUES ('http://store.woltlab.com/typhoon/', 'online', 0, NULL, 0, '', '');
 
 -- style default values
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfContentBackgroundColor', 'rgba(255, 255, 255, 1)');