diff --git a/build/build.xml b/build/build.xml index de0f916a1f..3797ab6bf0 100644 --- a/build/build.xml +++ b/build/build.xml @@ -2,9 +2,9 @@ - - - + + + diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 3f6bd0ee51..559338f521 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -46,6 +46,7 @@
  1. Changelog
      +
    1. Changes since 3.1.0-RC5
    2. Changes since 3.1.0-RC4
    3. Changes since 3.1.0-RC3
    4. Changes since 3.1.0-RC2
      5. @@ -98,7 +99,44 @@
      -

      1.i. Changes since 3.1.0-RC4

      +

      1.i. Changes since 3.1.0-RC5

      + +

      Bug

      +
        +
      • [PHPBB3-12530] - Visual confirmation is breaking layout in prosilver's mobile mode
        • +
      • [PHPBB3-12568] - docs/README.html references MODs instead of extensions
        • +
      • [PHPBB3-13124] - PHP event extractor too strict on doc blocks
        • +
      • [PHPBB3-13138] - Banned users cause infinite recursion
        • +
      • [PHPBB3-13140] - Header links don't re-appear on window size increase
        • +
      • [PHPBB3-13161] - PHP Warnings issued from phpbb database test case
        • +
      • [PHPBB3-13163] - Header Navbar Responsiveness Broken
        • +
      • [PHPBB3-13164] - Data sent to core.submit_post_end event does not include fresh post_visibility
        • +
      • [PHPBB3-13168] - Warning displayed in PHP 5.6 for mbstring.http_input
        • +
      • [PHPBB3-13169] - Responsive forms not displaying correctly in RTL
        • +
      • [PHPBB3-13171] - Can not delete posts and soft delete topics in MCP topic view
        • +
      • [PHPBB3-13174] - Minor HTML error in ucp_pm_viewmessage.html (needs closing </div>)
        • +
      • [PHPBB3-13177] - Post count-based ranks do not display in viewtopic
        • +
      • [PHPBB3-13181] - Sphinx config template should use place holders for database credentials
        • +
      • [PHPBB3-13186] - Do not link post count to author search if search disabled
        • +
      • [PHPBB3-13187] - INSTALL.html is not valid HTML
        • +
      • [PHPBB3-13188] - Sphinx index() function triggers slow queries that time out replies
        • +
      • [PHPBB3-13190] - phpbb_session_login_keys_test::test_reset_keys fails on develop-ascraeus
        • +
      • [PHPBB3-13194] - BBCode isn't parsed when issuing a warning for a post
        • +
      • [PHPBB3-13203] - Use constant time comparison method for comparing password hashes
        • +
      +

      Improvement

      +
        +
      • [PHPBB3-12796] - View own Profile should have an edit button
        • +
      • [PHPBB3-12799] - Place the events for f_brunoais_read_other
        • +
      • [PHPBB3-13041] - help_faq.php language file needs to be revised
        • +
      +

      New Feature

      + + + +

      1.ii. Changes since 3.1.0-RC4

      Bug

        @@ -165,7 +203,7 @@
      • [PHPBB3-13123] - Add events to allow post blocking and post pre/past processing
      -

      1.ii. Changes since 3.1.0-RC3

      +

      1.iii. Changes since 3.1.0-RC3

      Bug

        @@ -255,7 +293,7 @@
      -

      1.iii. Changes since 3.1.0-RC2

      +

      1.iv. Changes since 3.1.0-RC2

      Bug

        @@ -379,7 +417,7 @@
      • [PHPBB3-12948] - Remove Travis CI "broken opcache on PHP 5.5.7 and 5.5.8" workaround.
      -

      1.iv. Changes since 3.1.0-RC1

      +

      1.v. Changes since 3.1.0-RC1

      Bug

        @@ -450,7 +488,7 @@
      • [PHPBB3-12829] - Remove check for pgsql 8.3/8.2
      -

      1.v. Changes since 3.1.0-b4

      +

      1.vi. Changes since 3.1.0-b4

      Bug

        @@ -570,7 +608,7 @@
      -

      1.vi. Changes since 3.1.0-b3

      +

      1.vii. Changes since 3.1.0-b3

      Bug

        @@ -677,7 +715,7 @@
      -

      1.vii. Changes since 3.1.0-b2

      +

      1.viii. Changes since 3.1.0-b2

      Bug

        @@ -842,7 +880,7 @@
      -

      1.viii. Changes since 3.1.0-b1

      +

      1.ix. Changes since 3.1.0-b1

      Bug

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

      1.ix. Changes since 3.1.0-a3

      +

      1.x. Changes since 3.1.0-a3

      Bug

        @@ -1057,7 +1095,7 @@
      -

      1.x. Changes since 3.1.0-a2

      +

      1.xi. Changes since 3.1.0-a2

      Bug

        @@ -1165,7 +1203,7 @@
      • [PHPBB3-12147] - Remove Travis CI notification configuration
      -

      1.xi. Changes since 3.1.0-a1

      +

      1.xii. Changes since 3.1.0-a1

      Bug

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

      1.xii. Changes since 3.0.x

      +

      1.xiii. Changes since 3.0.x

      Bug

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

      1.xiii. Changes since 3.0.11

      +

      1.xiv. Changes since 3.0.11

      Bug

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

      1.xiv. Changes since 3.0.10

      +

      1.xv. Changes since 3.0.10

      Bug

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

      1.xv. Changes since 3.0.9

      +

      1.xvi. Changes since 3.0.9

      Bug

        @@ -2338,7 +2376,7 @@
      • [PHPBB3-10480] - Automate changelog building
      -

      1.xvi. Changes since 3.0.8

      +

      1.xvii. Changes since 3.0.8

      Bug

      @@ -2706,7 +2744,7 @@ -

      1.xvii. Changes since 3.0.7-PL1

      +

      1.xviii. Changes since 3.0.7-PL1

      Security

        @@ -3164,13 +3202,13 @@
      -

      1.xviii. Changes since 3.0.7

      +

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

      +

      1.xx. Changes since 3.0.6

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

      1.xx. Changes since 3.0.5

      +

      1.xxi. Changes since 3.0.5

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

      1.xxi. Changes since 3.0.4

      +

      1.xxii. Changes since 3.0.4

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

      1.xxii. Changes since 3.0.3

      +

      1.xxiii. Changes since 3.0.3

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

      1.xxiii. Changes since 3.0.2

      +

      1.xxiv. Changes since 3.0.2

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

      +

      1.xxv. Changes since 3.0.1

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

      1.xxv. Changes since 3.0.0

      +

      1.xxvi. Changes since 3.0.0

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

      1.xxvi. Changes since 3.0.RC8

      +

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

      1.xxvii. Changes since 3.0.RC7

      +

      1.xxviii. Changes since 3.0.RC7

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

      1.xxviii. Changes since 3.0.RC6

      +

      1.xxix. Changes since 3.0.RC6

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

      1.xxix. Changes since 3.0.RC5

      +

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

      1.xxx. Changes since 3.0.RC4

      +

      1.xxxi. Changes since 3.0.RC4

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

      1.xxxi. Changes since 3.0.RC3

      +

      1.xxxii. Changes since 3.0.RC3

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

      1.xxxii. Changes since 3.0.RC2

      +

      1.xxxiii. Changes since 3.0.RC2

      • [Fix] Re-allow searching within the memberlist
        • @@ -4158,7 +4196,7 @@
      -

      1.xxxiii. Changes since 3.0.RC1

      +

      1.xxxiv. Changes since 3.0.RC1

      • [Fix] (X)HTML issues within the templates (Bug #11255, #11255)
        • diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index 6693b822fe..b4bb2722c3 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-RC6-dev'); +define('PHPBB_VERSION', '3.1.0-RC7-dev'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index cab3fd7f1f..983c11cc98 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-RC5', + 'phpbb_version' => '3.1.0-RC6', 'author' => 'phpBB Limited', 'dbms' => $dbms, 'dbhost' => $dbhost, diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index adbd5a540e..f40b1a4d44 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-RC6-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.0-RC7-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'); diff --git a/phpBB/phpbb/db/migration/data/v310/rc6.php b/phpBB/phpbb/db/migration/data/v310/rc6.php new file mode 100644 index 0000000000..b84f2edcc9 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v310/rc6.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 rc6 extends \phpbb\db\migration\migration +{ + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v310\rc5', + ); + } + + public function update_data() + { + return array( + array('config.update', array('version', '3.1.0-RC6')), + ); + } +} diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg index 8853bd4382..90d6bd8e8a 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-RC5 -phpbb_version = 3.1.0-RC5 +style_version = 3.1.0-RC6 +phpbb_version = 3.1.0-RC6 # Defining a different template bitfield # template_bitfield = lNg= diff --git a/phpBB/styles/subsilver2/style.cfg b/phpBB/styles/subsilver2/style.cfg index b8de165608..0cffcee156 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-RC5 -phpbb_version = 3.1.0-RC5 +style_version = 3.1.0-RC6 +phpbb_version = 3.1.0-RC6 # Defining a different template bitfield # template_bitfield = lNg=