From c09023d1db2e05798437d2e5120f6e8cbb1e6567 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Wed, 21 Jan 2015 01:25:50 +0100 Subject: [develop-olympus] Bumping version numbers to final for 3.0.13 releases. --- phpBB/docs/INSTALL.html | 6 +++--- phpBB/install/convertors/convert_phpbb20.php | 2 +- phpBB/styles/prosilver/imageset/imageset.cfg | 2 +- phpBB/styles/prosilver/style.cfg | 2 +- phpBB/styles/prosilver/template/template.cfg | 2 +- phpBB/styles/prosilver/theme/theme.cfg | 2 +- phpBB/styles/subsilver2/imageset/imageset.cfg | 2 +- phpBB/styles/subsilver2/style.cfg | 2 +- phpBB/styles/subsilver2/template/template.cfg | 2 +- phpBB/styles/subsilver2/theme/theme.cfg | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/phpBB/docs/INSTALL.html b/phpBB/docs/INSTALL.html index 74c017ecff..02a5e18322 100644 --- a/phpBB/docs/INSTALL.html +++ b/phpBB/docs/INSTALL.html @@ -276,7 +276,7 @@

This package is meant for those wanting to only replace the files that were changed between a previous version and the latest version.

-

This package contains a number of archives, each contains the files changed from a given release to the latest version. You should select the appropriate archive for your current version, e.g. if you currently have 3.0.11 you should select the appropriate phpBB-3.0.12-files.zip/tar.bz2 file.

+

This package contains a number of archives, each contains the files changed from a given release to the latest version. You should select the appropriate archive for your current version, e.g. if you currently have 3.0.12 you should select the appropriate phpBB-3.0.13-files.zip/tar.bz2 file.

The directory structure has been preserved, enabling you (if you wish) to simply upload the uncompressed contents of the archive to the appropriate location on your server, i.e. simply overwrite the existing files with the new versions. Do not forget that if you have installed any modifications (MODs) these files will overwrite the originals, possibly destroying them in the process. You will need to re-add MODs to any affected file before uploading.

@@ -288,7 +288,7 @@

The patch file is one solution for those with many Modifications (MODs) or other changes and do not want to re-add them back to all the changed files. To use this you will need command line access to a standard UNIX type patch application. If you do not have access to such an application, but still want to use this update approach, we strongly recommend the Automatic update package explained below. It is also the recommended update method.

-

A number of patch files are provided to allow you to update from previous stable releases. Select the correct patch, e.g. if your current version is 3.0.11, you need the phpBB-3.0.12-patch.zip/tar.bz2 file. Place the correct patch in the parent directory containing the phpBB core files (i.e. index.php, viewforum.php, etc.). With this done you should run the following command: patch -cl -d [PHPBB DIRECTORY] -p1 < [PATCH NAME] (where PHPBB DIRECTORY is the directory name your phpBB Installation resides in, for example phpBB, and where PATCH NAME is the relevant filename of the selected patch file). This should complete quickly, hopefully without any HUNK FAILED comments.

+

A number of patch files are provided to allow you to update from previous stable releases. Select the correct patch, e.g. if your current version is 3.0.12, you need the phpBB-3.0.13-patch.zip/tar.bz2 file. Place the correct patch in the parent directory containing the phpBB core files (i.e. index.php, viewforum.php, etc.). With this done you should run the following command: patch -cl -d [PHPBB DIRECTORY] -p1 < [PATCH NAME] (where PHPBB DIRECTORY is the directory name your phpBB Installation resides in, for example phpBB, and where PATCH NAME is the relevant filename of the selected patch file). This should complete quickly, hopefully without any HUNK FAILED comments.

If you do get failures, you should look at using the Changed Files package to replace the files which failed to patch. Please note that you will need to manually re-add any MODs to these particular files. Alternatively, if you know how, you can examine the .rej files to determine what failed where and make manual adjustments to the relevant source.

@@ -298,7 +298,7 @@

This update method is the recommended method for updating. This package detects changed files automatically and merges in changes if needed.

-

The automatic update package will update the board from a given version to the latest version. A number of automatic update files are available, and you should choose the one that corresponds to the version of the board that you are currently running. For example, if your current version is 3.0.11, you need the phpBB-3.0.11_to_3.0.12.zip/tar.bz2 file.

