diff --git a/build/build.xml b/build/build.xml index 408eee3335..2c6311bc0c 100644 --- a/build/build.xml +++ b/build/build.xml @@ -2,7 +2,7 @@ - + diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 8bd7ac47e0..b1db7b6f36 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -49,6 +49,7 @@
  1. Changelog
      +
    • Changes since 3.1.5
    • Changes since 3.1.4
    • Changes since 3.1.3
    • Changes since 3.1.3-RC1
      • @@ -112,6 +113,94 @@
      +

      Changes since 3.1.5

      + +

      Bug

      +
        +
      • [PHPBB3-10711] - SQL error DUPLICATE for KEY in FORUMS_TRACK_TABLE
        • +
      • [PHPBB3-13711] - disabled accounts receive mails
        • +
      • [PHPBB3-13815] - Event parameters in posting do not affect behavior as expected
        • +
      • [PHPBB3-13903] - Container naming doesn't allow Windows' semicolon
        • +
      • [PHPBB3-13930] - Check for correct spacing between keyword & parenthesis in codesniffer
        • +
      • [PHPBB3-13941] - One test is blocked in an inifinite loop on php 5.5+ and with sqlite3
        • +
      • [PHPBB3-13948] - Only reports top level WHOIS IP for a user in ACP
        • +
      • [PHPBB3-13949] - Replace colon with colon lang key in memberlist search page
        • +
      • [PHPBB3-13951] - Jump to page function does not work since 3.1.5 upgrade
        • +
      • [PHPBB3-13952] - Fulltext Native errors from tidy_search cron task
        • +
      • [PHPBB3-13955] - 3.1.5 not loading CDN resources
        • +
      • [PHPBB3-13962] - Forum dropdown in MCP queue could expand beyond screen size
        • +
      • [PHPBB3-13966] - Change post's author --> error message
        • +
      • [PHPBB3-13967] - BBCode guide - loading phpBB logo image breaks https
        • +
      • [PHPBB3-13980] - Current avatar not removed when uploading with different extension
        • +
      • [PHPBB3-13984] - AJAX Loading Indicator broken
        • +
      • [PHPBB3-14037] - Memberlist profile fields headlines not computed from same way as data
        • +
      • [PHPBB3-14049] - Plupload delete request should use config headers
        • +
      • [PHPBB3-14069] - Incorrect sql_fetchfield call in style_update_p1 migration
        • +
      • [PHPBB3-14077] - Select all code not work in Microsoft Edge
        • +
      • [PHPBB3-14082] - Fix wrong variables in fulltext native search for keyworded results
        • +
      • [PHPBB3-14083] - Fix wrong variables in fulltext mysql search for author search
        • +
      • [PHPBB3-14093] - Hardcoded language in ucp_pm_viewfolder.html
        • +
      • [PHPBB3-14103] - Underline in abbreviations in Firefox 40
        • +
      • [PHPBB3-14104] - Fix missing variable in fulltext native search query for total results for author
        • +
      • [PHPBB3-14115] - Microdata is not valid in prosilver
        • +
      +

      Improvement

      +
        +
      • [PHPBB3-11530] - Remove quotes that are too deep automatically
        • +
      • [PHPBB3-12952] - Display HTTP Output along with Status code in case assertion fails in functional tests
        • +
      • [PHPBB3-13598] - Add an option to post a locked topic
        • +
      • [PHPBB3-13786] - Add core events to add MCP post options
        • +
      • [PHPBB3-13818] - Browse Extensions Database link in Extension Manager
        • +
      • [PHPBB3-13843] - Add templates events to insert custom panel-tab into posting editor
        • +
      • [PHPBB3-13863] - [Template] - topiclist_row_append/topiclist_row_prepend in mcp_forum.html
        • +
      • [PHPBB3-13879] - We're using px most places but ems in others
        • +
      • [PHPBB3-13882] - Avatars in notifications should be lazy loaded
        • +
      • [PHPBB3-13899] - Add items to core.search_results_modify_search_title
        • +
      • [PHPBB3-13911] - Add configuration options to profile fields
        • +
      • [PHPBB3-13931] - Wrong order in docs/events.md
        • +
      • [PHPBB3-13968] - [PHP] - core.user_setup_after
        • +
      • [PHPBB3-13971] - Add draft_id variable to event core.posting_modify_template_vars
        • +
      • [PHPBB3-13981] - Events to intercept uploaded avatar deletion
        • +
      • [PHPBB3-13995] - Invalid HTML using Projection Media Type
        • +
      • [PHPBB3-14002] - Add template events before/after user details in ucp_main_front.html
        • +
      • [PHPBB3-14005] - Allow extensions control post buttons displaying
        • +
      • [PHPBB3-14014] - [PHP] - mcp_forum_view_actions
        • +
      • [PHPBB3-14064] - Add template events to ucp_pm_history.html
        • +
      • [PHPBB3-14065] - Add template events to attachment.html
        • +
      • [PHPBB3-14067] - Add template events to overall_header.html around feeds
        • +
      • [PHPBB3-14068] - New events around poll panel in viewtopic
        • +
      • [PHPBB3-14072] - Add core event to the function format_display()
        • +
      • [PHPBB3-14085] - [Template] - posting_topic_title_prepend
        • +
      • [PHPBB3-14086] - [Template] - Add mcp_forum_topic_title_*
        • +
      • [PHPBB3-14090] - [Template] - mcp_topic_topic_title_*
        • +
      • [PHPBB3-14091] - [Template] - mcp_topic_subject_*
        • +
      • [PHPBB3-14101] - Add core event to the download/file.php
        • +
      • [PHPBB3-14116] - sql_affectedrows has no arguments
        • +
      +

      New Feature

      +
        +
      • [PHPBB3-12692] - Add a console command to manage the thumbnail
        • +
      • [PHPBB3-13311] - Add php event to acp manage_forums when deleting content
        • +
      • [PHPBB3-13974] - Add php event for altering data when changing a post's poster
        • +
      • [PHPBB3-13997] - [Template] - posting_editor_submit_buttons
        • +
      • [PHPBB3-14006] - [PHP] - core.ucp_register_agreement
        • +
      • [PHPBB3-14041] - [Template] - viewtopic_dropdown_top_custom
        • +
      • [PHPBB3-14042] - [Template] - viewtopic_dropdown_bottom_custom
        • +
      • [PHPBB3-14043] - [PHP] - core.get_avatar_after
        • +
      • [PHPBB3-14087] - Add an event to ucp_activate.php.
        • +
      +

      Sub-task

      +
        +
      • [PHPBB3-13694] - Allow modifying the Postgres author search query for results
        • +
      +

      Task

      + + +

      Changes since 3.1.4

      Bug

      diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index 62e5fe7a0a..3022137150 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.6-dev'); +define('PHPBB_VERSION', '3.1.6-RC1'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index 7edbd08e03..3a5e58cabd 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.5', + 'phpbb_version' => '3.1.6', 'author' => 'phpBB Limited', 'dbms' => $dbms, 'dbhost' => $dbhost, diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index bc5df123f7..8a56b87f2d 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.6-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.6-RC1'); 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/v31x/v316rc1.php b/phpBB/phpbb/db/migration/data/v31x/v316rc1.php new file mode 100644 index 0000000000..487cd05e5d --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v31x/v316rc1.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\v31x; + +class v316rc1 extends \phpbb\db\migration\migration +{ + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v31x\v315', + ); + } + + public function update_data() + { + return array( + array('config.update', array('version', '3.1.6-RC1')), + ); + } +} diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg index 0b13b17bea..13433c389f 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.5 -phpbb_version = 3.1.5 +style_version = 3.1.6 +phpbb_version = 3.1.6 # Defining a different template bitfield # template_bitfield = lNg= diff --git a/phpBB/styles/subsilver2/style.cfg b/phpBB/styles/subsilver2/style.cfg index f78e417b84..8077c1d51e 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.5 -phpbb_version = 3.1.5 +style_version = 3.1.6 +phpbb_version = 3.1.6 # Defining a different template bitfield # template_bitfield = lNg=