Preparing release 2.0.0 Beta 10

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index cb8faa108e2ecb6d9f7a84376a791fb8038bff41..a71cb492ead083434ba9f0e164eec6d9d587e8f7 100644 (file)
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -6,7 +6,7 @@
                <packagedescription language="de"><![CDATA[Freies Web-Framework, das für komplexe Community-Anwendungen entworfen und entwickelt wurde.]]></packagedescription>
                <isapplication>1</isapplication>
                <version>2.0.0 Beta 10</version> <!-- codename: maelstrom -->
-               <date>2013-09-24</date>
+               <date>2013-09-28</date>
        </packageinformation>
        
        <authorinformation>
@@ -47,8 +47,10 @@
                <!-- deploy files first to prevent an issue with languages being overwritten during update -->
                <instruction type="file" run="standalone">files_update.tar</instruction>
                
+               <instruction type="acpTemplate">acptemplates_update.tar</instruction>
                <instruction type="template">templates_update.tar</instruction>
                <instruction type="language">language/*.xml</instruction>
+               <instruction type="option">option.xml</instruction>
                
                <instruction type="sql" run="standalone">update_b10.sql</instruction>
        </instructions>

diff --git a/com.woltlab.wcf/update_b10.sql b/com.woltlab.wcf/update_b10.sql
index cfb0a85bb938fed595f5abaadb5f8c496b7ea2c4..246d406efbc99c4f0fc65c5a297d61fdfb2e374c 100644 (file)
--- a/com.woltlab.wcf/update_b10.sql
+++ b/com.woltlab.wcf/update_b10.sql
@@ -1,4 +1,13 @@
 /* 064caa4 */
 DELETE FROM wcf1_user_storage;
 
-ALTER TABLE wcf1_user_storage CHANGE fieldValue fieldValue MEDIUMTEXT;
\ No newline at end of file
+ALTER TABLE wcf1_user_storage CHANGE fieldValue fieldValue MEDIUMTEXT;
+
+/* ec09840 */
+DROP TABLE IF EXISTS wcf1_cli_history;
+CREATE TABLE wcf1_cli_history (
+       historyItem INT(10) NOT NULL AUTO_INCREMENT PRIMARY KEY,
+       userID INT(10) NOT NULL,
+       command VARCHAR(255) NOT NULL,
+       KEY (userID)
+);
\ No newline at end of file

diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index 8ff2322b5e325c6ad96e1c557f8580778c45f02e..b6542d283b0dc2dcfdcc205e5f09bda5a692e98a 100644 (file)
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -36,7 +36,7 @@ if (!@ini_get('date.timezone')) {
 }
 
 // define current wcf version
-define('WCF_VERSION', '2.0.0 Beta 9 (Maelstrom)');
+define('WCF_VERSION', '2.0.0 Beta 10 (Maelstrom)');
 
 // define current unix timestamp
 define('TIME_NOW', time());

diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 82f11081739435fb74e1129b2dc23de53b7ce88f..7f26400c2221fc09afcfbd296d165bfce2802e9c 100644 (file)
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -165,10 +165,10 @@ Examples for medium ID detection:
        <category name="wcf.acp.dataImport">
                <item name="wcf.acp.dataImport"><![CDATA[Data Import]]></item>
                <item name="wcf.acp.dataImport.cli.configure.data.alreadySelected"><![CDATA[This data will already be imported.]]></item>
-               <item name="wcf.acp.dataImport.cli.configure.data.error.noSelection"><![CDATA[TODO: Sie haben keine Daten zum Import ausgewählt. Der Import wird beendet.]]></item>
+               <item name="wcf.acp.dataImport.cli.configure.data.error.noSelection"><![CDATA[You did not specify any data for importing, import has been aborted.]]></item>
                <item name="wcf.acp.dataImport.cli.configure.data.error.notValid"><![CDATA[The selected data type is invalid.]]></item>
                <item name="wcf.acp.dataImport.cli.configure.data.selectAll"><![CDATA[All data]]></item>
-               <item name="wcf.acp.dataImport.cli.info.wcf"><![CDATA[TODO: Sie haben keine Anwendung beim Skript-Aufruf mittels --packageID={PACKAGE_ID} geladen. Wenn Sie Daten für eine Anwendung importieren möchten, müssen Sie das Skript mit der ID des entsprechenden Pakets starten. Möchten Sie mit dem Import fortfahren? [YN]]]></item>
+               <item name="wcf.acp.dataImport.cli.info.wcf"><![CDATA[You did not load any application through --packageID={PACKAGE_ID}. If you wish to import application-specific data, you must call this script along with the desired package id. Do you wish to continue the import? [YN]]]></item>
                <item name="wcf.acp.dataImport.cli.selection"><![CDATA[Selection? [{if $minSelection == $maxSelection}{$minSelection}{else}{$minSelection}-{$maxSelection}{/if}]]]></item>
                <item name="wcf.acp.dataImport.completed"><![CDATA[Import completed.]]></item>
                <item name="wcf.acp.dataImport.configure.data"><![CDATA[Data]]></item>
@@ -845,9 +845,9 @@ Examples for medium ID detection:
                <item name="wcf.acp.option.footer_code"><![CDATA[Footer Code]]></item>
                <item name="wcf.acp.option.footer_code.description"><![CDATA[The entered code will be appended to the page footer of your site. You can use it to embed services like “Google Analytics” or “Piwik”.]]></item>
                <item name="wcf.acp.option.profile_enable_visitors"><![CDATA[Show profile visitors]]></item>
-               <item name="wcf.acp.option.url_title_component_replacement"><![CDATA[TODO: URL-Ersetzungen]]></item>
-               <item name="wcf.acp.option.url_title_component_replacement.description"><![CDATA[TODO: Sie können den in URLs enthaltenen Titel durch eigene Ersetzungen verändern. Dies kann z.B. zum Ersetzen von Umlauten oder zum Expandieren von Abkürzungen genutzt werden. (Eine Ersetzung pro Zeile)<br />
-Beispiele:<br />
+               <item name="wcf.acp.option.url_title_component_replacement"><![CDATA[URL Replacements]]></item>
+               <item name="wcf.acp.option.url_title_component_replacement.description"><![CDATA[You may replace parts of the title within the URL. You could use it to replace special characters or to expand abbreviations. (One replacement per line)<br />
+Examples:<br />
 WBB=WoltLab Burning Board<br />
 GmbH=Gesellschaft mit beschränkter Haftung]]></item>
                <item name="wcf.acp.option.users_online_enable_legendusers_online_record_no_guests"><![CDATA[Exclude guests from user online record]]></item>