+

The automatic update package will update the board from a given version to the latest version. A number of automatic update files are available, and you should choose the one that corresponds to the version of the board that you are currently running. For example, if your current version is 3.0.12, you need the phpBB-3.0.12_to_3.0.13.zip/tar.bz2 file.

To perform the update, either follow the instructions from the Administration Control Panel->System Tab - this should point out that you are running an outdated version and will guide you through the update - or follow the instructions listed below.

diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index f1127da8aa..c0c7d4d637 100644 --- a/phpBB/install/convertors/convert_phpbb20.php +++ b/phpBB/install/convertors/convert_phpbb20.php @@ -32,7 +32,7 @@ unset($dbpasswd); $convertor_data = array( 'forum_name' => 'phpBB 2.0.x', 'version' => '1.0.3', - 'phpbb_version' => '3.0.12', + 'phpbb_version' => '3.0.13', 'author' => 'phpBB Group', 'dbms' => $dbms, 'dbhost' => $dbhost, diff --git a/phpBB/styles/prosilver/imageset/imageset.cfg b/phpBB/styles/prosilver/imageset/imageset.cfg index 22178d8a9d..d98829cc0d 100644 --- a/phpBB/styles/prosilver/imageset/imageset.cfg +++ b/phpBB/styles/prosilver/imageset/imageset.cfg @@ -19,7 +19,7 @@ # General Information about this style name = prosilver copyright = © phpBB Group, 2007 -version = 3.0.12 +version = 3.0.13 # Images img_site_logo = site_logo.gif*52*139 diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg index abd5a5dd22..7573f9bd83 100644 --- a/phpBB/styles/prosilver/style.cfg +++ b/phpBB/styles/prosilver/style.cfg @@ -19,4 +19,4 @@ # General Information about this style name = prosilver copyright = © phpBB Group, 2007 -version = 3.0.12 +version = 3.0.13 diff --git a/phpBB/styles/prosilver/template/template.cfg b/phpBB/styles/prosilver/template/template.cfg index af84a0a66c..7f41c2238d 100644 --- a/phpBB/styles/prosilver/template/template.cfg +++ b/phpBB/styles/prosilver/template/template.cfg @@ -19,7 +19,7 @@ # General Information about this template name = prosilver copyright = © phpBB Group, 2007 -version = 3.0.12 +version = 3.0.13 # Defining a different template bitfield template_bitfield = lNg= diff --git a/phpBB/styles/prosilver/theme/theme.cfg b/phpBB/styles/prosilver/theme/theme.cfg index 03d82ed5f6..cfd6529aaa 100644 --- a/phpBB/styles/prosilver/theme/theme.cfg +++ b/phpBB/styles/prosilver/theme/theme.cfg @@ -21,7 +21,7 @@ # General Information about this theme name = prosilver copyright = © phpBB Group, 2007 -version = 3.0.12 +version = 3.0.13 # Some configuration options diff --git a/phpBB/styles/subsilver2/imageset/imageset.cfg b/phpBB/styles/subsilver2/imageset/imageset.cfg index cb48b0fd9f..ee81c3c2cd 100644 --- a/phpBB/styles/subsilver2/imageset/imageset.cfg +++ b/phpBB/styles/subsilver2/imageset/imageset.cfg @@ -19,7 +19,7 @@ # General Information about this style name = subsilver2 copyright = © phpBB Group, 2003 -version = 3.0.12 +version = 3.0.13 # Images img_site_logo = site_logo.gif*94*170 diff --git a/phpBB/styles/subsilver2/style.cfg b/phpBB/styles/subsilver2/style.cfg index b0fe5e6639..b1c9dabcf8 100644 --- a/phpBB/styles/subsilver2/style.cfg +++ b/phpBB/styles/subsilver2/style.cfg @@ -19,4 +19,4 @@ # General Information about this style name = subsilver2 copyright = © 2005 phpBB Group -version = 3.0.12 +version = 3.0.13 diff --git a/phpBB/styles/subsilver2/template/template.cfg b/phpBB/styles/subsilver2/template/template.cfg index 0c50275208..65fa498cf9 100644 --- a/phpBB/styles/subsilver2/template/template.cfg +++ b/phpBB/styles/subsilver2/template/template.cfg @@ -19,7 +19,7 @@ # General Information about this template name = subsilver2 copyright = © phpBB Group, 2003 -version = 3.0.12 +version = 3.0.13 # Template inheritance # See http://blog.phpbb.com/2008/07/31/templating-just-got-easier/ diff --git a/phpBB/styles/subsilver2/theme/theme.cfg b/phpBB/styles/subsilver2/theme/theme.cfg index 5c58dc65d9..6d4380a542 100644 --- a/phpBB/styles/subsilver2/theme/theme.cfg +++ b/phpBB/styles/subsilver2/theme/theme.cfg @@ -21,7 +21,7 @@ # General Information about this theme name = subsilver2 copyright = © phpBB Group, 2003 -version = 3.0.12 +version = 3.0.13 # Some configuration options -- cgit v1.2.1 From 9f7f366573bc117d429e0c044836455662c344ed Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Wed, 21 Jan 2015 01:32:18 +0100 Subject: [develop-olympus] Bump version numbers for 3.0.13-RC1 release. --- build/build.xml | 2 +- phpBB/includes/constants.php | 2 +- phpBB/install/database_update.php | 12 +++++++++--- phpBB/install/schemas/schema_data.sql | 2 +- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/build/build.xml b/build/build.xml index 693a1997ae..e3ca10675c 100644 --- a/build/build.xml +++ b/build/build.xml @@ -2,7 +2,7 @@ - + diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index 8d09fe4d9b..4b1a8f154b 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -25,7 +25,7 @@ if (!defined('IN_PHPBB')) */ // phpBB Version -define('PHPBB_VERSION', '3.0.13-dev'); +define('PHPBB_VERSION', '3.0.13-RC1'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 7c57dfdc1f..15f9c589d3 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -8,7 +8,7 @@ * */ -define('UPDATES_TO_VERSION', '3.0.13-dev'); +define('UPDATES_TO_VERSION', '3.0.13-RC1'); // Enter any version to update from to test updates. The version within the db will not be updated. define('DEBUG_FROM_VERSION', false); @@ -949,7 +949,7 @@ function database_update_info() // this column was removed from the database updater // after 3.0.9-RC3 was released. It might still exist // in 3.0.9-RCX installations and has to be dropped in - // 3.0.13 after the db_tools class is capable of properly + // 3.0.14 after the db_tools class is capable of properly // removing a primary key. // 'attempt_id' => array('UINT', NULL, 'auto_increment'), 'attempt_ip' => array('VCHAR:40', ''), @@ -1011,8 +1011,10 @@ function database_update_info() '3.0.12-RC2' => array(), // No changes from 3.0.12-RC3 to 3.0.12 '3.0.12-RC3' => array(), + // No changes from 3.0.12 to 3.0.13-RC1 + '3.0.12' => array(), - /** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.13-RC1 */ + /** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.14-RC1 */ ); } @@ -2254,6 +2256,10 @@ function change_database_data(&$no_updates, $version) // No changes from 3.0.12-RC3 to 3.0.12 case '3.0.12-RC3': break; + + // No changes from 3.0.12 to 3.0.13-RC1 + case '3.0.12': + break; } } diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index b266025c86..bdfc34dffd 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -246,7 +246,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('topics_per_page', INSERT INTO phpbb_config (config_name, config_value) VALUES ('tpl_allow_php', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.13-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.13-RC1'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400'); -- cgit v1.2.1 From 2c9e178a42dd3c096c693f2a18fd27620df83065 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Wed, 21 Jan 2015 01:45:23 +0100 Subject: [develop-olympus] Add changelog for 3.0.13 release. --- phpBB/docs/CHANGELOG.html | 190 +++++++++++++++++++++++++++++++++++++++------- 1 file changed, 162 insertions(+), 28 deletions(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 71795f83ac..d52a9d3c98 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -53,6 +53,7 @@
  1. Changelog
      +
    1. Changes since 3.0.12
    2. Changes since 3.0.11
    3. Changes since 3.0.10
    4. Changes since 3.0.9
      5. @@ -93,7 +94,140 @@
      -

      1.i. Changes since 3.0.11

      +

      1.i. Changes since 3.0.12

      + +

      Bug

      +
        +
      • [PHPBB3-6703] - Problem with russian letter while converting from 2.0.x
        • +
      • [PHPBB3-8960] - Allow changing allow_avatar_remote when images/avatars/upload is not writable
        • +
      • [PHPBB3-9420] - BBCode - Unable to use a proper URI token
        • +
      • [PHPBB3-9724] - Wrong return "Return to ACP"
        • +
      • [PHPBB3-9725] - MSSQL Schema is not azure compatible
        • +
      • [PHPBB3-10023] - Password change requirement notification in UCP is not noticable
        • +
      • [PHPBB3-10423] - Searching for the term "test *" will highlight nearly every word and displays htmlspecialchars as htmlentities.
        • +
      • [PHPBB3-10442] - XHTML is invalid when a forum link without redirect counter is present
        • +
      • [PHPBB3-10687] - UNABLE_GET_IMAGE_SIZE text misleading for remote avatars
        • +
      • [PHPBB3-10729] - Post editor information is not updated when user being deleted with posts
        • +
      • [PHPBB3-10776] - Grammar errors in docs/README.html
        • +
      • [PHPBB3-10796] - SQL Azure does not allow SELECT FROM sysfiles
        • +
      • [PHPBB3-10851] - HTML files containing certain tags being rejected as possible attack vectors with "Check attachment file" set to "No"
        • +
      • [PHPBB3-10863] - Permission mask does not accurately show some forum permissions if user has MOD parmissions
        • +
      • [PHPBB3-10917] - Updater notice "Update files are out of date..." when updating to unreleased version
        • +
      • [PHPBB3-10985] - Error bbcode.html not found when updating with custom style inheriting from prosilver
        • +
      • [PHPBB3-11062] - In Automatic Update, new language strings from install.php are only loaded from English
        • +
      • [PHPBB3-11224] - SQL cache destroy does not destroy queries to tables joined
        • +
      • [PHPBB3-11288] - "Fulltext native" search fooled by hyphens
        • +
      • [PHPBB3-11480] - Prevent Private Message system from returning "Unknown folder" when inbox folder is full
        • +
      • [PHPBB3-11613] - Cookies do not work for netbios domain
        • +
      • [PHPBB3-11686] - Not checking for phpBB Debug errors on functional tests
        • +
      • [PHPBB3-11699] - PHP Lint Test should exclude selected subdirectories of the build directory.
        • +
      • [PHPBB3-11726] - Don't run lint tests on Travis on postgres
        • +
      • [PHPBB3-11762] - generate_text_for_display() treats "0" as an empty string
        • +
      • [PHPBB3-11789] - Inline css with color value in subsilver2
        • +
      • [PHPBB3-11794] - Coding Guidelines document says to place a comma after every array element, but fails to do so itself
        • +
      • [PHPBB3-11799] - Anti Abuse Headers missing for sendpassword
        • +
      • [PHPBB3-11811] - Chrome 30 adds outline to focused elements
        • +
      • [PHPBB3-11821] - Wrong comma usage "You are receiving this notification"
        • +
      • [PHPBB3-11823] - Travis-CI webserver not matching PHP files with anything after the .php
        • +
      • [PHPBB3-11829] - Closed reports may seem open in detailed view
        • +
      • [PHPBB3-11860] - .htaccess not working for Apache 2.4
        • +
      • [PHPBB3-11864] - Do not call exit after display_progress_bar in acp_forums
        • +
      • [PHPBB3-11879] - Compatibility error in forum_fn.js: .live should be replaced with .on
        • +
      • [PHPBB3-11968] - Travis Image are broken due to repository rename
        • +
      • [PHPBB3-12037] - acp_inactive.html has hard-coded text
        • +
      • [PHPBB3-12048] - Custom BBCodes Fail to Render Language Strings with a Number
        • +
      • [PHPBB3-12061] - Keyboard shortcut alt+h doesn't work properly in firefox
        • +
      • [PHPBB3-12072] - Missing word "send" in comment in schema_data.sql
        • +
      • [PHPBB3-12093] - IE 11 javascript selection is no longer supported
        • +
      • [PHPBB3-12118] - Add noindex meta tag to subsilver2 pm/topic view-print template
        • +
      • [PHPBB3-12119] - Remove keywords and description meta tags from prosilver view-print templates
        • +
      • [PHPBB3-12120] - Update docs/AUTHORS for 3.0.13-RC1
        • +
      • [PHPBB3-12140] - Avoid endless loop in build script
        • +
      • [PHPBB3-12161] - build/save directories are no longer created
        • +
      • [PHPBB3-12162] - Binary files missing from update packages
        • +
      • [PHPBB3-12176] - No error shown when attempting to delete a founder
        • +
      • [PHPBB3-12186] - MCP should open "Reported posts" instead of PM Reports
        • +
      • [PHPBB3-12188] - Add php 5.6 to travis tests
        • +
      • [PHPBB3-12202] - Variables read from style.cfg etc. should be htmlspecialchared
        • +
      • [PHPBB3-12205] - Custom Profile Field display bug
        • +
      • [PHPBB3-12210] - dbtools::sql_create_table incorrectly throws error related to auto-increment length on non auto-increment fields
        • +
      • [PHPBB3-12310] - SMTP username and password should not autocomplete during install
        • +
      • [PHPBB3-12316] - develop-ascraeus build status missing from "Automated Testing" section in README.md
        • +
      • [PHPBB3-12353] - User attachments in ACP are not displaying every attachment
        • +
      • [PHPBB3-12359] - Day and Month of Birthday Misaligned When Editing
        • +
      • [PHPBB3-12381] - Broken error message when selecting invalid DB driver
        • +
      • [PHPBB3-12397] - db_tools::sql_unique_index_exists() has wrong doc block
        • +
      • [PHPBB3-12429] - Update phpunit to 3.8+
        • +
      • [PHPBB3-12467] - Add config_*.php and tests_config_*.php to .gitignore
        • +
      • [PHPBB3-12472] - Set fast finish for .travis.yml
        • +
      • [PHPBB3-12485] - Broken tests due to absolute exclude
        • +
      • [PHPBB3-12492] - DB_TEST: Special chars are not supported.
        • +
      • [PHPBB3-12540] - WRONG_FILESIZE contains broken placeholders
        • +
      • [PHPBB3-12660] - Undefined offset error when phpinfo() disabled and debug enabled
        • +
      • [PHPBB3-12695] - Undefined index: MISSING_INLINE_ATTACHMENT notice given when viewing post details
        • +
      • [PHPBB3-12720] - Git commit hook should not require commit message to start with a capital letter
        • +
      • [PHPBB3-12741] - Functional tests on Travis fail since php update last night
        • +
      • [PHPBB3-12755] - Remote upload stuck in infinite loop if server sends keep-alive
        • +
      • [PHPBB3-13086] - Update ACP_MASS_EMAIL_EXPLAIN language key
        • +
      • [PHPBB3-13096] - ldap_escape() added to PHP 5.6.0
        • +
      • [PHPBB3-13138] - Banned users cause infinite recursion
        • +
      • [PHPBB3-13168] - Warning displayed in PHP 5.6 for mbstring.http_input
        • +
      • [PHPBB3-13234] - Remember me cookie gets unset by admin reauthentication
        • +
      • [PHPBB3-13341] - Tests fail when generating coverage report
        • +
      • [PHPBB3-13376] - deregister_globals() does not work correctly when $_COOKIE['GLOBALS'] - is specified
        • +
      • [PHPBB3-13519] - Correctly validate imagick path as path and not string
        • +
      • [PHPBB3-13523] - PHP 5.2 Unit Tests no longer work due to deprecated PHPUnit PEAR channel
        • +
      • [PHPBB3-13526] - Correctly validate ucp_pm_options form key
        • +
      • [PHPBB3-13527] - Escape information received from version server
        • +
      +

      Improvement

      +
        +
      • [PHPBB3-10037] - Add Smiley Buttons in Signature Editor
        • +
      • [PHPBB3-10174] - Rename "Ban usernames" to "Ban users" in ACP
        • +
      • [PHPBB3-10549] - Languages variables should be used, not hardcoded
        • +
      • [PHPBB3-10555] - Copyright notice in overall_header.html is not translatable
        • +
      • [PHPBB3-10945] - Show entered search query in the search box when no results are found.
        • +
      • [PHPBB3-11254] - Check CRLF line endings in the test suite
        • +
      • [PHPBB3-11295] - Drop tables for postgres in the test suite
        • +
      • [PHPBB3-11297] - Running tests doc should mention dbunit dependency
        • +
      • [PHPBB3-11704] - phing build script does not include vendor folder, even if there are dependencies
        • +
      • [PHPBB3-11766] - Remove Quote and Edit button when topic is lock
        • +
      • [PHPBB3-11801] - missing semi colons in css
        • +
      • [PHPBB3-11814] - Topic reply notification email text change
        • +
      • [PHPBB3-12035] - Add a link to user's posts in the ACP user overview page
        • +
      • [PHPBB3-12106] - Document exceptions to "Disable Board" in ACP.
        • +
      • [PHPBB3-12146] - Add color demo when editing a group from the UCP
        • +
      • [PHPBB3-12247] - include poster's username in email notifications of posts that get approved by moderators
        • +
      • [PHPBB3-12259] - Too many redundant tests are run on Travis
        • +
      • [PHPBB3-12468] - Allow mbstring.http_input='' besides 'pass' for PHP 5.6 compatibility
        • +
      • [PHPBB3-13531] - Disallow trailing paths (e.g. using the PATH_INFO feature)
        • +
      +

      Task

      +
        +
      • [PHPBB3-10839] - Remove phpunit.xml.functional and always include functional tests
        • +
      • [PHPBB3-11509] - Travis should check commit message format
        • +
      • [PHPBB3-11876] - Upgrade package checksums from MD5 to SHA256
        • +
      • [PHPBB3-11877] - Create package download links and checksums for announcement via script
        • +
      • [PHPBB3-11920] - Add MariaDB tests to Travis-CI
        • +
      • [PHPBB3-11951] - Add MariaDB to supported RDBMS list
        • +
      • [PHPBB3-11970] - Use 'set -x' in Travis CI setup scripts
        • +
      • [PHPBB3-12046] - Use PHP_BINARY environment variable in lint unit test
        • +
      • [PHPBB3-12056] - Make sure each unit test runs on its own
        • +
      • [PHPBB3-12147] - Remove Travis CI notification configuration
        • +
      • [PHPBB3-12302] - Upgrade composer.phar to 1.0.0-alpha8
        • +
      • [PHPBB3-12318] - Correctly setup HHVM functional tests on Travis CI
        • +
      • [PHPBB3-12319] - Backport Travis CI HHVM environment enabling to develop-olympus.
        • +
      • [PHPBB3-12320] - No longer allow Travis CI HHVM environment to fail
        • +
      • [PHPBB3-12341] - Add tests for get_username_string()
        • +
      • [PHPBB3-12384] - Run Travis CI HHVM tests against MySQLi instead of MySQL
        • +
      • [PHPBB3-12417] - hhvm-nightly 2014.04.16~precise breaks tests
        • +
      • [PHPBB3-12495] - Add Sami to composer dependencies and build script
        • +
      • [PHPBB3-12582] - Strip away copyrighted ICC profile from images
        • +
      • [PHPBB3-12917] - Move commit check and file executable checks to 5.3.3 build on travis
        • +
      • [PHPBB3-13324] - Composer no longer downloads sami/sami and fabpot/goutte
        • +
      + +

      1.ii. Changes since 3.0.11

      Bug

        @@ -248,7 +382,7 @@
      • [PHPBB3-11753] - Upgrade mysql_upgrader.php schema data.
      -

      1.ii. Changes since 3.0.10

      +

      1.iii. Changes since 3.0.10

      Bug

        @@ -373,7 +507,7 @@
      • [PHPBB3-10909] - Update Travis Test Configuration: Travis no longer supports PHP 5.3.2
      -

      1.iii. Changes since 3.0.9

      +

      1.iv. Changes since 3.0.9

      Bug

        @@ -509,7 +643,7 @@
      • [PHPBB3-10480] - Automate changelog building
      -

      1.iv. Changes since 3.0.8

      +

      1.v. Changes since 3.0.8

      Bug

      @@ -574,7 +708,7 @@
    5. [PHPBB3-9924] - $template->display hook does not pass $template instance
      6. -
    6. [PHPBB3-9925] - prosilver logo margin bug in IE 6-7-8 +
    7. [PHPBB3-9925] - prosilver logo margin bug in IE 6-7-8
    8. [PHPBB3-9928] - Do not link "login to your board" to the "send statistics" page after completed update.
      9. @@ -582,7 +716,7 @@
    9. [PHPBB3-9932] - The Bing bot is not added when converting.
      10. -
    10. [PHPBB3-9933] - Wrong handling of consecutive multiple asterisks in word censor +
    11. [PHPBB3-9933] - Wrong handling of consecutive multiple asterisks in word censor
    12. [PHPBB3-9934] - Mass Mail missing under the system tab on a fresh install
      13. @@ -594,7 +728,7 @@
    13. [PHPBB3-9948] - Inline quicktime files won't display
      14. -
    14. [PHPBB3-9949] - $user->lang() is not handling arguments as per documentation +
    15. [PHPBB3-9949] - $user->lang() is not handling arguments as per documentation
    16. [PHPBB3-9950] - Problem with localized button images after uprading from 3.0.7-PL1 to 3.0.8
      17. @@ -757,7 +891,7 @@
    17. [PHPBB3-10250] - phpBB Logo needs the Registered Trademark Symbol
      18. - +

      Improvement

        @@ -814,7 +948,7 @@
      • [PHPBB3-10186] - UCP signature panel displays when not authed for signatures
      - +

      New Feature

      - +

      Task

        @@ -864,7 +998,7 @@
      • [PHPBB3-10107] - Improve docs for non-apache webserver configuration
      - +

      Sub-task

        @@ -877,7 +1011,7 @@
      -

      1.v. Changes since 3.0.7-PL1

      +

      1.vi. Changes since 3.0.7-PL1

      Security

        @@ -1335,13 +1469,13 @@
      -

      1.vi. Changes since 3.0.7

      +

      1.vii. Changes since 3.0.7

      • [Sec] Do not expose forum content of forums with ACL entries but no actual permission in ATOM Feeds. (Bug #58595)
      -

      1.vii. Changes since 3.0.6

      +

      1.viii. Changes since 3.0.6

      • [Fix] Allow ban reason and length to be selected and copied in ACP and subsilver2 MCP. (Bug #51095)
        • @@ -1445,7 +1579,7 @@
      -

      1.viii. Changes since 3.0.5

      +

      1.ix. Changes since 3.0.5

      • [Fix] Allow whitespaces in avatar gallery names. (Bug #44955)
        • @@ -1667,7 +1801,7 @@
      • [Feature] Send anonymous statistical information to phpBB on installation and update (optional).
      -

      1.ix. Changes since 3.0.4

      +

      1.x. Changes since 3.0.4

      • [Fix] Delete user entry from ban list table upon user deletion (Bug #40015 - Patch by TerraFrost)
        • @@ -1756,7 +1890,7 @@
      • [Sec] Only use forum id supplied for posting if global announcement detected. (Reported by nickvergessen)
      -

      1.x. Changes since 3.0.3

      +

      1.xi. Changes since 3.0.3

      • [Fix] Allow mixed-case template directories to be inherited (Bug #36725)
        • @@ -1788,7 +1922,7 @@
      • [Sec] Ask for forum password if post within passworded forum quoted in private message. (Reported by nickvergessen)
      -

      1.xi. Changes since 3.0.2

      +

      1.xii. Changes since 3.0.2

      • [Fix] Correctly set topic starter if first post in topic removed (Bug #30575 - Patch by blueray2048)
        • @@ -1887,7 +2021,7 @@
      • [Sec Precaution] Stricter validation of the HTTP_HOST header (Thanks to Techie-Micheal et al for pointing out possible issues in derived code)
      -

      1.xii. Changes since 3.0.1

      +

      1.xiii. Changes since 3.0.1

      • [Fix] Ability to set permissions on non-mysql dbms (Bug #24955)
        • @@ -1935,7 +2069,7 @@
      • [Sec] Only allow urls gone through redirect() being used within login_box(). (thanks nookieman)
      -

      1.xiii Changes since 3.0.0

      +

      1.xiv Changes since 3.0.0

      • [Change] Validate birthdays (Bug #15004)
        • @@ -2006,7 +2140,7 @@
      • [Fix] Find and display colliding usernames correctly when converting from one database to another (Bug #23925)
      -

      1.xiv. Changes since 3.0.RC8

      +

      1.xv. Changes since 3.0.RC8

      • [Fix] Cleaned usernames contain only single spaces, so "a_name" and "a__name" are treated as the same name (Bug #15634)
        • @@ -2015,7 +2149,7 @@
      • [Fix] Call garbage_collection() within database updater to correctly close connections (affects Oracle for example)
      -

      1.xv. Changes since 3.0.RC7

      +

      1.xvi. Changes since 3.0.RC7

      • [Fix] Fixed MSSQL related bug in the update system
        • @@ -2050,7 +2184,7 @@
      • [Fix] No duplication of active topics (Bug #15474)
      -

      1.xvi. Changes since 3.0.RC6

      +

      1.xvii. Changes since 3.0.RC6

      • [Fix] Submitting language changes using acp_language (Bug #14736)
        • @@ -2060,7 +2194,7 @@
      • [Fix] Able to request new password (Bug #14743)
      -

      1.xvii. Changes since 3.0.RC5

      +

      1.xviii. Changes since 3.0.RC5

      • [Feature] Removing constant PHPBB_EMBEDDED in favor of using an exit_handler(); the constant was meant to achive this more or less.
        • @@ -2123,7 +2257,7 @@
      • [Sec] New password hashing mechanism for storing passwords (#i42)
      -

      1.xviii. Changes since 3.0.RC4

      +

      1.xix. Changes since 3.0.RC4

      • [Fix] MySQL, PostgreSQL and SQLite related database fixes (Bug #13862)
        • @@ -2174,7 +2308,7 @@
      • [Fix] odbc_autocommit causing existing result sets to be dropped (Bug #14182)
      -

      1.xix. Changes since 3.0.RC3

      +

      1.xx. Changes since 3.0.RC3

      • [Fix] Fixing some subsilver2 and prosilver style issues
        • @@ -2283,7 +2417,7 @@
      -

      1.xx. Changes since 3.0.RC2

      +

      1.xxi. Changes since 3.0.RC2

      • [Fix] Re-allow searching within the memberlist
        • @@ -2329,7 +2463,7 @@
      -

      1.xxi. Changes since 3.0.RC1

      +

      1.xxii. Changes since 3.0.RC1

      • [Fix] (X)HTML issues within the templates (Bug #11255, #11255)
        • -- cgit v1.2.1 From 14585fcb4f1d6238a188089891a11895a557f99e Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Wed, 21 Jan 2015 15:15:30 +0100 Subject: [develop-olympus] Increment version number to 3.0.14-dev. --- build/build.xml | 6 +++--- phpBB/includes/constants.php | 2 +- phpBB/install/database_update.php | 2 +- phpBB/install/schemas/schema_data.sql | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build/build.xml b/build/build.xml index e3ca10675c..6b646af70b 100644 --- a/build/build.xml +++ b/build/build.xml @@ -2,9 +2,9 @@ - - - + + + diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index 4b1a8f154b..b0e814cc6a 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -25,7 +25,7 @@ if (!defined('IN_PHPBB')) */ // phpBB Version -define('PHPBB_VERSION', '3.0.13-RC1'); +define('PHPBB_VERSION', '3.0.14-dev'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 15f9c589d3..8e5b5969ad 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -8,7 +8,7 @@ * */ -define('UPDATES_TO_VERSION', '3.0.13-RC1'); +define('UPDATES_TO_VERSION', '3.0.14-dev'); // Enter any version to update from to test updates. The version within the db will not be updated. define('DEBUG_FROM_VERSION', false); diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index bdfc34dffd..3e6dc95853 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -246,7 +246,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('topics_per_page', INSERT INTO phpbb_config (config_name, config_value) VALUES ('tpl_allow_php', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.13-RC1'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.14-dev'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400'); -- cgit v1.2.1