From 127c0c449315572f8859944815b4699f6303975c Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 24 Jan 2014 10:28:09 +0100 Subject: [PATCH 1/5] [prep-release-3.1.0-a3] Update version to 3.1.0-a3 --- 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 c65c71d2dc..9f122b8b4d 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 855b6ff187..883fcd3eb6 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-a3-dev'); +define('PHPBB_VERSION', '3.1.0-a3'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index dd4ef13e49..c8de3d3b23 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', + 'phpbb_version' => '3.1.0-a3', 'author' => 'phpBB Group', 'dbms' => $dbms, 'dbhost' => $dbhost, diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 8a16526f36..9354e5746c 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-a3-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.0-a3'); 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 aef7a3b12a..50755cdbe5 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-a2 -phpbb_version = 3.1.0-a2 +style_version = 3.1.0-a3 +phpbb_version = 3.1.0-a3 # Defining a different template bitfield # template_bitfield = lNg= diff --git a/phpBB/styles/subsilver2/style.cfg b/phpBB/styles/subsilver2/style.cfg index b588567153..19441b43ba 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-a2 -phpbb_version = 3.1.0-a2 +style_version = 3.1.0-a3 +phpbb_version = 3.1.0-a3 # Defining a different template bitfield # template_bitfield = lNg= From 7f70a73634b355f07b59d81fec082075d16c18b4 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 24 Jan 2014 10:32:17 +0100 Subject: [PATCH 2/5] [prep-release-3.1.0-a3] Add migration for 3.1.0-a3 --- phpBB/phpbb/db/migration/data/v310/alpha3.php | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 phpBB/phpbb/db/migration/data/v310/alpha3.php diff --git a/phpBB/phpbb/db/migration/data/v310/alpha3.php b/phpBB/phpbb/db/migration/data/v310/alpha3.php new file mode 100644 index 0000000000..4bd2231bb9 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v310/alpha3.php @@ -0,0 +1,30 @@ + Date: Fri, 24 Jan 2014 10:37:30 +0100 Subject: [PATCH 3/5] [prep-release-3.1.0-a3] Prepare Changelog --- phpBB/docs/CHANGELOG.html | 49 +++++++++++++++++++++------------------ 1 file changed, 26 insertions(+), 23 deletions(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index b10d2772a2..c61d78bc4e 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -46,6 +46,7 @@
  1. Changelog
      +
    1. Changes since 3.1.0-a2
    2. Changes since 3.1.0-a1
    3. Changes since 3.0.x
    4. Changes since 3.0.11
      5. @@ -88,7 +89,9 @@
      -

      1.i. Changes since 3.1.0-a1

      +

      1.i. Changes since 3.1.0-a2

      + +

      1.ii. Changes since 3.1.0-a1

      Bug

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

      1.ii. Changes since 3.0.x

      +

      1.iii. Changes since 3.0.x

      Bug

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

      1.iii. Changes since 3.0.11

      +

      1.iv. Changes since 3.0.11

      Bug

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

      1.iv. Changes since 3.0.10

      +

      1.v. Changes since 3.0.10

      Bug

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

      1.v. Changes since 3.0.9

      +

      1.vi. Changes since 3.0.9

      Bug

        @@ -1261,7 +1264,7 @@
      • [PHPBB3-10480] - Automate changelog building
      -

      1.vi. Changes since 3.0.8

      +

      1.vii. Changes since 3.0.8

      Bug

      @@ -1629,7 +1632,7 @@ -

      1.vii. Changes since 3.0.7-PL1

      +

      1.viii. Changes since 3.0.7-PL1

      Security

        @@ -2087,13 +2090,13 @@
      -

      1.viii. Changes since 3.0.7

      +

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

      +

      1.x. Changes since 3.0.6

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

      1.x. Changes since 3.0.5

      +

      1.xi. Changes since 3.0.5

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

      1.xi. Changes since 3.0.4

      +

      1.xii. Changes since 3.0.4

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

      1.xii. Changes since 3.0.3

      +

      1.xiii. Changes since 3.0.3

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

      1.xiii. Changes since 3.0.2

      +

      1.xiv. Changes since 3.0.2

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

      +

      1.xv. Changes since 3.0.1

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

      1.xv Changes since 3.0.0

      +

      1.xvi. Changes since 3.0.0

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

      1.xvi. Changes since 3.0.RC8

      +

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

      1.xvii. Changes since 3.0.RC7

      +

      1.xviii. Changes since 3.0.RC7

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

      1.xviii. Changes since 3.0.RC6

      +

      1.xix. Changes since 3.0.RC6

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

      1.xix. Changes since 3.0.RC5

      +

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

      1.xx. Changes since 3.0.RC4

      +

      1.xxi. Changes since 3.0.RC4

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

      1.xxi. Changes since 3.0.RC3

      +

      1.xxii. Changes since 3.0.RC3

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

      1.xxii. Changes since 3.0.RC2

      +

      1.xxiii. Changes since 3.0.RC2

      • [Fix] Re-allow searching within the memberlist
        • @@ -3081,7 +3084,7 @@
      -

      1.xxiii. Changes since 3.0.RC1

      +

      1.xxiv. Changes since 3.0.RC1

      • [Fix] (X)HTML issues within the templates (Bug #11255, #11255)
        • From 11d5f49adb86fdd7fb7a94efeffadc55a4b243a0 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 24 Jan 2014 13:40:45 +0100 Subject: [PATCH 4/5] [prep-release-3.1.0-a3] Commit changelog for 3.1.0-a3 --- phpBB/docs/CHANGELOG.html | 106 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index c61d78bc4e..1ce5f29a72 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -91,6 +91,112 @@

        1.i. Changes since 3.1.0-a2

        +

        Bug

        +
          +
        • [PHPBB3-10810] - Manage group in ucp requires access to adm/
          • +
        • [PHPBB3-11246] - Misleading Message in New User Pruning Feature
          • +
        • [PHPBB3-11484] - Topic Reply Notification email links not requiring user to log in
          • +
        • [PHPBB3-11507] - Impossible to prune users by group only
          • +
        • [PHPBB3-11672] - AJAX alerts contain unnecessary messages/links
          • +
        • [PHPBB3-11709] - Bulletin points in navigation menu are misaligned in RTL languages
          • +
        • [PHPBB3-11842] - Avatar driver error thrown when creating group
          • +
        • [PHPBB3-11856] - Require composer.json for extensions
          • +
        • [PHPBB3-11859] - Avatar drivers should return template filename
          • +
        • [PHPBB3-11869] - Strict debug message when registering with profile fields displayed
          • +
        • [PHPBB3-11911] - ACP should warn if there is no search index created for the selected search engine
          • +
        • [PHPBB3-11912] - "Unable to guess the mime type as no guessers are available" when uploading files
          • +
        • [PHPBB3-11914] - plupload should be updated to 2.0.x
          • +
        • [PHPBB3-11915] - plupload should be restyled to match the design of prosilver better
          • +
        • [PHPBB3-11959] - List of users in notifications should be trimmed
          • +
        • [PHPBB3-11963] - Stale MCP notifications get left behind
          • +
        • [PHPBB3-11984] - Ticket for more bugs/improvements for responsive design for both prosilver and ACP
          • +
        • [PHPBB3-11988] - Active tab in ACP should not have hover effect
          • +
        • [PHPBB3-11997] - redirect() does not work for app.php/xyz pages
          • +
        • [PHPBB3-12001] - User input is ignored in AJAX confirmation forms
          • +
        • [PHPBB3-12006] - Disabled Extensions with Modules can break the ACP/UCP/MCP
          • +
        • [PHPBB3-12009] - Incorrectly installed extensions should be ignored
          • +
        • [PHPBB3-12011] - RTL languages have style bugs in prosilver/ACP
          • +
        • [PHPBB3-12015] - Enhance events in viewtopic to increase their usability
          • +
        • [PHPBB3-12026] - Unable to find template - in MCP/UCP, which are added via extensions
          • +
        • [PHPBB3-12027] - Redis tests failing
          • +
        • [PHPBB3-12028] - Don't use L_COLON in a JavaScript context
          • +
        • [PHPBB3-12030] - Include config directory completely in update packages when one file is being updated
          • +
        • [PHPBB3-12032] - Certain notifications incorrectly inherit read status from post/topic
          • +
        • [PHPBB3-12036] - Module Management items have 2 move down buttons and no up
          • +
        • [PHPBB3-12038] - Move up/down buttons are not AJAXified in various ACP pages.
          • +
        • [PHPBB3-12040] - ACP tabs flicker when AJAX background appears
          • +
        • [PHPBB3-12042] - Several strings of plupload are not being translated
          • +
        • [PHPBB3-12045] - Several HTML markup issues in adm/style/acp_prune_users.html
          • +
        • [PHPBB3-12049] - PLUPLOAD_ERR_UPLOAD_LIMIT should be using plurals
          • +
        • [PHPBB3-12050] - phpbb_notification_submit_post_base should be abstract
          • +
        • [PHPBB3-12055] - ACP BBCodes/Smilies Row Color Changes Needed After AJAX operations
          • +
        • [PHPBB3-12058] - Updating database fails in migration v310/avatar_types.php
          • +
        • [PHPBB3-12059] - ACP INCLUDECSS not working, missing {$STYLESHEETS}
          • +
        • [PHPBB3-12062] - INCLUDEJS broken for extension events in the ACP
          • +
        • [PHPBB3-12063] - <tr> tags use invalid valign attribute
          • +
        • [PHPBB3-12077] - General Error thrown when submitting ACP language pack editor
          • +
        • [PHPBB3-12079] - request.untrimmed_variable() $multibyte param does not have default value
          • +
        • [PHPBB3-12091] - Plupload - File upload does not work in Internet Explorer 11
          • +
        • [PHPBB3-12092] - Plupload - File info missing for several uploaded files
          • +
        • [PHPBB3-12095] - IE11 JavaScript plupload error
          • +
        • [PHPBB3-12096] - Not using plurals correctly in search.php MAX_NUM_SEARCH_KEYWORDS_REFINE
          • +
        • [PHPBB3-12100] - ACP Template files not purged during Extension Enable/Disable
          • +
        • [PHPBB3-12107] - Log table name is hard-coded in log.get_logs()
          • +
        • [PHPBB3-12110] - Update Plupload to 2.1.1
          • +
        • [PHPBB3-12123] - No category specified for soft-delete permission
          • +
        • [PHPBB3-12124] - Plupload broken on IE8
          • +
        • [PHPBB3-12125] - Topic rows are missing background in IE8
          • +
        • [PHPBB3-12131] - prosilver viewtopic print view has invalid imageset var
          • +
        • [PHPBB3-12140] - Avoid endless loop in build script
          • +
        • [PHPBB3-12141] - Travis tests fail on 5.5
          • +
        • [PHPBB3-12151] - Class 'phpbb\profilefields\profilefields' not found
          • +
        • [PHPBB3-12154] - DB Schema not built with develop script
          • +
        • [PHPBB3-12156] - Passwords Manager ~ Bug with OAuth
          • +
        • [PHPBB3-12159] - Fix code sniffer complaints after profilefields and passwords merge
          • +
        • [PHPBB3-12161] - build/save directories are no longer created
          • +
        • [PHPBB3-12162] - Binary files missing from update packages
          • +
        • [PHPBB3-12163] - Page number in viewtopic page title is incorrect
          • +
        +

        Improvement

        +
          +
        • [PHPBB3-10910] - function build_cfg_template() allow $size for $tpl_type = select
          • +
        • [PHPBB3-11346] - Do not show "Mark topics as read" when there are no topics
          • +
        • [PHPBB3-11849] - Move pagination from functions.php into class
          • +
        • [PHPBB3-11950] - Add 'I forgot my password' link to index page login form
          • +
        • [PHPBB3-11961] - Plupload is not updating uploaded files panel
          • +
        • [PHPBB3-11966] - Add Template Event overall_header_navigation_prepend/append to Subsilver2
          • +
        • [PHPBB3-11969] - Link topic title to unread post instead of first post
          • +
        • [PHPBB3-11979] - Add basic dropdown menu framework to prosilver
          • +
        • [PHPBB3-12005] - Remove code responsible for PM popup completely
          • +
        • [PHPBB3-12010] - Navbar icons should be clickable
          • +
        • [PHPBB3-12014] - Add template event "index_body_forumlist_before"
          • +
        • [PHPBB3-12024] - Add Template Event overall_header_content_before and overall_footer_content_after
          • +
        • [PHPBB3-12034] - AJAXify notifications popup
          • +
        • [PHPBB3-12054] - Improve Index Body Template Events
          • +
        • [PHPBB3-12060] - Add BBCode system core and template events
          • +
        • [PHPBB3-12069] - Add PHP event core.submit_post_modify_return_url in submit_post()
          • +
        • [PHPBB3-12104] - Shadowtopics SQL used in core event should use the SQL builder
          • +
        • [PHPBB3-12135] - editor.js function bbfontstyle()
          • +
        • [PHPBB3-12146] - Add color demo when editing a group from the UCP
          • +
        +

        New Feature

        + +

        Sub-task

        +
          +
        • [PHPBB3-11241] - Improve user interface for mass attachment downloader (all posts, all topics)
          • +
        • [PHPBB3-12111] - Extract profile field types to individual classes
          • +
        +

        Task

        +
          +
        • [PHPBB3-11432] - Travis should complain when CRLF files are added.
          • +
        • [PHPBB3-11509] - Travis should check commit message format
          • +
        • [PHPBB3-11985] - Enable APC module on Travis to run APC Cache tests
          • +
        • [PHPBB3-12064] - Remove obsolete viewsource.html from adm/style folder
          • +
        • [PHPBB3-12147] - Remove Travis CI notification configuration
          • +
        +

        1.ii. Changes since 3.1.0-a1

        Bug

        From bf93e20afb7a047dbdc848e808feac5788752ff7 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 5 Feb 2014 22:23:33 +0100 Subject: [PATCH 5/5] [prep-release-3.1.0-a3] Update version to 3.1.0-a4-dev for future development --- build/build.xml | 2 +- phpBB/includes/constants.php | 2 +- phpBB/install/schemas/schema_data.sql | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/build.xml b/build/build.xml index 9f122b8b4d..1022565ff0 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 883fcd3eb6..374b8ff7f7 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-a3'); +define('PHPBB_VERSION', '3.1.0-a4-dev'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 9354e5746c..9f198595e0 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-a3'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.0-a4-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');