Preparing internal release 3.1.0 Alpha 2

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index 332d6f143ebcc0c60ee738bf3b4b77057399dde4..7c6626f0bde76889c8f98097e5d640d1f65ba201 100644 (file)
--- 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.1.0 Alpha 1</version> <!-- codename: tornado -->
-               <date>2017-08-03</date>
+               <version>3.1.0 Alpha 2</version> <!-- codename: tornado -->
+               <date>2017-08-31</date>
        </packageinformation>
        
        <authorinformation>
@@ -82,5 +82,22 @@
                <instruction type="packageInstallationPlugin" />
                <!-- new pip -->
                <instruction type="mediaProvider" />
+               
+               <instruction type="style">defaultStyle.tar</instruction>
+       </instructions>
+       
+       <instructions type="update" fromversion="3.1.0 Alpha 1">
+               <instruction type="acpTemplate">acptemplates_update.tar</instruction>
+               <instruction type="file">files_update.tar</instruction>
+               <instruction type="template">templates_update.tar</instruction>
+               
+               <instruction type="sql">update_3.1.0_alpha_1.sql</instruction>
+               
+               <instruction type="language" run="standalone" />
+               
+               <instruction type="eventListener" />
+               <instruction type="option" />
+               
+               <instruction type="style">defaultStyle.tar</instruction>
        </instructions>
 </package>

diff --git a/com.woltlab.wcf/update_3.1.0_alpha_1.sql b/com.woltlab.wcf/update_3.1.0_alpha_1.sql
new file mode 100644 (file)
index 0000000..583dddf
--- /dev/null
+++ b/com.woltlab.wcf/update_3.1.0_alpha_1.sql
@@ -0,0 +1,4 @@
+ALTER TABLE wcf1_style ADD COLUMN apiVersion ENUM('3.0', '3.1') NOT NULL DEFAULT '3.0';
+
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfContentContainerBackground', 'rgba(255, 255, 255, 1)');
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfContentContainerBorder', 'rgba(236, 241, 247, 1)');

diff --git a/com.woltlab.wcf/update_3.1_3.sql b/com.woltlab.wcf/update_3.1_3.sql
index 0b934662d5389b4db3ad3b8651ce1d2b24084334..cbd0b9eb034dddca70abb485a9240628811133c7 100644 (file)
--- a/com.woltlab.wcf/update_3.1_3.sql
+++ b/com.woltlab.wcf/update_3.1_3.sql
@@ -93,6 +93,8 @@ ALTER TABLE wcf1_user_trophy ADD FOREIGN KEY (userID) REFERENCES wcf1_user (user
 ALTER TABLE wcf1_user_special_trophy ADD FOREIGN KEY (userID) REFERENCES wcf1_user (userID) ON DELETE CASCADE;
 ALTER TABLE wcf1_user_special_trophy ADD FOREIGN KEY (trophyID) REFERENCES wcf1_trophy (trophyID) ON DELETE CASCADE;
 
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfContentContainerBackground', 'rgba(255, 255, 255, 1)');
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfContentContainerBorder', 'rgba(236, 241, 247, 1)');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfEditorButtonBackground', 'rgba(58, 109, 156, 1)');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfEditorButtonBackgroundActive', 'rgba(36, 66, 95, 1)');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('wcfEditorButtonText', 'rgba(255, 255, 255, 1)');

diff --git a/wcfsetup/install/files/acp/update_com.woltlab.wcf_3.1_addColumn.php b/wcfsetup/install/files/acp/update_com.woltlab.wcf_3.1_addColumn.php
index 1e795ecfbd223c07bebfaeae29681fe3513304ca..b5ed29811448ea8128582537444f7b27340f3e74 100644 (file)
--- a/wcfsetup/install/files/acp/update_com.woltlab.wcf_3.1_addColumn.php
+++ b/wcfsetup/install/files/acp/update_com.woltlab.wcf_3.1_addColumn.php
@@ -29,7 +29,7 @@ ALTER TABLE wcf1_modification_log ADD COLUMN hidden TINYINT(1) NOT NULL DEFAULT
 ALTER TABLE wcf1_package_update ADD COLUMN pluginStoreFileID INT(10) NOT NULL DEFAULT 0;
 ALTER TABLE wcf1_page ADD COLUMN cssClassName VARCHAR(255) NOT NULL DEFAULT '', ADD COLUMN availableDuringOfflineMode TINYINT(1) NOT NULL DEFAULT 0, ADD COLUMN allowSpidersToIndex TINYINT(1) NOT NULL DEFAULT 0, ADD COLUMN excludeFromLandingPage TINYINT(1) NOT NULL DEFAULT 0;
 ALTER TABLE wcf1_paid_subscription_user ADD COLUMN sentExpirationNotification TINYINT(1) NOT NULL DEFAULT 0;
-ALTER TABLE wcf1_style ADD COLUMN hasFavicon TINYINT(1) NOT NULL DEFAULT 0;
+ALTER TABLE wcf1_style ADD COLUMN hasFavicon TINYINT(1) NOT NULL DEFAULT 0, ADD COLUMN apiVersion ENUM('3.0', '3.1') NOT NULL DEFAULT '3.0';
 ALTER TABLE wcf1_user ADD COLUMN trophyPoints INT(10) NOT NULL DEFAULT 0;
 ALTER TABLE wcf1_user_rank ADD COLUMN hideTitle TINYINT(1) NOT NULL DEFAULT 0;
 DATA;

diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index a8879043f2e9da56c037557306198971369e2971..2d25440016350a6bb326b6bcbfb409c78de43d87 100644 (file)
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -47,7 +47,7 @@ if (!@ini_get('date.timezone')) {
 }
 
 // define current woltlab suite version
-define('WCF_VERSION', '3.1.0 Alpha 1');
+define('WCF_VERSION', '3.1.0 Alpha 2');
 
 // define current unix timestamp
 define('TIME_NOW', time());

diff --git a/wcfsetup/setup/db/install.sql b/wcfsetup/setup/db/install.sql
index 5eab3a60bbd51ef972dc8f9824233aaa3b5f0cdb..255b38ae81d8a159ac63e8605e7775d07e99a17d 100644 (file)
--- a/wcfsetup/setup/db/install.sql
+++ b/wcfsetup/setup/db/install.sql
@@ -1246,7 +1246,7 @@ CREATE TABLE wcf1_style (
        packageName VARCHAR(255) NOT NULL DEFAULT '',
        isTainted TINYINT(1) NOT NULL DEFAULT 0,
        hasFavicon TINYINT(1) NOT NULL DEFAULT 0,
-       apiVersion ENUM('3.0', '3.1') NOT NULL DEFAULT '3.1' 
+       apiVersion ENUM('3.0', '3.1') NOT NULL DEFAULT '3.0' 
 );
 
 DROP TABLE IF EXISTS wcf1_style_variable;