diff --git a/build/build.xml b/build/build.xml index 5bc712fc55..c2544ba566 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 f907585e28..6286e69f3a 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -50,6 +50,7 @@
  1. Changelog
      +
    • Changes since 3.2.0-RC1
    • Changes since 3.2.0-b2
    • Changes since 3.2.0-b1
    • Changes since 3.2.0-a2
      • @@ -123,6 +124,86 @@
      +

      Changes since 3.2.0-RC1

      +

      Bug

      +
        +
      • [PHPBB3-14588] - RTL Search Bar
        • +
      • [PHPBB3-14612] - Double .panel class on confirmation page (ajax error?)
        • +
      • [PHPBB3-14628] - CLI installer doesn't support the translatable error messages
        • +
      • [PHPBB3-14633] - Creating a new topic leaves a white page
        • +
      • [PHPBB3-14636] - BC compatibility broken using request_var
        • +
      • [PHPBB3-14640] - Wrong link to documentation in language/en/install.php
        • +
      • [PHPBB3-14660] - Emails are being sent unparsed
        • +
      • [PHPBB3-14663] - Incorrect unicode chars handling in custom BBCode
        • +
      • [PHPBB3-14665] - Invalid syntax in report_id_auto_increment migration
        • +
      • [PHPBB3-14684] - Extension Sniff script should use NOTESTS
        • +
      • [PHPBB3-14690] - Email queue cron task never runs for phpBB 3.2
        • +
      • [PHPBB3-14692] - Duplicate subexpression in questionnaire.php
        • +
      • [PHPBB3-14700] - Updating from 3.1 to 3.2, just stops
        • +
      • [PHPBB3-14706] - nested BB-Code [list] - shows different behaviour between 3.1 and 3.2
        • +
      • [PHPBB3-14709] - Deleting posts from mcp_main causes missing post_id notice
        • +
      • [PHPBB3-14714] - Update composer dependencies to latest versions
        • +
      • [PHPBB3-14716] - Impossible to install with open basedir restrictions
        • +
      • [PHPBB3-14717] - Quote any scalar in yaml files
        • +
      • [PHPBB3-14739] - Remove old SQLite 2.8.х database driver
        • +
      • [PHPBB3-14740] - BBcodes with quotes dont get parsed correctly
        • +
      • [PHPBB3-14742] - Improvements to migrator
        • +
      • [PHPBB3-14746] - Don't depend on container in installer msg_handler
        • +
      • [PHPBB3-14748] - Modify tests to pass PHP 7.1 tests
        • +
      • [PHPBB3-14763] - Files services definition specifies form for local type
        • +
      • [PHPBB3-14764] - Incomplete update notification points to wrong update-link
        • +
      • [PHPBB3-14765] - Parameter vs requirement spelling mismatch in installer routing config
        • +
      • [PHPBB3-14774] - Content-Range only supported for resuming downloads
        • +
      • [PHPBB3-14782] - Quick Links > Your Posts gives mysql error
        • +
      • [PHPBB3-14788] - Update developer list to reflect team changes
        • +
      • [PHPBB3-14791] - Trying to get form from wrong button in search test base
        • +
      • [PHPBB3-14793] - "A non-numeric value encountered" PHP warning on PHP 7.1+
        • +
      • [PHPBB3-14794] - Fix redirect behavior in according to parse_url() behavior changes in PHP 7.1+
        • +
      • [PHPBB3-14797] - Remove PHP 7.1 builds from allowed failures
        • +
      • [PHPBB3-14799] - purge_notifications() leaves open transaction for bad notification types.
        • +
      • [PHPBB3-14813] - functions_compatibility missing in phpbbcli
        • +
      • [PHPBB3-14814] - Text reparser reparses already correctly [re] -parsed objects
        • +
      • [PHPBB3-14821] - Do not expect parsed HTML in kernel subscriber output
        • +
      • [PHPBB3-14846] - Swapped variables in bbcode, first one doesn't get parsed
        • +
      • [PHPBB3-14873] - Missing width and height variables for smilies
        • +
      • [PHPBB3-14875] - Cannot use HTML entity type database passwords during installation
        • +
      • [PHPBB3-14883] - Text Reparser is Reparsing Empty Data
        • +
      • [PHPBB3-14892] - Assets paths broken on Windows instances
        • +
      • [PHPBB3-14894] - Update: download of conflict files offers .tar file without file extension
        • +
      • [PHPBB3-14896] - Link after installation fails at redirecting to ACP
        • +
      • [PHPBB3-14897] - IOHandler in the installer declares member variable only in the constructor
        • +
      • [PHPBB3-14900] - Disabled extension breakage in ACP
        • +
      +

      Improvement

      + +

      New Feature

      + +

      Task

      +
        +
      • [PHPBB3-10809] - Remove PHP MSSQL Support
        • +
      • [PHPBB3-13573] - Investigate ability to use set_config() and similar compatibility functions.
        • +
      • [PHPBB3-14671] - Deduplicate database schema definiton
        • +
      • [PHPBB3-14696] - Fix email template test for '0' username
        • +
      • [PHPBB3-14807] - Updates dependencies
        • +
      +

      Changes since 3.2.0-b2

      Bug

        diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index 7ab03e9b7d..6460a1ae7c 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.2.0-RC1'); +@define('PHPBB_VERSION', '3.3.0-a1-dev'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 742cd1d35c..fe62484afb 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -278,7 +278,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.2.0-RC1'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.3.0-a1-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/v320/v320rc2.php b/phpBB/phpbb/db/migration/data/v320/v320rc2.php new file mode 100644 index 0000000000..ec9bb62732 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v320/v320rc2.php @@ -0,0 +1,40 @@ + +* @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\v320; + +use phpbb\db\migration\migration; + +class v320rc2 extends migration +{ + public function effectively_installed() + { + return version_compare($this->config['version'], '3.2.0-RC2', '>='); + } + + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v31x\remove_duplicate_migrations', + '\phpbb\db\migration\data\v31x\add_log_time_index', + '\phpbb\db\migration\data\v320\add_help_phpbb', + ); + } + + public function update_data() + { + return array( + array('config.update', array('version', '3.2.0-RC2')), + ); + } +} diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg index e0b87f2398..cfe19802fe 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.3.0-dev -phpbb_version = 3.3.0-dev +style_version = 3.3.0-a1-dev +phpbb_version = 3.3.0-a1-dev # Defining a different template bitfield # template_bitfield = lNg=