From 6ee05d369e5aa0acb307bf88f0ac15fb33aade2b Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 13 Nov 2013 17:50:57 +0100 Subject: [PATCH 1/5] [prep-release-3.1.0-a2] Update version to 3.1.0-a2 --- build/build.xml | 6 +++--- 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, 10 insertions(+), 10 deletions(-) diff --git a/build/build.xml b/build/build.xml index 0a5448f98d..ebc1f0be8b 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 e1da41d106..546cd9e6d4 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-a2-dev'); +define('PHPBB_VERSION', '3.1.0-a2'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index de4e04a8e5..dd4ef13e49 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-a2-dev', + 'phpbb_version' => '3.1.0-a2', 'author' => 'phpBB Group', 'dbms' => $dbms, 'dbhost' => $dbhost, diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 095415b175..355dec2a54 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-a2-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.0-a2'); 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 aac9d993f5..aef7a3b12a 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-a1 -phpbb_version = 3.1.0-a1 +style_version = 3.1.0-a2 +phpbb_version = 3.1.0-a2 # Defining a different template bitfield # template_bitfield = lNg= diff --git a/phpBB/styles/subsilver2/style.cfg b/phpBB/styles/subsilver2/style.cfg index 1d50352885..b588567153 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-a1 -phpbb_version = 3.1.0-a1 +style_version = 3.1.0-a2 +phpbb_version = 3.1.0-a2 # Defining a different template bitfield # template_bitfield = lNg= From 7678186b0907e0852eabcd1f4ed2041a8a45060d Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 13 Nov 2013 23:19:47 +0100 Subject: [PATCH 2/5] [prep-release-3.1.0-a2] Add migration for 3.1.0-a2 --- phpBB/phpbb/db/migration/data/v310/alpha2.php | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 phpBB/phpbb/db/migration/data/v310/alpha2.php diff --git a/phpBB/phpbb/db/migration/data/v310/alpha2.php b/phpBB/phpbb/db/migration/data/v310/alpha2.php new file mode 100644 index 0000000000..3c0853f924 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v310/alpha2.php @@ -0,0 +1,28 @@ + Date: Mon, 18 Nov 2013 12:07:11 +0100 Subject: [PATCH 3/5] [prep-release-3.1.0-a2] Prepare Changelog --- phpBB/docs/CHANGELOG.html | 47 +++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 7c96dd1b78..47a5100c26 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -46,6 +46,7 @@
  1. Changelog
      +
    1. Changes since 3.1.0-a1
    2. Changes since 3.0.x
    3. Changes since 3.0.11
    4. Changes since 3.0.10
      5. @@ -87,7 +88,9 @@
      -

      1.i. Changes since 3.0.x

      +

      1.i. Changes since 3.1.0-a1

      + +

      1.ii. Changes since 3.0.x

      Bug

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

      1.ii. Changes since 3.0.11

      +

      1.iii. Changes since 3.0.11

      Bug

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

      1.iii. Changes since 3.0.10

      +

      1.iv. Changes since 3.0.10

      Bug

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

      1.iv. Changes since 3.0.9

      +

      1.v. Changes since 3.0.9

      Bug

        @@ -1184,7 +1187,7 @@
      • [PHPBB3-10480] - Automate changelog building
      -

      1.v. Changes since 3.0.8

      +

      1.vi. Changes since 3.0.8

      Bug

      @@ -1552,7 +1555,7 @@ -

      1.vi. Changes since 3.0.7-PL1

      +

      1.vii. Changes since 3.0.7-PL1

      Security

        @@ -2010,13 +2013,13 @@
      -

      1.vii. Changes since 3.0.7

      +

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

      +

      1.ix. Changes since 3.0.6

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

      1.ix. Changes since 3.0.5

      +

      1.x. Changes since 3.0.5

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

      1.x. Changes since 3.0.4

      +

      1.xi. Changes since 3.0.4

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

      1.xi. Changes since 3.0.3

      +

      1.xii. Changes since 3.0.3

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

      1.xii. Changes since 3.0.2

      +

      1.xiii. Changes since 3.0.2

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

      +

      1.xiv. Changes since 3.0.1

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

      1.xiv Changes since 3.0.0

      +

      1.xv Changes since 3.0.0

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

      1.xv. Changes since 3.0.RC8

      +

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

      1.xvi. Changes since 3.0.RC7

      +

      1.xvii. Changes since 3.0.RC7

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

      1.xvii. Changes since 3.0.RC6

      +

      1.xviii. Changes since 3.0.RC6

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

      1.xviii. Changes since 3.0.RC5

      +

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

      1.xix. Changes since 3.0.RC4

      +

      1.xx. Changes since 3.0.RC4

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

      1.xx. Changes since 3.0.RC3

      +

      1.xxi. Changes since 3.0.RC3

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

      1.xxi. Changes since 3.0.RC2

      +

      1.xxii. Changes since 3.0.RC2

      • [Fix] Re-allow searching within the memberlist
        • @@ -3004,7 +3007,7 @@
      -

      1.xxii. Changes since 3.0.RC1

      +

      1.xxiii. Changes since 3.0.RC1

      • [Fix] (X)HTML issues within the templates (Bug #11255, #11255)
        • From e74b5ac9e3ac0814f49fdf26a7205968d6b6581d Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Mon, 18 Nov 2013 12:07:59 +0100 Subject: [PATCH 4/5] [prep-release-3.1.0-a2] Add changelog for alpha2 --- phpBB/docs/CHANGELOG.html | 74 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 47a5100c26..b10d2772a2 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -90,6 +90,80 @@

        1.i. Changes since 3.1.0-a1

        +

        Bug

        +
          +
        • [PHPBB3-4776] - Long post gets hidden behind posting profile
          • +
        • [PHPBB3-10449] - Lines spilling in subscriptions view
          • +
        • [PHPBB3-10948] - Color swatch in 3.1 does not display properly
          • +
        • [PHPBB3-11030] - I beam cursor in prosilver when hovering on browse button for uploading attachments
          • +
        • [PHPBB3-11073] - Reported/Unapproved moderator information in viewtopic is striked through instead of underlined
          • +
        • [PHPBB3-11138] - Resync features in ACP should not use AJAX
          • +
        • [PHPBB3-11280] - Double clicking "mark topics read" produces an error the second time
          • +
        • [PHPBB3-11525] - phpbb_avatar_manager::clean_row collapses user_id and group_id
          • +
        • [PHPBB3-11534] - Remote avatar does not properly check if remote file is an image
          • +
        • [PHPBB3-11626] - Auth ACP options should be moved to separate html file
          • +
        • [PHPBB3-11663] - In generate_text_for_storage the function does not check for errors of parse_message:parse() and act accordingly
          • +
        • [PHPBB3-11691] - Soft delete migration conversion should be staggered
          • +
        • [PHPBB3-11739] - Wrong name for UCP Module "Edit "Remember Me" login keys"
          • +
        • [PHPBB3-11842] - Create a new group Error with avatar driver
          • +
        • [PHPBB3-11857] - Avatar manager must not depend on entire container
          • +
        • [PHPBB3-11872] - MCP: Users with most warnings list is invalid
          • +
        • [PHPBB3-11896] - "Mark all notifications read" does not work
          • +
        • [PHPBB3-11899] - New ajax poll vote should give feedback while waiting for servers response
          • +
        • [PHPBB3-11916] - Remove files from hidden attach list after deletion
          • +
        • [PHPBB3-11922] - Migrator fails to remove columns on MSSQL when they have/had an index
          • +
        • [PHPBB3-11923] - UCP avatar error when user has no permissions to change his/her avatar
          • +
        • [PHPBB3-11924] - Add a script to export the events in wiki format
          • +
        • [PHPBB3-11926] - Plupload Migration has a broken dependency.
          • +
        • [PHPBB3-11927] - Missing Files after 3.1.0-A1 Automatic Updater
          • +
        • [PHPBB3-11930] - Avatar paths are incorrect when using app.php
          • +
        • [PHPBB3-11935] - Invalid HTML in "Sort By" form elements in Prosilver
          • +
        • [PHPBB3-11936] - Fixes to Notifications Window
          • +
        • [PHPBB3-11939] - Quick reply editor has unnecessary data-ajax attribute
          • +
        • [PHPBB3-11943] - $VAR = false has unexpected result
          • +
        • [PHPBB3-11945] - Focused buttons are hard to notice
          • +
        • [PHPBB3-11947] - Notification popup does not appear when clicking number in text
          • +
        • [PHPBB3-11948] - Extensions should be allowed to have more then 1 routing file
          • +
        • [PHPBB3-11949] - cannot upgrade to 3.1
          • +
        • [PHPBB3-11960] - Responsive design removed teampage names
          • +
        • [PHPBB3-11972] - Add template event posting_editor_subject_after
          • +
        • [PHPBB3-11977] - Ajax delete should disable moving options
          • +
        • [PHPBB3-11982] - Navigation is shown above AJAX background in ACP
          • +
        • [PHPBB3-11983] - Subscriptions argument missing from docblock in ucp_notifications
          • +
        • [PHPBB3-11986] - Undefined index: poster_id in file.php
          • +
        • [PHPBB3-11987] - {ROOT_PATH} in ACP leads to adm/
          • +
        • [PHPBB3-11990] - Remove result_mssqlnative from acp_database
          • +
        • [PHPBB3-11991] - PHP notices when closing reported posts entries in MCP
          • +
        • [PHPBB3-11992] - Wrong variable to close "Users with most warnings" block at MCP
          • +
        • [PHPBB3-11994] - Admin options for extensions are bad/misleading
          • +
        • [PHPBB3-11995] - Reverting a config.remove fails
          • +
        • [PHPBB3-12002] - Extension management page should use generate/check link hash
          • +
        • [PHPBB3-12007] - Default last_result of callable steps must be integer instead of false
          • +
        • [PHPBB3-12008] - "Prune notifications" cron task always ran, blocking others
          • +
        • [PHPBB3-12016] - Event listeners should be services
          • +
        • [PHPBB3-12017] - Extension tests are broken on current develop
          • +
        • [PHPBB3-12018] - Use path_helper for admin style CSS in sql report
          • +
        • [PHPBB3-12023] - New css files missing after update
          • +
        +

        Improvement

        +
          +
        • [PHPBB3-11552] - Responsive design for prosilver
          • +
        • [PHPBB3-11746] - Add "account activation required" notification for Administrators
          • +
        • [PHPBB3-11921] - Improve Notifications and PMs in the header
          • +
        • [PHPBB3-11928] - Replace AJAX loading info pop up with animation
          • +
        • [PHPBB3-11957] - Responsive design for admin control panel
          • +
        • [PHPBB3-11973] - Remove logic from language files where possible
          • +
        • [PHPBB3-11974] - All timezones should be translatable
          • +
        • [PHPBB3-11975] - Add ACP link next to MCP
          • +
        +

        Task

        + +

        1.ii. Changes since 3.0.x

        Bug

        From d67341ea0054f2694880dc6c9fda01e6048e0ed3 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 19 Nov 2013 01:37:31 +0100 Subject: [PATCH 5/5] [prep-release-3.1.0-a2] Update version to 3.1.0-a3-dev in install and constant --- phpBB/includes/constants.php | 2 +- phpBB/install/schemas/schema_data.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index 546cd9e6d4..855b6ff187 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-a2'); +define('PHPBB_VERSION', '3.1.0-a3-dev'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 355dec2a54..8a16526f36 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-a2'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.0-a3-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');