Index: branches/2.8.x/DEVINFOS =================================================================== --- branches/2.8.x/DEVINFOS (revision 2081) +++ branches/2.8.x/DEVINFOS (nonexistent) @@ -1,69 +0,0 @@ -WebsiteBaker 2.8.3 Developing Instructions/Informations -======================================================= - -$Id$ - - - - -24 Apr-2012 Build 1676 ----------------------- -If you use function rm_full_dir -now disable Run-time notices and return boolean: -create your own error messages - -17 Apr-2012 Build 1665 ----------------------- -add developer informations in advanced settings -info will be shown in footer only for system admin - -add page_icon_dir in advanced settings -default directory /templates/*/title_images -/*/ placeholder will be replaced with default template -put images to show in frontend template -in page settings you find an additional field to choose an image - -17 Apr-2012 Build 1664 ----------------------- - - -01 Apr-2012 Build 1655 ----------------------- -handling replyto in form module -You can directly answer to the recipient, sending by a authenticated user -then in from the recipient name is shown - -22 Mar-2012 Build 1639 ----------------------- -Refer: new structure in config.php set by new installation -backwards compability is given, so const can be defined in /framework/initialize.php -add const DEBUG to config.php (default = false) -add const ADMIN_DIRECTORY to config.php (default = admin) -[code] -define('DEBUG', false); -define('DB_TYPE', 'mysql'); -define('DB_HOST', 'localhost'); -define('DB_NAME', 'xxxxxx'); -define('DB_USERNAME', 'xxxxxx'); -define('DB_PASSWORD', 'xxxxxx'); -define('TABLE_PREFIX', 'wb_'); - -define('WB_URL', 'http://xxxxxxxx.xx'); -define('ADMIN_DIRECTORY', 'admin'); // no leading/trailing slash or backslash!! A simple directory only!! - -require_once(dirname(__FILE__).'/framework/initialize.php'); -[/code] - - -09 Mar-2012 Build 1634 ----------------------- -If using the $MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'] in your module, please add -following code to your script, -requires: include_once (WB_PATH.'/framework/functions.php'); -[code] -$aServerEmail = (defined('SERVER_EMAIL') && SERVER_EMAIL != '' ? SERVER_EMAIL : $_SERVER['SERVER_NAME']); -$replace = array('SERVER_EMAIL' => $aServerEmail ); -$MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'] = replace_vars($MESSAGE['MOD_FORM_INCORRECT_CAPTCHA'], $replace); -[/code] - - Property changes on: branches/2.8.x/DEVINFOS ___________________________________________________________________ Deleted: svn:keywords ## -1,4 +0,0 ## -Id -Revision -HeadURL -Date \ No newline at end of property Index: branches/2.8.x/INSTALL =================================================================== --- branches/2.8.x/INSTALL (revision 2081) +++ branches/2.8.x/INSTALL (revision 2082) @@ -1,15 +1,17 @@ -WebsiteBaker 2.8.3 Installation Instructions +WebsiteBaker 2.8.4 Installation Instructions ================================================= Step 1 - Preparing your webspace -- Login to your webspace account and create a database. +- Login to your webspace account and create a mySQL-Database. + (take care to set anything by default to utf8 / utf8_unicode_ci if possible) Step 2 - Download WebsiteBaker -- Download "WebsiteBaker 2.8.3" from http://www.websitebaker2.org/en/download/latest-version.php +- Download "WebsiteBaker 2.8.4" from http://www.websitebaker.org/en/download/latest-version.php - Unzip the package to your local machine Step 3 - Preparing the Installation-Package - Rename "config.php.new" to "config.php" +- Rename "setup.ini.php.new" to "setup.ini.php" - Delete File "upgrade-script.php" Step 4 - Uploading @@ -16,11 +18,10 @@ - Upload all files to your Webspace Step 5 - Installation -- Call in your Browser www.yourdomainname.com +- Call in your Browser http://yourdomainname.com/install/ - Follow the Installation Instructions Step 6 - Cleaning - Delete folder "/install" -Have fun with WB 2.8.3 - +Have fun with WB 2.8.4 Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 2081) +++ branches/2.8.x/CHANGELOG (revision 2082) @@ -11,6 +11,9 @@ ! = Update/Change =============================================================================== +07 Jan-2014 Build 2082 Manuela v.d.Decken(DarkViper) +! added missing translation in admin/users +! DOC-files updated. 07 Jan-2014 Build 2081 Manuela v.d.Decken(DarkViper) # admin/pages/settings_save Typofix Line 39 07 Jan-2014 Build 2080 Manuela v.d.Decken(DarkViper) Index: branches/2.8.x/UPGRADE =================================================================== --- branches/2.8.x/UPGRADE (revision 2081) +++ branches/2.8.x/UPGRADE (revision 2082) @@ -1,8 +1,8 @@ -WebsiteBaker 2.8.3 UPGRADE Instructions +WebsiteBaker 2.8.4 UPGRADE Instructions ================================================= This file describes the upgrade from all Versions -since WB 2.7 directly to WB 2.8.3. +since WB 2.7 directly to WB 2.8.4. Step 1 is different, depending from the WB-Version you start. @@ -12,9 +12,11 @@ **************************************** -* Upgrade from WB 2.8.2SP2 to WB 2.8.3 * -* Upgrade from WB 2.8.2SP1 to WB 2.8.3 * -* Upgrade from WB 2.8.2 to WB 2.8.3 * +* Upgrade from WB 2.8.3SP1 to WB 2.8.4 * +* Upgrade from WB 2.8.3 to WB 2.8.4 * +* Upgrade from WB 2.8.2SP2 to WB 2.8.4 * +* Upgrade from WB 2.8.2SP1 to WB 2.8.4 * +* Upgrade from WB 2.8.2 to WB 2.8.4 * **************************************** Step 1 - Preparing your existing system @@ -25,8 +27,8 @@ **************************************** -* Upgrade from WB 2.8.1 to WB 2.8.3 * -* Upgrade from WB 2.8.0 to WB 2.8.3 * +* Upgrade from WB 2.8.1 to WB 2.8.4 * +* Upgrade from WB 2.8.0 to WB 2.8.4 * **************************************** Step 1 - Preparing your existing system @@ -43,7 +45,7 @@ **************************************** -* Upgrade from WB 2.7 to WB 2.8.3 * +* Upgrade from WB 2.7 to WB 2.8.4 * **************************************** Step 1 - Preparing your existing system @@ -64,20 +66,21 @@ **************************************** -* Upgrade from WB 2.8.2SP2 to WB 2.8.3 * -* Upgrade from WB 2.8.2SP1 to WB 2.8.3 * -* Upgrade from WB 2.8.2 to WB 2.8.3 * -* Upgrade from WB 2.8.1 to WB 2.8.3 * -* Upgrade from WB 2.8.0 to WB 2.8.3 * -* Upgrade from WB 2.7 to WB 2.8.3 * +* Upgrade from WB 2.8.3SP1 to WB 2.8.4 * +* Upgrade from WB 2.8.3 to WB 2.8.4 * +* Upgrade from WB 2.8.2SP2 to WB 2.8.4 * +* Upgrade from WB 2.8.2SP1 to WB 2.8.4 * +* Upgrade from WB 2.8.2 to WB 2.8.4 * +* Upgrade from WB 2.8.1 to WB 2.8.4 * +* Upgrade from WB 2.8.0 to WB 2.8.4 * +* Upgrade from WB 2.7 to WB 2.8.4 * **************************************** -Step 2 - Download WebsiteBaker -- Download "WebsiteBaker 2.8.3" from http://www.websitebaker2.org/en/download/latest-version.php +Step 2 - Download WebsiteBaker +- Download "WebsiteBaker 2.8.4" from http://www.websitebaker.org/en/download/latest-version.php - Unzip the package to your local machine Step 3 - Preparing the Upgrade-Package -- Delete File "config.php.new" - Delete Folder "/install" - Change favicon to your own @@ -90,10 +93,12 @@ Login as superadmin to your backend, upgrade-script starts automatically - if the script not starts automatically and if you upgrade from WB 2.7: Call in your Browser www.yourdomainname.com/upgrade-script.php -- Follow the Upgrade-Instructions +- Follow the Upgrade-Instructions Step 6 - Cleaning -- Delete File upgrade-script.php +- Delete File "config.php.new" if exists +- Delete File "setup.ini.php.new" if exists +- Delete File upgrade-script.php if exists Step 7 - Actualize Addons Table (just to be shure) - Go to "Add-ons" - "Advanced" @@ -107,4 +112,4 @@ - Go to "Add-ons" - "Modules" - "Advanced" - Execute "upgrade.php" from Modul "WYSIWYG" -Have fun with WB 2.8.3 \ No newline at end of file +Have fun with WB 2.8.4 Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 2081) +++ branches/2.8.x/wb/admin/interface/version.php (revision 2082) @@ -51,5 +51,5 @@ // check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled) if(!defined('VERSION')) define('VERSION', '2.8.4'); -if(!defined('REVISION')) define('REVISION', '2081'); +if(!defined('REVISION')) define('REVISION', '2082'); if(!defined('SP')) define('SP', ''); Index: branches/2.8.x/wb/admin/users/languages/NL.php =================================================================== --- branches/2.8.x/wb/admin/users/languages/NL.php (revision 2081) +++ branches/2.8.x/wb/admin/users/languages/NL.php (revision 2082) @@ -38,8 +38,9 @@ $MESSAGE['USERS_USERNAME_TOO_SHORT'] = 'The loginname you entered was too short'; $MESSAGE['USERS_WAITING_ACTIVATION'] = 'Awaiting user activation'; $TEXT['ACTIVE'] = 'Actief'; -$TEXT['DEACTIVE'] = 'Deactivate'; -$TEXT['DEACTIVED'] = 'Disabled'; +$TEXT['ACTIVATE'] = 'Activeren'; +$TEXT['DEACTIVE'] = 'Deactiveren'; +$TEXT['DEACTIVED'] = 'Inactief'; $TEXT['ADD'] = 'Toevoegen'; $TEXT['ARE_YOU_SURE'] = 'Weet u het zeker?'; $TEXT['BACK'] = 'Terug'; Index: branches/2.8.x/wb/admin/users/languages/DE.php =================================================================== --- branches/2.8.x/wb/admin/users/languages/DE.php (revision 2081) +++ branches/2.8.x/wb/admin/users/languages/DE.php (revision 2082) @@ -40,7 +40,8 @@ $MESSAGE['USERS_WAITING_ACTIVATION'] = 'Erwarte Benutzer Aktivierung'; // new $TEXT['ACTIVE'] = 'Aktiv'; -$TEXT['DEACTIVE'] = 'Deaktivieren'; // new +$TEXT['ACTIVATE'] = 'Aktivieren'; +$TEXT['DEACTIVE'] = 'Deaktiveren'; // new $TEXT['DEACTIVED'] = 'Deaktiviert'; // new $TEXT['ADD'] = 'Hinzufügen'; $TEXT['ARE_YOU_SURE'] = 'Sind Sie sicher?'; Index: branches/2.8.x/README =================================================================== --- branches/2.8.x/README (revision 2081) +++ branches/2.8.x/README (revision 2082) @@ -10,7 +10,7 @@ ======= WebsiteBaker is released under the GNU General Public License, Copyright (C) 2004-2009 Ryan Djurovich. -Copyright (C) 2009-2011 Website Baker Org. e.V. +Copyright (C) 2009-2014 Website Baker Org. e.V. Please refer to the COPYING file for a copy of the license. Installation @@ -22,24 +22,24 @@ Before using WebsiteBaker please note: you must not remove/change any copyright notices in the any code contained in this package. Also, it is appreciated if you leave a link somewhere on your website, -which links to the WebsiteBaker website. (http://www.websitebaker2.org/) +which links to the WebsiteBaker website. (http://www.websitebaker.org/) Support ======= For information about finding help: -http://www.websitebaker2.org/forum/ +http://www.websitebaker.org/forum/ Community ========= For more information about finding help: -http://www.websitebaker2.org/forum/ +http://www.websitebaker.org/forum/ Bugs ==== To submit a bug: -http://www.websitebaker2.org/ +http://www.websitebaker.org/ Contribute ========== For information about how to contribute (donating, etc): -http://www.websitebaker2.org +http://www.websitebaker.org