From c0e0011b106c443055011b976843c79f8dcff36e Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 9 Jul 2014 22:57:23 +0200 Subject: [PATCH 1/5] [prep-release-3.1.0-RC2] Update version to 3.1.0-RC2 --- build/build.xml | 2 +- phpBB/includes/constants.php | 2 +- phpBB/install/convertors/convert_phpbb20.php | 2 +- phpBB/install/schemas/schema_data.sql | 2 +- phpBB/styles/prosilver/style.cfg | 4 ++-- phpBB/styles/subsilver2/style.cfg | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build/build.xml b/build/build.xml index 7d0068bec9..8f779a4b5d 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 2287639aee..c5070dde4e 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -28,7 +28,7 @@ if (!defined('IN_PHPBB')) */ // phpBB Version -define('PHPBB_VERSION', '3.1.0-RC2-dev'); +define('PHPBB_VERSION', '3.1.0-RC2'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index 4c6fa46190..696075b07c 100644 --- a/phpBB/install/convertors/convert_phpbb20.php +++ b/phpBB/install/convertors/convert_phpbb20.php @@ -38,7 +38,7 @@ $dbms = $phpbb_config_php_file->convert_30_dbms_to_31($dbms); $convertor_data = array( 'forum_name' => 'phpBB 2.0.x', 'version' => '1.0.3', - 'phpbb_version' => '3.1.0-RC1', + 'phpbb_version' => '3.1.0-RC2', 'author' => 'phpBB Limited', 'dbms' => $dbms, 'dbhost' => $dbhost, diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 572720ff95..6707d3b0f9 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -273,7 +273,7 @@ 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 ('use_system_cron', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.0-RC2-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.0-RC2'); 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'); diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg index b75207bd70..520b1f0e98 100644 --- a/phpBB/styles/prosilver/style.cfg +++ b/phpBB/styles/prosilver/style.cfg @@ -21,8 +21,8 @@ # General Information about this style name = prosilver copyright = © phpBB Limited, 2007 -style_version = 3.1.0-RC1 -phpbb_version = 3.1.0-RC1 +style_version = 3.1.0-RC2 +phpbb_version = 3.1.0-RC2 # Defining a different template bitfield # template_bitfield = lNg= diff --git a/phpBB/styles/subsilver2/style.cfg b/phpBB/styles/subsilver2/style.cfg index 9a0c77b627..633acf66e0 100644 --- a/phpBB/styles/subsilver2/style.cfg +++ b/phpBB/styles/subsilver2/style.cfg @@ -21,8 +21,8 @@ # General Information about this style name = subsilver2 copyright = © 2005 phpBB Limited -style_version = 3.1.0-RC1 -phpbb_version = 3.1.0-RC1 +style_version = 3.1.0-RC2 +phpbb_version = 3.1.0-RC2 # Defining a different template bitfield # template_bitfield = lNg= From 4449793b07fd5082c0849de47368c117efc74ca6 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 9 Jul 2014 23:00:47 +0200 Subject: [PATCH 2/5] [prep-release-3.1.0-RC2] Add migration for 3.1.0-RC2 --- phpBB/phpbb/db/migration/data/v310/rc2.php | 31 ++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 phpBB/phpbb/db/migration/data/v310/rc2.php diff --git a/phpBB/phpbb/db/migration/data/v310/rc2.php b/phpBB/phpbb/db/migration/data/v310/rc2.php new file mode 100644 index 0000000000..e1323659da --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v310/rc2.php @@ -0,0 +1,31 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +namespace phpbb\db\migration\data\v310; + +class rc2 extends \phpbb\db\migration\migration +{ + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v310\rc1', + ); + } + + public function update_data() + { + return array( + array('config.update', array('version', '3.1.0-RC2')), + ); + } +} From 166c3988ff927477cc8dfa74be60dc8122a80dc2 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 9 Jul 2014 23:03:30 +0200 Subject: [PATCH 3/5] [prep-release-3.1.0-RC2] Prepare Changelog --- phpBB/docs/CHANGELOG.html | 61 ++++++++++++++++++++------------------- 1 file changed, 32 insertions(+), 29 deletions(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 2a824fa9b7..bda254d084 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -46,6 +46,7 @@
  1. Changelog
      +
    1. Changes since 3.1.0-RC1
    2. Changes since 3.1.0-b4
    3. Changes since 3.1.0-b3
    4. Changes since 3.1.0-b2
      5. @@ -94,7 +95,9 @@
      -

      1.i. Changes since 3.1.0-b4

      +

      1.i. Changes since 3.1.0-RC1

      + +

      1.ii. Changes since 3.1.0-b4

      Bug

        @@ -214,7 +217,7 @@
      -

      1.ii. Changes since 3.1.0-b3

      +

      1.iii. Changes since 3.1.0-b3

      Bug

        @@ -321,7 +324,7 @@
      -

      1.iii. Changes since 3.1.0-b2

      +

      1.iv. Changes since 3.1.0-b2

      Bug

        @@ -486,7 +489,7 @@
      -

      1.iv. Changes since 3.1.0-b1

      +

      1.v. Changes since 3.1.0-b1

      Bug

        @@ -554,7 +557,7 @@
      • [PHPBB3-12302] - Upgrade composer.phar to 1.0.0-alpha8
      -

      1.v. Changes since 3.1.0-a3

      +

      1.vi. Changes since 3.1.0-a3

      Bug

        @@ -701,7 +704,7 @@
      -

      1.vi. Changes since 3.1.0-a2

      +

      1.vii. Changes since 3.1.0-a2

      Bug

        @@ -809,7 +812,7 @@
      • [PHPBB3-12147] - Remove Travis CI notification configuration
      -

      1.vii. Changes since 3.1.0-a1

      +

      1.viii. Changes since 3.1.0-a1

      Bug

        @@ -885,7 +888,7 @@
      • [PHPBB3-11998] - Add console / command line client environment
      -

      1.viii. Changes since 3.0.x

      +

      1.ix. Changes since 3.0.x

      Bug

        @@ -1566,7 +1569,7 @@
      • [PHPBB3-11913] - Apply reorganisation of download.phpbb.com to build_announcement.php
      -

      1.ix. Changes since 3.0.11

      +

      1.x. Changes since 3.0.11

      Bug

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

      1.x. Changes since 3.0.10

      +

      1.xi. Changes since 3.0.10

      Bug

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

      1.xi. Changes since 3.0.9

      +

      1.xii. Changes since 3.0.9

      Bug

        @@ -1982,7 +1985,7 @@
      • [PHPBB3-10480] - Automate changelog building
      -

      1.xii. Changes since 3.0.8

      +

      1.xiii. Changes since 3.0.8

      Bug

      @@ -2350,7 +2353,7 @@ -

      1.xiii. Changes since 3.0.7-PL1

      +

      1.xiv. Changes since 3.0.7-PL1

      Security

        @@ -2808,13 +2811,13 @@
      -

      1.xiv. Changes since 3.0.7

      +

      1.xv. 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.xv. Changes since 3.0.6

      +

      1.xvi. Changes since 3.0.6

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

      1.xvi. Changes since 3.0.5

      +

      1.xvii. Changes since 3.0.5

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

      1.xvii. Changes since 3.0.4

      +

      1.xviii. Changes since 3.0.4

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

      1.xviii. Changes since 3.0.3

      +

      1.xix. Changes since 3.0.3

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

      1.xix. Changes since 3.0.2

      +

      1.xx. Changes since 3.0.2

      • [Fix] Correctly set topic starter if first post in topic removed (Bug #30575 - Patch by blueray2048)
        • @@ -3360,7 +3363,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.xx. Changes since 3.0.1

      +

      1.xxi. Changes since 3.0.1

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

      1.xxi. Changes since 3.0.0

      +

      1.xxii. Changes since 3.0.0

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

      1.xxii. Changes since 3.0.RC8

      +

      1.xxiii. 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)
        • @@ -3488,7 +3491,7 @@
      • [Fix] Call garbage_collection() within database updater to correctly close connections (affects Oracle for example)
      -

      1.xxiii. Changes since 3.0.RC7

      +

      1.xxiv. Changes since 3.0.RC7

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

      1.xxiv. Changes since 3.0.RC6

      +

      1.xxv. Changes since 3.0.RC6

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

      1.xxv. Changes since 3.0.RC5

      +

      1.xxvi. 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.
        • @@ -3596,7 +3599,7 @@
      • [Sec] New password hashing mechanism for storing passwords (#i42)
      -

      1.xxvi. Changes since 3.0.RC4

      +

      1.xxvii. Changes since 3.0.RC4

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

      1.xxvii. Changes since 3.0.RC3

      +

      1.xxviii. Changes since 3.0.RC3

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

      1.xxviii. Changes since 3.0.RC2

      +

      1.xxix. Changes since 3.0.RC2

      • [Fix] Re-allow searching within the memberlist
        • @@ -3802,7 +3805,7 @@
      -

      1.xxix. Changes since 3.0.RC1

      +

      1.xxx. Changes since 3.0.RC1

      • [Fix] (X)HTML issues within the templates (Bug #11255, #11255)
        • From 4dc26274bfa799516d9b3bd3c7a296ef8b6141bb Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 11 Jul 2014 16:07:09 +0200 Subject: [PATCH 4/5] [prep-release-3.1.0-RC2] Add changelog for 3.1.0-RC2 --- phpBB/docs/CHANGELOG.html | 69 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index bda254d084..71971108b1 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -97,6 +97,75 @@

        1.i. Changes since 3.1.0-RC1

        +

        Bug

        +
          +
        • [PHPBB3-9801] - Users on custom pages outside the board directory are being displayed on Index page
          • +
        • [PHPBB3-11392] - "Make normal" in quickmod tool does not ajaxify correctly
          • +
        • [PHPBB3-12325] - Automatic update should notify about outdated files
          • +
        • [PHPBB3-12420] - Reduce config.php inclusions in DIC code
          • +
        • [PHPBB3-12446] - Unnecessary db connect - function phpbb_bootstrap_enabled_exts
          • +
        • [PHPBB3-12462] - Do not use string "None" for different avatar options
          • +
        • [PHPBB3-12515] - FULLTEXT_POSTGRES_TS_NOT_USABLE and FULLTEXT_POSTGRES_VERSION_CHECK_EXPLAIN redundant
          • +
        • [PHPBB3-12605] - Make dropdowns uniform
          • +
        • [PHPBB3-12674] - Last edited by in PMs doesn't show user colour
          • +
        • [PHPBB3-12680] - Contact icons in viewtopic are missing alternative text
          • +
        • [PHPBB3-12695] - Undefined index: MISSING_INLINE_ATTACHMENT notice given when viewing post details
          • +
        • [PHPBB3-12716] - Wrong method call in phpbb\auth\provider\oauth\token_storage
          • +
        • [PHPBB3-12759] - Profile fields lang value db queries can cause query flood
          • +
        • [PHPBB3-12760] - Post approval icon for wrong topics in Last Post column
          • +
        • [PHPBB3-12764] - Wrong error message on install if mysqli is selected and the credentials are wrong
          • +
        • [PHPBB3-12766] - Event exporter does not like RCx as version
          • +
        • [PHPBB3-12768] - 'NOTIFICATION_REPORT_CLOSED' entry has wrong indentation
          • +
        • [PHPBB3-12771] - Bug in \phpbb\db\migration\profilefield_base_migration when used in extensions
          • +
        • [PHPBB3-12772] - Fatal error when "Email topic" is used in topic tools
          • +
        • [PHPBB3-12773] - Fix language variable name in cli extension enable command
          • +
        • [PHPBB3-12774] - Undefined variable $phpbb_adm_relative_path in phpbb_create_install_container()
          • +
        • [PHPBB3-12781] - Template regex for DEFINE has problems when enclosed by other template conditionals
          • +
        • [PHPBB3-12783] - Remove require: phpbb/phpbb from Extensions composer.json files
          • +
        • [PHPBB3-12787] - Incorrect generated url when using ajax and routing
          • +
        • [PHPBB3-12788] - Update Symfony suite from 2.3.12 to 2.3.16
          • +
        • [PHPBB3-12790] - Always use the interface when available (and not directly the class)
          • +
        • [PHPBB3-12802] - Properly handle connection errors in SQLite3
          • +
        • [PHPBB3-12808] - Small gap between username and drop-down arrow
          • +
        • [PHPBB3-12810] - In acp_forums the displayed value for prune_shadow_freq is the value of prune_freq
          • +
        • [PHPBB3-12811] - Margin Bottom not taking effect in Safari with 101% height on same element
          • +
        • [PHPBB3-12815] - Members list link hidden from guests who have permission to view members list page
          • +
        • [PHPBB3-12816] - Fix comment about logs in user_ban function
          • +
        • [PHPBB3-12818] - Deleting a log entry in MCP produces a General error
          • +
        • [PHPBB3-12819] - Wrong text on hover over "Jump to page" field
          • +
        • [PHPBB3-12825] - Allow the extensions to be tested with the sniffer and skip the vendors
          • +
        • [PHPBB3-12830] - .postlink is in colours.css doubled, one should be deleted
          • +
        • [PHPBB3-12834] - Viewonline only matches routes
          • +
        • [PHPBB3-12839] - Missing stylesheet when it is not updated
          • +
        +

        Improvement

        +
          +
        • [PHPBB3-12013] - Quickmod tools and jumpbox should use new dropdown
          • +
        • [PHPBB3-12099] - path_helper returns wrong web root path for ajax requests
          • +
        • [PHPBB3-12196] - Referer vs Referrer in language files
          • +
        • [PHPBB3-12197] - Fix misleading FAQ entries
          • +
        • [PHPBB3-12334] - Add raw values of profile fields to template
          • +
        • [PHPBB3-12562] - Prosilver has no max-width
          • +
        • [PHPBB3-12645] - Update support links to 3.1 forums
          • +
        • [PHPBB3-12662] - Reorganize and modernize the header navbar
          • +
        • [PHPBB3-12735] - Remove all :link, :visited, :active link states
          • +
        • [PHPBB3-12777] - Rename extension status functions and add is_configured()
          • +
        • [PHPBB3-12779] - Change order of file lists on automatic update
          • +
        • [PHPBB3-12782] - Use an interface for the phpbb event_dispatcher
          • +
        • [PHPBB3-12784] - Allow the extensions to add a custom auto loader
          • +
        • [PHPBB3-12786] - Extend profilefield_base_migration.php class
          • +
        • [PHPBB3-12812] - Add a migrator tool for config_text database changes
          • +
        • [PHPBB3-12813] - Improve responsive pagination location and fix page-jump title
          • +
        • [PHPBB3-12823] - Remove trailing whitespace from CSS files
          • +
        • [PHPBB3-12824] - Move ACP & MCP links in the header to the end of the link list
          • +
        • [PHPBB3-12827] - Reorder quick-links
          • +
        +

        Task

        +
          +
        • [PHPBB3-12775] - Refactor functions_container into class container_builder
          • +
        • [PHPBB3-12829] - Remove check for pgsql 8.3/8.2
          • +
        +

        1.ii. Changes since 3.1.0-b4

        Bug

        From b5492a07da70be20ce64f9f9c080f58089b5ca9a Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 11 Jul 2014 17:22:16 +0200 Subject: [PATCH 5/5] [prep-release-3.1.0-RC2] Update phpBB Version for RC3 development --- build/build.xml | 6 +++--- phpBB/includes/constants.php | 2 +- phpBB/install/schemas/schema_data.sql | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/build.xml b/build/build.xml index 8f779a4b5d..3c1a3e4db4 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 c5070dde4e..cd4e19bf1d 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -28,7 +28,7 @@ if (!defined('IN_PHPBB')) */ // phpBB Version -define('PHPBB_VERSION', '3.1.0-RC2'); +define('PHPBB_VERSION', '3.1.0-RC3-dev'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 6707d3b0f9..9cc151f728 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -273,7 +273,7 @@ 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 ('use_system_cron', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.0-RC2'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.0-RC3-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');