From 254b7739a8fd30dd30385c7f0c3e4825ce5c4aa7 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Sat, 29 Mar 2014 21:43:35 +0100 Subject: [PATCH 1/5] [prep-release-3.1.0-b2] Update version to 3.1.0-b2 --- 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 10ff242ab9..9a765d6be5 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 fe23ed5a9a..69bc01c0f1 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -24,7 +24,7 @@ if (!defined('IN_PHPBB')) */ // phpBB Version -define('PHPBB_VERSION', '3.1.0-b2-dev'); +define('PHPBB_VERSION', '3.1.0-b2'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index e8c8a7431d..926f139da4 100644 --- a/phpBB/install/convertors/convert_phpbb20.php +++ b/phpBB/install/convertors/convert_phpbb20.php @@ -33,7 +33,7 @@ $dbms = phpbb_convert_30_dbms_to_31($dbms); $convertor_data = array( 'forum_name' => 'phpBB 2.0.x', 'version' => '1.0.3', - 'phpbb_version' => '3.1.0-b1', + 'phpbb_version' => '3.1.0-b2', 'author' => 'phpBB Group', 'dbms' => $dbms, 'dbhost' => $dbhost, diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 885093f1ed..c781f59945 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -269,7 +269,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-b2-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.0-b2'); 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 6b73b25a79..1beb32685c 100644 --- a/phpBB/styles/prosilver/style.cfg +++ b/phpBB/styles/prosilver/style.cfg @@ -18,8 +18,8 @@ # General Information about this style name = prosilver copyright = © phpBB Group, 2007 -style_version = 3.1.0-b1 -phpbb_version = 3.1.0-b1 +style_version = 3.1.0-b2 +phpbb_version = 3.1.0-b2 # Defining a different template bitfield # template_bitfield = lNg= diff --git a/phpBB/styles/subsilver2/style.cfg b/phpBB/styles/subsilver2/style.cfg index 438ced13f4..c534c30bb9 100644 --- a/phpBB/styles/subsilver2/style.cfg +++ b/phpBB/styles/subsilver2/style.cfg @@ -18,8 +18,8 @@ # General Information about this style name = subsilver2 copyright = © 2005 phpBB Group -style_version = 3.1.0-b1 -phpbb_version = 3.1.0-b1 +style_version = 3.1.0-b2 +phpbb_version = 3.1.0-b2 # Defining a different template bitfield # template_bitfield = lNg= From fdbe5e2f429404b56aaec655d805c68959a12b68 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Sat, 29 Mar 2014 21:57:03 +0100 Subject: [PATCH 2/5] [prep-release-3.1.0-b2] Add migration for 3.1.0-b2 --- phpBB/phpbb/db/migration/data/v310/beta2.php | 29 ++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 phpBB/phpbb/db/migration/data/v310/beta2.php diff --git a/phpBB/phpbb/db/migration/data/v310/beta2.php b/phpBB/phpbb/db/migration/data/v310/beta2.php new file mode 100644 index 0000000000..4cf29dfb3d --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v310/beta2.php @@ -0,0 +1,29 @@ + Date: Sat, 29 Mar 2014 22:09:08 +0100 Subject: [PATCH 3/5] [prep-release-3.1.0-b2] Prepare Changelog --- phpBB/docs/CHANGELOG.html | 53 +++++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 25 deletions(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 17f1327a96..50775ddaaa 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -46,6 +46,7 @@
  1. Changelog
      +
    1. Changes since 3.1.0-b1
    2. Changes since 3.1.0-a3
    3. Changes since 3.1.0-a2
    4. Changes since 3.1.0-a1
      5. @@ -90,7 +91,9 @@
      -

      1.i. Changes since 3.1.0-a3

      +

      1.i. Changes since 3.1.0-b1

      + +

      1.ii. Changes since 3.1.0-a3

      Bug

        @@ -237,7 +240,7 @@
      -

      1.ii. Changes since 3.1.0-a2

      +

      1.iii. Changes since 3.1.0-a2

      Bug

        @@ -345,7 +348,7 @@
      • [PHPBB3-12147] - Remove Travis CI notification configuration
      -

      1.iii. Changes since 3.1.0-a1

      +

      1.iv. Changes since 3.1.0-a1

      Bug

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

      1.iv. Changes since 3.0.x

      +

      1.v. Changes since 3.0.x

      Bug

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

      1.v. Changes since 3.0.11

      +

      1.vi. Changes since 3.0.11

      Bug

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

      1.vi. Changes since 3.0.10

      +

      1.vii. Changes since 3.0.10

      Bug

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

      1.vii. Changes since 3.0.9

      +

      1.viii. Changes since 3.0.9

      Bug

        @@ -1518,7 +1521,7 @@
      • [PHPBB3-10480] - Automate changelog building
      -

      1.viii. Changes since 3.0.8

      +

      1.ix. Changes since 3.0.8

      Bug

      @@ -1886,7 +1889,7 @@ -

      1.ix. Changes since 3.0.7-PL1

      +

      1.x. Changes since 3.0.7-PL1

      Security

        @@ -2344,13 +2347,13 @@
      -

      1.x. Changes since 3.0.7

      +

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

      +

      1.xii. Changes since 3.0.6

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

      1.xii. Changes since 3.0.5

      +

      1.xiii. Changes since 3.0.5

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

      1.xiii. Changes since 3.0.4

      +

      1.xiv. Changes since 3.0.4

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

      1.xiv. Changes since 3.0.3

      +

      1.xv. Changes since 3.0.3

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

      1.xv. Changes since 3.0.2

      +

      1.xvi. Changes since 3.0.2

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

      +

      1.xvii. Changes since 3.0.1

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

      1.xvii. Changes since 3.0.0

      +

      1.xviii. Changes since 3.0.0

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

      1.xviii. Changes since 3.0.RC8

      +

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

      1.xix. Changes since 3.0.RC7

      +

      1.xx. Changes since 3.0.RC7

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

      1.xx. Changes since 3.0.RC6

      +

      1.xxi. Changes since 3.0.RC6

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

      1.xxi. Changes since 3.0.RC5

      +

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

      1.xxii. Changes since 3.0.RC4

      +

      1.xxiii. Changes since 3.0.RC4

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

      1.xxiii. Changes since 3.0.RC3

      +

      1.xxiv. Changes since 3.0.RC3

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

      1.xxiv. Changes since 3.0.RC2

      +

      1.xxv. Changes since 3.0.RC2

      • [Fix] Re-allow searching within the memberlist
        • @@ -3338,7 +3341,7 @@
      -

      1.xxv. Changes since 3.0.RC1

      +

      1.xxvi. Changes since 3.0.RC1

      • [Fix] (X)HTML issues within the templates (Bug #11255, #11255)
        • From 120aa3685f13a3b2d6e3607134760bf6717ef5d6 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Sat, 29 Mar 2014 22:10:49 +0100 Subject: [PATCH 4/5] [prep-release-3.1.0-b2] Add changelog for 3.1.0-b2 --- phpBB/docs/CHANGELOG.html | 66 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 50775ddaaa..8499431f83 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -93,6 +93,72 @@

        1.i. Changes since 3.1.0-b1

        +

        Bug

        +
          +
        • [PHPBB3-8309] - Rename "Last visited" to "Last activity" on memberlist/viewprofile
          • +
        • [PHPBB3-9040] - Count HTML entities as single characters in Custom Profile fields
          • +
        • [PHPBB3-9725] - MSSQL Schema is not azure compatible
          • +
        • [PHPBB3-10769] - "ACP Access Denied" view includes ajax parts
          • +
        • [PHPBB3-11071] - User selection of an invalid style causes a general error
          • +
        • [PHPBB3-11357] - Invalid markup in installer
          • +
        • [PHPBB3-11959] - List of users in notifications should be trimmed
          • +
        • [PHPBB3-12031] - Bug language Notification list should trim users
          • +
        • [PHPBB3-12127] - Possible NOTIFICATION_QUOTE_TRIMMED miswording
          • +
        • [PHPBB3-12160] - Convert Page throws "invalid dbms driver" when no phpBB installation is present
          • +
        • [PHPBB3-12257] - MySQL Fulltext Tests are not run on Travis CI
          • +
        • [PHPBB3-12281] - Disable redis in travis setup on develop until redis fixes it
          • +
        • [PHPBB3-12292] - Buttons are mis-matched, unaligned in ACP Style Details
          • +
        • [PHPBB3-12293] - Core event listeners not working in log.php
          • +
        • [PHPBB3-12294] - phpbb_ in profile fields column names is incorrectly replaced with the table prefix
          • +
        • [PHPBB3-12297] - user_from column not deleted on update to b1
          • +
        • [PHPBB3-12310] - SMTP username and password should not autocomplete during install
          • +
        • [PHPBB3-12311] - Metadata Manager should require license instead of licence
          • +
        • [PHPBB3-12314] - HHVM SPL autoloader sometimes passes class name with leading backslash
          • +
        • [PHPBB3-12315] - NO_SEARCH_INDEX in language/en/acp/common.php uses invalid HTML
          • +
        • [PHPBB3-12316] - develop-ascraeus build status missing from "Automated Testing" section in README.md
          • +
        • [PHPBB3-12317] - Some notification tests fail on DBMS drivers using appropriate integer typing (MSSQL, Sqlite3, also MySQL on HHVM)
          • +
        • [PHPBB3-12321] - Remove execute bit from file ucp_main_subscribed.html and buttons.png in prosilver
          • +
        • [PHPBB3-12324] - Can not update from b1 to b2 because of missing install/update/new/config/ folder
          • +
        • [PHPBB3-12326] - Error while updating from b1 to b2 because of incomplete update files
          • +
        • [PHPBB3-12330] - Installation fails on MSSQL
          • +
        +

        Improvement

        +
          +
        • [PHPBB3-10174] - Rename "Ban usernames" to "Ban users" in ACP
          • +
        • [PHPBB3-10590] - Skip confirmation page after successful posting of an approved post
          • +
        • [PHPBB3-11169] - Move prune users from security to users category
          • +
        • [PHPBB3-11230] - Use @inheritdoc in docblocks in cache drivers
          • +
        • [PHPBB3-11239] - Include username before the Overview title.
          • +
        • [PHPBB3-11336] - Rename mode parameter from "leaders" to something more accurate for the "The team" page
          • +
        • [PHPBB3-11360] - page_header() argument "display_online_list" should be FALSE by default
          • +
        • [PHPBB3-11666] - POST_DELETED should refer to posts instead of messages
          • +
        • [PHPBB3-12035] - Add a link to user's posts in the ACP user overview page
          • +
        • [PHPBB3-12198] - Unused ERR_TEMPLATE_EVENT_* language strings in en/common.php
          • +
        • [PHPBB3-12268] - Extension finder should not crawl through .git/ of extensions
          • +
        • [PHPBB3-12269] - Delete "mods" folder from the language folder
          • +
        • [PHPBB3-12274] - Updater is using old version of adm/style/admin.css
          • +
        • [PHPBB3-12276] - Expand core.memberlist_view_profile event to include Zebra state
          • +
        • [PHPBB3-12278] - Add mcp.php core event to allow setting display options for custom MCP modules
          • +
        • [PHPBB3-12284] - Make Extension Details page more readable
          • +
        • [PHPBB3-12289] - Add viewtopic_body.html template event to allow custom post notices
          • +
        • [PHPBB3-12300] - Revert and Reimagine Link to last read posts
          • +
        • [PHPBB3-12304] - Add CSS class to rules-link container
          • +
        • [PHPBB3-12308] - Add Template Event forumlist_body_last_row_after
          • +
        • [PHPBB3-12309] - Add Template Event quickreply_editor_panel_before/after
          • +
        +

        New Feature

        +
          +
        • [PHPBB3-7580] - Allow isset() check in IF template syntax
          • +
        • [PHPBB3-12298] - Template Event memberlist_view_contact_before/after
          • +
        • [PHPBB3-12301] - Template Event overall_header_body_before
          • +
        +

        Task

        + +

        1.ii. Changes since 3.1.0-a3

        Bug

        From 45f2efea19280092da2d58f506c56aee4a998a9d Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Sun, 30 Mar 2014 22:53:09 +0200 Subject: [PATCH 5/5] [prep-release-3.1.0-b2] Prepare development of 3.1.0-b3 --- 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 9a765d6be5..3a2a66b113 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 69bc01c0f1..11bbcd4154 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -24,7 +24,7 @@ if (!defined('IN_PHPBB')) */ // phpBB Version -define('PHPBB_VERSION', '3.1.0-b2'); +define('PHPBB_VERSION', '3.1.0-b3-dev'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index c781f59945..4b1a369861 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -269,7 +269,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-b2'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.0-b3-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');