diff --git a/build/build_changelog.php b/build/build_changelog.php index be0fb625ea..2d38480f9f 100755 --- a/build/build_changelog.php +++ b/build/build_changelog.php @@ -20,7 +20,7 @@ if ($_SERVER['argc'] != 2) $fixVersion = $_SERVER['argv'][1]; -$query = 'project = PHPBB3 +$query = 'project IN (PHPBB3, SECURITY) AND resolution = Fixed AND fixVersion = "' . $fixVersion . '" AND status IN ("Unverified Fix", Closed)'; diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 559338f521..bff54b091a 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -46,6 +46,7 @@
  1. Changelog
      +
    1. Changes since 3.1.0-RC6
    2. Changes since 3.1.0-RC5
    3. Changes since 3.1.0-RC4
    4. Changes since 3.1.0-RC3
      5. @@ -99,7 +100,9 @@
      -

      1.i. Changes since 3.1.0-RC5

      +

      1.i. Changes since 3.1.0-RC6

      + +

      1.ii. Changes since 3.1.0-RC5

      Bug

        @@ -136,7 +139,7 @@
      -

      1.ii. Changes since 3.1.0-RC4

      +

      1.iii. Changes since 3.1.0-RC4

      Bug

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

      1.iii. Changes since 3.1.0-RC3

      +

      1.iv. Changes since 3.1.0-RC3

      Bug

        @@ -293,7 +296,7 @@
      -

      1.iv. Changes since 3.1.0-RC2

      +

      1.v. Changes since 3.1.0-RC2

      Bug

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

      1.v. Changes since 3.1.0-RC1

      +

      1.vi. Changes since 3.1.0-RC1

      Bug

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

      1.vi. Changes since 3.1.0-b4

      +

      1.vii. Changes since 3.1.0-b4

      Bug

        @@ -608,7 +611,7 @@
      -

      1.vii. Changes since 3.1.0-b3

      +

      1.viii. Changes since 3.1.0-b3

      Bug

        @@ -715,7 +718,7 @@
      -

      1.viii. Changes since 3.1.0-b2

      +

      1.ix. Changes since 3.1.0-b2

      Bug

        @@ -880,7 +883,7 @@
      -

      1.ix. Changes since 3.1.0-b1

      +

      1.x. Changes since 3.1.0-b1

      Bug

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

      1.x. Changes since 3.1.0-a3

      +

      1.xi. Changes since 3.1.0-a3

      Bug

        @@ -1095,7 +1098,7 @@
      -

      1.xi. Changes since 3.1.0-a2

      +

      1.xii. Changes since 3.1.0-a2

      Bug

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

      1.xii. Changes since 3.1.0-a1

      +

      1.xiii. Changes since 3.1.0-a1

      Bug

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

      1.xiii. Changes since 3.0.x

      +

      1.xiv. Changes since 3.0.x

      Bug

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

      1.xiv. Changes since 3.0.11

      +

      1.xv. Changes since 3.0.11

      Bug

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

      1.xv. Changes since 3.0.10

      +

      1.xvi. Changes since 3.0.10

      Bug

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

      1.xvi. Changes since 3.0.9

      +

      1.xvii. Changes since 3.0.9

      Bug

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

      1.xvii. Changes since 3.0.8

      +

      1.xviii. Changes since 3.0.8

      Bug

      @@ -2744,7 +2747,7 @@ -

      1.xviii. Changes since 3.0.7-PL1

      +

      1.xix. Changes since 3.0.7-PL1

      Security

        @@ -3202,13 +3205,13 @@
      -

      1.xix. Changes since 3.0.7

      +

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

      +

      1.xxi. Changes since 3.0.6

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

      1.xxi. Changes since 3.0.5

      +

      1.xxii. Changes since 3.0.5

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

      1.xxii. Changes since 3.0.4

      +

      1.xxiii. Changes since 3.0.4

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

      1.xxiii. Changes since 3.0.3

      +

      1.xxiv. Changes since 3.0.3

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

      1.xxiv. Changes since 3.0.2

      +

      1.xxv. Changes since 3.0.2

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

      +

      1.xxvi. Changes since 3.0.1

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

      1.xxvi. Changes since 3.0.0

      +

      1.xxvii. Changes since 3.0.0

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

      1.xxvii. Changes since 3.0.RC8

      +

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

      1.xxviii. Changes since 3.0.RC7

      +

      1.xxix. Changes since 3.0.RC7

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

      1.xxix. Changes since 3.0.RC6

      +

      1.xxx. Changes since 3.0.RC6

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

      1.xxx. Changes since 3.0.RC5

      +

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

      1.xxxi. Changes since 3.0.RC4

      +

      1.xxxii. Changes since 3.0.RC4

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

      1.xxxii. Changes since 3.0.RC3

      +

      1.xxxiii. Changes since 3.0.RC3

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

      1.xxxiii. Changes since 3.0.RC2

      +

      1.xxxiv. Changes since 3.0.RC2

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

      1.xxxiv. Changes since 3.0.RC1

      +

      1.xxxv. Changes since 3.0.RC1

      • [Fix] (X)HTML issues within the templates (Bug #11255, #11255)
        • diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index 983c11cc98..8f6af30426 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-RC6', + 'phpbb_version' => '3.1.0', 'author' => 'phpBB Limited', 'dbms' => $dbms, 'dbhost' => $dbhost,