diff --git a/build/build.xml b/build/build.xml index d3489ab607..f2668e2101 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 ab3a42206e..2a824fa9b7 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -46,6 +46,7 @@
  1. Changelog
      +
    1. Changes since 3.1.0-b4
    2. Changes since 3.1.0-b3
    3. Changes since 3.1.0-b2
    4. Changes since 3.1.0-b1
      5. @@ -93,7 +94,127 @@
      -

      1.i. Changes since 3.1.0-b3

      +

      1.i. Changes since 3.1.0-b4

      + +

      Bug

      +
        +
      • [PHPBB3-8610] - Splitting and merging topics does not handle subscriptions and bookmarks correctly
        • +
      • [PHPBB3-10899] - Using Delete All in log viewer with keyword search
        • +
      • [PHPBB3-11331] - Inform admin of incorrect avatar path instead of stripping unexpected parts from destination path
        • +
      • [PHPBB3-11445] - Suboptimal number of query complexity in phpbb_notification_manager::get_global_subscriptions()
        • +
      • [PHPBB3-11467] - phpbb_extension_metadata_manager uses hard coded language for exceptions
        • +
      • [PHPBB3-11659] - Information about file_upload is missing from the requirement page
        • +
      • [PHPBB3-11942] - Delete post/topic reason should be added to the generated log entry
        • +
      • [PHPBB3-12109] - Bug when setting users forum permissions with "Select all users" checkbox
        • +
      • [PHPBB3-12209] - OAuth Authentication in ACP does not explain that it allows regular login too
        • +
      • [PHPBB3-12332] - Attachments with long file names break the Uploader layout
        • +
      • [PHPBB3-12352] - The service definition "auth.provider.smf" does not exist.
        • +
      • [PHPBB3-12443] - Responsive tabs broken in IE
        • +
      • [PHPBB3-12457] - Gallery avatar category "Main" is empty
        • +
      • [PHPBB3-12508] - phpbb\finder (currently phpbb\extension\finder) should not depend on extension manager
        • +
      • [PHPBB3-12521] - When selecting the target to merge two topics, the last column is pushed on a new line
        • +
      • [PHPBB3-12552] - [RTL] - Forum list content forced into single char column when responsive
        • +
      • [PHPBB3-12553] - Right-to-left language bugs in prosilver
        • +
      • [PHPBB3-12566] - "Private messages" in viewtopic.php should be "Send pivate message"
        • +
      • [PHPBB3-12589] - The finder should search directly in $directory if it's an absolute sub-path
        • +
      • [PHPBB3-12612] - Front-facing files should not contain functions
        • +
      • [PHPBB3-12615] - Improper clearing of .topic-actions leads to float problems
        • +
      • [PHPBB3-12637] - coding-guidelines.html contains invalid HTML
        • +
      • [PHPBB3-12638] - Call to undefined function phpbb\db\migration\data\v30x\phpbb_require_updated() when not using autoupdate package
        • +
      • [PHPBB3-12639] - Delete entry in admin-log leads to mysql-error
        • +
      • [PHPBB3-12640] - Posting editor tab "attachments" is unclicked in IE8
        • +
      • [PHPBB3-12641] - With IE8 logged in to ACP error message appears in the browser
        • +
      • [PHPBB3-12643] - Cannot convert SQLite DB from 3.0.12 to 3.1.0
        • +
      • [PHPBB3-12652] - Deleting marked log entries leads to MySQL Error
        • +
      • [PHPBB3-12660] - Undefined offset error when phpinfo() disabled and debug enabled
        • +
      • [PHPBB3-12665] - develop/migration_tips.php should not find extension tips
        • +
      • [PHPBB3-12667] - New posts in a topic cause undesirable results when clicking topic title or page button
        • +
      • [PHPBB3-12672] - Make <Tab> inside [code] - more user friendly
        • +
      • [PHPBB3-12673] - PLUPLOAD fails due missing constant IMAGETYPE_SWC
        • +
      • [PHPBB3-12675] - Fix code sniffer complaints in 3.1.0-b5-dev code
        • +
      • [PHPBB3-12682] - Code Sniffer does not work correctly on Travis CI.
        • +
      • [PHPBB3-12688] - Rank images do not work on routes
        • +
      • [PHPBB3-12694] - Remove whitespace at end of line from acp_groups
        • +
      • [PHPBB3-12697] - Database Test Case Must Purge Extension Schema When Done
        • +
      • [PHPBB3-12705] - make_clickable is using static variables incorrectly
        • +
      • [PHPBB3-12707] - \phpbb\db\driver\phpbb\db\driver\mysql is tried being loaded
        • +
      • [PHPBB3-12708] - [ROOT] -/install/install_main.php still uses docs/COPYING
        • +
      • [PHPBB3-12709] - Duplicate entries in the posting attachments tab
        • +
      • [PHPBB3-12711] - Contact form migration fails on MSSQL
        • +
      • [PHPBB3-12712] - Password conversion migration fails on MSSQL
        • +
      • [PHPBB3-12715] - Mistakes in the doc blocks
        • +
      • [PHPBB3-12720] - Git commit hook should not require commit message to start with a capital letter
        • +
      • [PHPBB3-12728] - Enforce box-model for image attachments
        • +
      • [PHPBB3-12741] - Functional tests on Travis fail since php update last night
        • +
      • [PHPBB3-12746] - Failing test: tests/content_visibility/delete_post_test.php
        • +
      • [PHPBB3-12747] - Drop Firebird support
        • +
      • [PHPBB3-12750] - Install/Update footer is not centered anymore
        • +
      • [PHPBB3-12752] - Cron list tests fail on windows with ansi support
        • +
      • [PHPBB3-12753] - FIELD_INVALID_CHARS_ALPHA_PUNCTUATION is not localized
        • +
      • [PHPBB3-12755] - Remote upload stuck in infinite loop if server sends keep-alive
        • +
      • [PHPBB3-12756] - Fatal error with mysqli_fetch_assoc on hhvm
        • +
      • [PHPBB3-12761] - Remove the execute bit from functions_user.php
        • +
      • [PHPBB3-12762] - Make ext.php optional for extensions
        • +
      • [PHPBB3-12763] - Do not unnecessarily rewrite install/schemas/*_schema.sql when updating schema.json file
        • +
      +

      Improvement

      +
        +
      • [PHPBB3-11266] - Use our own error message when composer is not set up
        • +
      • [PHPBB3-12532] - Add header_navbar_username_prepend/append template events.
        • +
      • [PHPBB3-12541] - Activate attachments tab when files are dropped into textarea
        • +
      • [PHPBB3-12563] - Language key names in ACP styles are misleading
        • +
      • [PHPBB3-12606] - PHP events in /includes/acp/acp_groups.php
        • +
      • [PHPBB3-12608] - Improve notifications drop-down menu styling in header
        • +
      • [PHPBB3-12613] - Improve pagination styling and jump-to-page dialog
        • +
      • [PHPBB3-12646] - Add data attribute to breadcrumb links
        • +
      • [PHPBB3-12648] - Improve UCP/MCP/Posting tabs styling & problems
        • +
      • [PHPBB3-12655] - Allow the CLI to be used as a shell
        • +
      • [PHPBB3-12664] - Refactor develop/migration_tips.php into a console command
        • +
      • [PHPBB3-12666] - Use "None" for images in gallery avatar path root and rename lang key
        • +
      • [PHPBB3-12668] - Add ability to modify subforums template data for core.display_forums_modify_template_vars event
        • +
      • [PHPBB3-12669] - Add core event to the function display_forums() for additional template data
        • +
      • [PHPBB3-12677] - Remove comment about ‘threading’
        • +
      • [PHPBB3-12687] - Add a constant to dissociate the displaying of the load time from DEBUG
        • +
      • [PHPBB3-12690] - Add core.submit_pm_after event
        • +
      • [PHPBB3-12691] - Add core.delete_pm to funtion delete_pm.
        • +
      • [PHPBB3-12704] - Improve the load time information in the footer when enabled
        • +
      • [PHPBB3-12706] - Ignore additional languages and styles from git
        • +
      • [PHPBB3-12714] - Better align the description of radio buttons to avoid confusion with the forum list in attachments settings
        • +
      • [PHPBB3-12740] - Stop Using IDs as CSS selectors
        • +
      • [PHPBB3-12758] - Add 'show_results' mode var to event core.search_modify_rowset
        • +
      +

      New Feature

      +
        +
      • [PHPBB3-12597] - Command for executing all available cron tasks
        • +
      • [PHPBB3-12602] - Add command to print the cron list
        • +
      • [PHPBB3-12607] - CLI command for running a specific cron task
        • +
      +

      Sub-task

      + +

      Task

      +
        +
      • [PHPBB3-11528] - Use mink for acceptance tests involving javascript execution
        • +
      • [PHPBB3-12514] - Add additional tests for custom profile fields type
        • +
      • [PHPBB3-12696] - Add events to ucp_register.html
        • +
      • [PHPBB3-12701] - Add events to user_add function
        • +
      • [PHPBB3-12723] - Add Code Sniffer sniff ensuring PHP files use the correct file header
        • +
      • [PHPBB3-12726] - Add Code Sniffer sniff ensuring PHP files do not contain any unused use statements
        • +
      • [PHPBB3-12757] - Add a Code Sniffer ruleset for PHP files of phpBB extensions
        • +
      + + +

      1.ii. Changes since 3.1.0-b3

      Bug

        @@ -200,7 +321,7 @@
      -

      1.ii. Changes since 3.1.0-b2

      +

      1.iii. Changes since 3.1.0-b2

      Bug

        @@ -365,7 +486,7 @@
      -

      1.iii. Changes since 3.1.0-b1

      +

      1.iv. Changes since 3.1.0-b1

      Bug

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

      1.iv. Changes since 3.1.0-a3

      +

      1.v. Changes since 3.1.0-a3

      Bug

        @@ -580,7 +701,7 @@
      -

      1.v. Changes since 3.1.0-a2

      +

      1.vi. Changes since 3.1.0-a2

      Bug

        @@ -688,7 +809,7 @@
      • [PHPBB3-12147] - Remove Travis CI notification configuration
      -

      1.vi. Changes since 3.1.0-a1

      +

      1.vii. Changes since 3.1.0-a1

      Bug

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

      1.vii. Changes since 3.0.x

      +

      1.viii. Changes since 3.0.x

      Bug

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

      1.viii. Changes since 3.0.11

      +

      1.ix. Changes since 3.0.11

      Bug

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

      1.ix. Changes since 3.0.10

      +

      1.x. Changes since 3.0.10

      Bug

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

      1.x. Changes since 3.0.9

      +

      1.xi. Changes since 3.0.9

      Bug

        @@ -1861,7 +1982,7 @@
      • [PHPBB3-10480] - Automate changelog building
      -

      1.xi. Changes since 3.0.8

      +

      1.xii. Changes since 3.0.8

      Bug

      @@ -2229,7 +2350,7 @@ -

      1.xii. Changes since 3.0.7-PL1

      +

      1.xiii. Changes since 3.0.7-PL1

      Security

        @@ -2687,13 +2808,13 @@
      -

      1.xiii. Changes since 3.0.7

      +

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

      +

      1.xv. Changes since 3.0.6

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

      1.xv. Changes since 3.0.5

      +

      1.xvi. Changes since 3.0.5

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

      1.xvi. Changes since 3.0.4

      +

      1.xvii. Changes since 3.0.4

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

      1.xvii. Changes since 3.0.3

      +

      1.xviii. Changes since 3.0.3

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

      1.xviii. Changes since 3.0.2

      +

      1.xix. Changes since 3.0.2

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

      +

      1.xx. Changes since 3.0.1

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

      1.xx. Changes since 3.0.0

      +

      1.xxi. Changes since 3.0.0

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

      1.xxi. Changes since 3.0.RC8

      +

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

      1.xxii. Changes since 3.0.RC7

      +

      1.xxiii. Changes since 3.0.RC7

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

      1.xxiii. Changes since 3.0.RC6

      +

      1.xxiv. Changes since 3.0.RC6

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

      1.xxiv. Changes since 3.0.RC5

      +

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

      1.xxv. Changes since 3.0.RC4

      +

      1.xxvi. Changes since 3.0.RC4

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

      1.xxvi. Changes since 3.0.RC3

      +

      1.xxvii. Changes since 3.0.RC3

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

      1.xxvii. Changes since 3.0.RC2

      +

      1.xxviii. Changes since 3.0.RC2

      • [Fix] Re-allow searching within the memberlist
        • @@ -3681,7 +3802,7 @@
      -

      1.xxviii. Changes since 3.0.RC1

      +

      1.xxix. 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 723956de0c..2287639aee 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-b5-dev'); +define('PHPBB_VERSION', '3.1.0-RC2-dev'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index 7daacf92f4..6b6eabe57d 100644 --- a/phpBB/install/convertors/convert_phpbb20.php +++ b/phpBB/install/convertors/convert_phpbb20.php @@ -37,7 +37,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-b4', + 'phpbb_version' => '3.1.0-RC1', 'author' => 'phpBB Limited', 'dbms' => $dbms, 'dbhost' => $dbhost, diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 9b9b7f77f1..572720ff95 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-b5-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.0-RC2-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/rc1.php b/phpBB/phpbb/db/migration/data/v310/rc1.php new file mode 100644 index 0000000000..10ba7fefff --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v310/rc1.php @@ -0,0 +1,39 @@ + +* @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 rc1 extends \phpbb\db\migration\migration +{ + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v310\beta4', + '\phpbb\db\migration\data\v310\contact_admin_acp_module', + '\phpbb\db\migration\data\v310\contact_admin_form', + '\phpbb\db\migration\data\v310\passwords_convert_p2', + '\phpbb\db\migration\data\v310\profilefield_facebook', + '\phpbb\db\migration\data\v310\profilefield_googleplus', + '\phpbb\db\migration\data\v310\profilefield_skype', + '\phpbb\db\migration\data\v310\profilefield_twitter', + '\phpbb\db\migration\data\v310\profilefield_youtube', + ); + } + + public function update_data() + { + return array( + array('config.update', array('version', '3.1.0-RC1')), + ); + } +} diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg index f3dd72cb52..b75207bd70 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-b4 -phpbb_version = 3.1.0-b4 +style_version = 3.1.0-RC1 +phpbb_version = 3.1.0-RC1 # Defining a different template bitfield # template_bitfield = lNg= diff --git a/phpBB/styles/subsilver2/style.cfg b/phpBB/styles/subsilver2/style.cfg index b9e77bfb4f..9a0c77b627 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-b4 -phpbb_version = 3.1.0-b4 +style_version = 3.1.0-RC1 +phpbb_version = 3.1.0-RC1 # Defining a different template bitfield # template_bitfield = lNg=