From 37111120ad058e429df997e636015a11fed62cc4 Mon Sep 17 00:00:00 2001 From: Alexander Ebert Date: Thu, 20 Mar 2014 16:08:28 +0100 Subject: [PATCH] Started development of WCF 2.1 --- CONTRIBUTING.md | 3 +++ README.md | 6 ++++-- com.woltlab.wcf/package.xml | 9 +-------- wcfsetup/install/files/lib/system/WCF.class.php | 2 +- wcfsetup/setup/db/install.sql | 4 ++-- 5 files changed, 11 insertions(+), 13 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b1e71ac8e7..21ac539f69 100644 --- 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 66b050da5d..d7a1358b86 100644 --- 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 ecadf109b2..8671eac875 100644 --- a/com.woltlab.wcf/package.xml +++ b/com.woltlab.wcf/package.xml @@ -5,7 +5,7 @@ 1 - 2.0.4 pl 1 + 2.1.0 Alpha 1 2014-03-20 @@ -42,11 +42,4 @@ aclOption.xml acp/post_install.php - - - files_update.tar - languages/* - smiley.xml - userOption.xml - diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php index 4862d374d4..07a8af2c06 100644 --- 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 fac6707b32..1648aa969b 100644 --- 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)'); -- 2.20.1