From: Alexander Ebert Date: Wed, 29 May 2013 13:25:40 +0000 (+0200) Subject: Preparing release 2.0.0 Beta 1 X-Git-Tag: 2.0.0_Beta_1~1 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7e57d1130004361507ea09f9b7268929df3b1f20;p=GitHub%2FWoltLab%2FWCF.git Preparing release 2.0.0 Beta 1 --- diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml index fb64e668f1..3b4edcda28 100644 --- a/com.woltlab.wcf/package.xml +++ b/com.woltlab.wcf/package.xml @@ -6,7 +6,7 @@ 1 2.0.0 Beta 1 - 2013-05-18 + 2013-05-29 @@ -41,27 +41,4 @@ aclOption.xml acp/post_install.php - - - update_b1.sql - acp/update_4.0.0_b1.php - update_post_b1.sql - - acptemplates_update.tar - template.tar - - acpMenu.xml - bbcode.xml - clipboardAction.xml - cronjob.xml - coreObject.xml - eventListener.xml - language/*.xml - objectType.xml - option.xml - userGroupOption.xml - userNotificationEvent.xml - userOption.xml - userProfileMenu.xml - diff --git a/com.woltlab.wcf/update_b1.sql b/com.woltlab.wcf/update_b1.sql deleted file mode 100644 index 31785dace4..0000000000 --- a/com.woltlab.wcf/update_b1.sql +++ /dev/null @@ -1,51 +0,0 @@ -ALTER TABLE wcf1_acp_template ADD COLUMN application VARCHAR(255) NOT NULL; - -ALTER TABLE wcf1_package_installation_file_log ADD COLUMN application VARCHAR(255) NOT NULL; - -ALTER TABLE wcf1_template DROP COLUMN obsolete; -ALTER TABLE wcf1_template ADD COLUMN application VARCHAR(255) NOT NULL; -ALTER TABLE wcf1_template ADD COLUMN lastModificationTime INT(10) NOT NULL DEFAULT 0; - -ALTER TABLE wcf1_template_group CHANGE parentTemplateGroupID parentTemplateGroupID INT(10) NULL; -ALTER TABLE wcf1_template_group ADD FOREIGN KEY (parentTemplateGroupID) REFERENCES wcf1_template_group (templateGroupID) ON DELETE SET NULL; - -ALTER TABLE wcf1_smiley CHANGE COLUMN smileyCategoryID categoryID INT(10) NULL; -ALTER TABLE wcf1_smiley CHANGE COLUMN aliases aliases TEXT; -ALTER TABLE wcf1_smiley CHANGE COLUMN showOrder showOrder INT(10) NOT NULL DEFAULT 0; -ALTER TABLE wcf1_smiley ADD FOREIGN KEY (categoryID) REFERENCES wcf1_category (categoryID) ON DELETE SET NULL; - -DELETE FROM wcf1_bbcode_media_provider; - --- media providers --- Videos - -- Youtube - INSERT INTO wcf1_bbcode_media_provider (title, regex, html) VALUES ('YouTube', 'https?://(?:.+?\\.)?youtu(?:\\.be/|be\\.com/watch\\?(?:.*?&)?v=)(?[a-zA-Z0-9_-]+)(?#t=(?:\\d+|(?:\\d+h(?:\\d+m)?(?:\\d+s)?)|(?:\\d+m(?:\\d+s)?)|(?:\\d+s))$)?', ''); - -- Vimeo - INSERT INTO wcf1_bbcode_media_provider (title, regex, html) VALUES ('Vimeo', 'http://vimeo\\.com/(?\\d+)', ''); - -- MyVideo - INSERT INTO wcf1_bbcode_media_provider (title, regex, html) VALUES ('MyVideo', 'http://(?:www\\.)?myvideo\\.de/watch/(?\\d+)', ''); - -- Clipfish - INSERT INTO wcf1_bbcode_media_provider (title, regex, html) VALUES ('Clipfish', 'http://(?:www\\.)?clipfish\\.de/video/(?\\d+)/', '
'); - -- Veoh - INSERT INTO wcf1_bbcode_media_provider (title, regex, html) VALUES ('Veoh', 'http://(?:www\\.)?veoh\\.com/watch/v(?\\d+[a-zA-Z0-9]+)', ''); - -- DailyMotion - INSERT INTO wcf1_bbcode_media_provider (title, regex, html) VALUES ('DailyMotion', 'https?://(?:www\\.)?dailymotion\\.com/video/(?[a-zA-Z0-9]+)', ''); - -- YouKu - INSERT INTO wcf1_bbcode_media_provider (title, regex, html) VALUES ('YouKu', 'https?://(?:.+?\\.)?youku\\.com/v_show/id_(?[a-zA-Z0-9_-]+)(?:\\.html)?', ''); --- Misc - -- github gist - INSERT INTO wcf1_bbcode_media_provider (title, regex, html) VALUES ('github gist', 'https://gist.github.com/(?[^/]+/[0-9a-zA-Z]+)', ''); - -- soundcloud - INSERT INTO wcf1_bbcode_media_provider (title, regex, html) VALUES ('Soundcloud', 'https?://soundcloud.com/(?[a-zA-Z0-9_-]+)/(?[a-zA-Z0-9_-]+)', ''); - -INSERT IGNORE INTO wcf1_style_variable (variableName, defaultValue) VALUES ('messageSidebarOrientation', 'left'); - -ALTER TABLE wcf1_search_keyword ADD KEY (searches, lastSearchTime); - -ALTER TABLE wcf1_search_index CHANGE languageID languageID INT(10) NULL; -ALTER TABLE wcf1_search_index ADD FOREIGN KEY (languageID) REFERENCES wcf1_language (languageID) ON DELETE SET NULL; - -ALTER TABLE wcf1_user DROP COLUMN signatureCache; - -ALTER TABLE wcf1_user_avatar ADD COLUMN cropX SMALLINT(5) NOT NULL DEFAULT 0; -ALTER TABLE wcf1_user_avatar ADD COLUMN cropY SMALLINT(5) NOT NULL DEFAULT 0; \ No newline at end of file diff --git a/com.woltlab.wcf/update_post_b1.sql b/com.woltlab.wcf/update_post_b1.sql deleted file mode 100644 index 23912e8638..0000000000 --- a/com.woltlab.wcf/update_post_b1.sql +++ /dev/null @@ -1,5 +0,0 @@ -CREATE UNIQUE INDEX applicationTemplate ON wcf1_acp_template (application, templateName); - -CREATE UNIQUE INDEX applicationFile ON wcf1_package_installation_file_log (application, filename); - -CREATE UNIQUE INDEX applicationTemplate ON wcf1_template (application, templateGroupID, templateName); diff --git a/wcfsetup/install/files/acp/update_4.0.0_b1.php b/wcfsetup/install/files/acp/update_4.0.0_b1.php deleted file mode 100644 index 7b3bd26038..0000000000 --- a/wcfsetup/install/files/acp/update_4.0.0_b1.php +++ /dev/null @@ -1,67 +0,0 @@ - - * @package com.woltlab.wcf - * @category Community Framework - */ -$packageList = new PackageList(); -$packageList->getConditionBuilder()->add("isApplication = 1"); -$packageList->readObjects(); - -$sql = "UPDATE wcf".WCF_N."_acp_template - SET application = ? - WHERE packageID = ?"; -$acpStatement = WCF::getDB()->prepareStatement($sql); - -$sql = "UPDATE wcf".WCF_N."_package_installation_file_log - SET application = ? - WHERE packageID = ?"; -$logStatement = WCF::getDB()->prepareStatement($sql); - -$sql = "UPDATE wcf".WCF_N."_template - SET application = ? - WHERE packageID = ?"; -$tplStatement = WCF::getDB()->prepareStatement($sql); - -foreach ($packageList as $package) { - $acpStatement->execute(array( - Package::getAbbreviation($package->package), - $package->packageID - )); - - $logStatement->execute(array( - Package::getAbbreviation($package->package), - $package->packageID - )); - - $tplStatement->execute(array( - Package::getAbbreviation($package->package), - $package->packageID - )); -} - -// assign all other files/templates to WCF -$sql = "UPDATE wcf".WCF_N."_acp_template - SET application = ? - WHERE application = ?"; -$statement = WCF::getDB()->prepareStatement($sql); -$statement->execute(array('wcf', '')); - -$sql = "UPDATE wcf".WCF_N."_package_installation_file_log - SET application = ? - WHERE application = ?"; -$statement = WCF::getDB()->prepareStatement($sql); -$statement->execute(array('wcf', '')); - -$sql = "UPDATE wcf".WCF_N."_template - SET application = ? - WHERE application = ?"; -$statement = WCF::getDB()->prepareStatement($sql); -$statement->execute(array('wcf', ''));