From e18150abf4ac8e73f0dbea93a6f1abfa49053692 Mon Sep 17 00:00:00 2001 From: Alexander Ebert Date: Thu, 31 Aug 2017 15:00:44 +0200 Subject: [PATCH] Preparing internal release 3.1.0 Alpha 2 --- com.woltlab.wcf/package.xml | 21 +++++++++++++++++-- com.woltlab.wcf/update_3.1.0_alpha_1.sql | 4 ++++ com.woltlab.wcf/update_3.1_3.sql | 2 ++ .../update_com.woltlab.wcf_3.1_addColumn.php | 2 +- .../install/files/lib/system/WCF.class.php | 2 +- wcfsetup/setup/db/install.sql | 2 +- 6 files changed, 28 insertions(+), 5 deletions(-) create mode 100644 com.woltlab.wcf/update_3.1.0_alpha_1.sql diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml index 332d6f143e..7c6626f0bd 100644 --- a/com.woltlab.wcf/package.xml +++ b/com.woltlab.wcf/package.xml @@ -5,8 +5,8 @@ Free CMS and web-framework, designed for awesome websites and communities. Freies CMS und Web-Framework, das eindrucksvolle Websites und Communities ermöglicht. 1 - 3.1.0 Alpha 1 - 2017-08-03 + 3.1.0 Alpha 2 + 2017-08-31 @@ -82,5 +82,22 @@ + + defaultStyle.tar + + + + acptemplates_update.tar + files_update.tar + templates_update.tar + + update_3.1.0_alpha_1.sql + + + + + + + defaultStyle.tar 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 index 0000000000..583dddfa9b --- /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 0b934662d5..cbd0b9eb03 100644 --- 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 1e795ecfbd..b5ed298114 100644 --- 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 a8879043f2..2d25440016 100644 --- 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 5eab3a60bb..255b38ae81 100644 --- 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; -- 2.20.1