diff --git a/build/build.xml b/build/build.xml index 1022565ff0..1c6cbe5f25 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 1ce5f29a72..17f1327a96 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -46,6 +46,7 @@
  1. Changelog
      +
    1. Changes since 3.1.0-a3
    2. Changes since 3.1.0-a2
    3. Changes since 3.1.0-a1
    4. Changes since 3.0.x
      5. @@ -89,7 +90,154 @@
      -

      1.i. Changes since 3.1.0-a2

      +

      1.i. Changes since 3.1.0-a3

      + +

      Bug

      +
        +
      • [PHPBB3-8041] - Do not concatenate the destination to L_RETURN_TO to allow better translations
        • +
      • [PHPBB3-8122] - Reviewing topics/posts - not correctly displayed
        • +
      • [PHPBB3-8785] - PM recipients/bcc list looks bad
        • +
      • [PHPBB3-8919] - Localisation imageset being refreshed too frequently causing broken images
        • +
      • [PHPBB3-9106] - Upload fails to complete for large files.
        • +
      • [PHPBB3-9420] - BBCode - Unable to use a proper URI token
        • +
      • [PHPBB3-9459] - Visiting ACP with screen resolution 800x600px
        • +
      • [PHPBB3-10175] - Class loader cannot find a/b_foo.php when a/b/bar.php exists
        • +
      • [PHPBB3-10338] - Attachments list is displayed incorrectly
        • +
      • [PHPBB3-10722] - Code Coverage generation fails
        • +
      • [PHPBB3-11038] - Does not correctly find module info classes using new naming conventions
        • +
      • [PHPBB3-11146] - MCP topic/post approval error
        • +
      • [PHPBB3-11151] - Can use negative start for memberlist.php
        • +
      • [PHPBB3-11218] - File upload functional test fails
        • +
      • [PHPBB3-11255] - Some tests do not run standalone due to dbal dependency on global $cache
        • +
      • [PHPBB3-11271] - Images in ATOM feed display, but attached inline images do not.
        • +
      • [PHPBB3-11288] - "Fulltext native" search fooled by hyphens
        • +
      • [PHPBB3-11364] - Add an easy-to-switch system for app.php?controller= vs mod-rewrite usage in append_sid
        • +
      • [PHPBB3-11429] - Extensions should increment assets number on enable
        • +
      • [PHPBB3-11581] - General Error in UCP if PMs are disabled in ACP
        • +
      • [PHPBB3-11625] - General Error accessing MCP from Global Announcement
        • +
      • [PHPBB3-11648] - Test suite creates files in phpBB directory
        • +
      • [PHPBB3-11787] - Permission language strings use samp for highlight instead of strong
        • +
      • [PHPBB3-11880] - Schema changes can take too long and cause a timeout
        • +
      • [PHPBB3-11938] - Use of deprecated sql_attr_str2ordinal in sphinx.conf
        • +
      • [PHPBB3-12003] - ACP broken when error thrown
        • +
      • [PHPBB3-12072] - Missing word "send" in comment in schema_data.sql
        • +
      • [PHPBB3-12078] - "Can permanently delete own posts" permission has no effect
        • +
      • [PHPBB3-12080] - Responsive design in ACP / User Administration / Signature needs fixing
        • +
      • [PHPBB3-12093] - IE 11 javascript selection is no longer supported
        • +
      • [PHPBB3-12126] - Alert box is aligned to the left instead of center in IE
        • +
      • [PHPBB3-12132] - viewtopic_print_head_append template event is missing in subsilver2
        • +
      • [PHPBB3-12134] - ucp_pm_viewmessage_print_head_append template event is missing in subsilver2
        • +
      • [PHPBB3-12136] - Call to undefined function generate_pagination() in functions_posting.php
        • +
      • [PHPBB3-12138] - Information and pagination of filtered attachments
        • +
      • [PHPBB3-12139] - Spaces missing after $show_guests in viewonline.php
        • +
      • [PHPBB3-12141] - Travis tests fail on 5.5
        • +
      • [PHPBB3-12149] - Division by zero in [ROOT] -/phpbb/pagination.php
        • +
      • [PHPBB3-12153] - PAGE_NUMBER should be assigned by pagination.generate_template_pagination()
        • +
      • [PHPBB3-12158] - pagination.validate_start() returns negative value when $num_items = 0
        • +
      • [PHPBB3-12168] - Nav Header Links Alignment Issues without small-icon
        • +
      • [PHPBB3-12170] - Migration helper replaces table name with 0 when creating tables
        • +
      • [PHPBB3-12171] - Attachments from soft-deleted posts are still downloadable
        • +
      • [PHPBB3-12172] - "Download all attachments" feature leaks post/pm attachments when being able to download one of them
        • +
      • [PHPBB3-12175] - Fix and run functional upload tests
        • +
      • [PHPBB3-12176] - No error shown when attempting to delete a founder
        • +
      • [PHPBB3-12183] - Update user_newpasswd column in users table for passwords manager
        • +
      • [PHPBB3-12184] - Undefined variable tpl_fields in profile field manager on memberlist
        • +
      • [PHPBB3-12188] - Add php 5.6 to travis tests
        • +
      • [PHPBB3-12192] - Avatars in PM report closed notifications are broken
        • +
      • [PHPBB3-12194] - Unknown column 'field_show_novalue' in 'field list' [1054] -
        • +
      • [PHPBB3-12200] - Profile field template files missing in adm/style
        • +
      • [PHPBB3-12202] - Variables read from style.cfg etc. should be htmlspecialchared
        • +
      • [PHPBB3-12203] - user_occ does not have a default value when registering
        • +
      • [PHPBB3-12205] - Custom Profile Field display bug
        • +
      • [PHPBB3-12206] - Errors in plupload doesn't pull lang vars right
        • +
      • [PHPBB3-12207] - prosilver layout breaks when error outputted before <html>
        • +
      • [PHPBB3-12208] - Plupload uploads files even if they were deleted from queue
        • +
      • [PHPBB3-12210] - dbtools::sql_create_table incorrectly throws error related to auto-increment length on non auto-increment fields
        • +
      • [PHPBB3-12212] - HTML in attachment file name rendered before upload
        • +
      • [PHPBB3-12216] - Undefined index: lang_options when creating date profile field
        • +
      • [PHPBB3-12220] - Debug message if no unread messages are present
        • +
      • [PHPBB3-12222] - Replace hardoded comma with translatable separator in forumlist_body.html
        • +
      • [PHPBB3-12223] - Pagination displayes additional &bull; when PAGE_NUMBER is empty
        • +
      • [PHPBB3-12226] - Incorrectly used plurals in ucp.php MOVE_PM_ERROR and FOLDER_MESSAGE_STATUS
        • +
      • [PHPBB3-12227] - "X from Y messages" should be "X out of Y messages"
        • +
      • [PHPBB3-12243] - subsilver2 is missing profile field files
        • +
      • [PHPBB3-12245] - "Invalid id refernce" for label "joined" and "group_id" in acp_prune_users.html
        • +
      • [PHPBB3-12249] - Undefined variable: row when editing profile
        • +
      • [PHPBB3-12250] - Remove deprecated phpbb_clean_path function
        • +
      • [PHPBB3-12251] - Clean up and Enhancement of Custom Profile Fields
        • +
      • [PHPBB3-12256] - phpbb\notification\type\admin_activate_user uses $sql as fetchrow parameter
        • +
      • [PHPBB3-12261] - Login redirect from extension front controllers broken
        • +
      • [PHPBB3-12263] - \phpbb\db\migration\tool\module.php contains several errors
        • +
      • [PHPBB3-12267] - Functional testcase method get_extension_manager() uses undefined variable php_ext
        • +
      • [PHPBB3-12271] - Decouple dropdown header/footer from #notification_list
        • +
      • [PHPBB3-12272] - Hardcoded colon in subforums list
        • +
      +

      Improvement

      +
        +
      • [PHPBB3-9255] - Friends Sidebar has scability issues..
        • +
      • [PHPBB3-9479] - Empty paragraphs for vertical spacing are rather old-fashioned
        • +
      • [PHPBB3-9709] - Missing language files for MCP could be substituted by default / english ones
        • +
      • [PHPBB3-9871] - Update version check file to use json format
        • +
      • [PHPBB3-10288] - Templates including other templates in loop can't access variables
        • +
      • [PHPBB3-10549] - Languages variables should be used, not hardcoded
        • +
      • [PHPBB3-10555] - Copyright notice in overall_header.html is not translatable
        • +
      • [PHPBB3-10945] - Show entered search query in the search box when no results are found.
        • +
      • [PHPBB3-11019] - Ability to store array of data in a log
        • +
      • [PHPBB3-11022] - Add "Tahoma" to used font families in css files
        • +
      • [PHPBB3-11040] - PostgreSQL fulltext search improvement
        • +
      • [PHPBB3-11111] - Allow only vertical resize on the textarea.
        • +
      • [PHPBB3-11179] - change the start parameter in search when out of bounds to display last(or first) page
        • +
      • [PHPBB3-11201] - MSNM / WLM closing - redundant profile field
        • +
      • [PHPBB3-11254] - Check CRLF line endings in the test suite
        • +
      • [PHPBB3-11297] - Running tests doc should mention dbunit dependency
        • +
      • [PHPBB3-11610] - Use a more secure hashing method like bcrypt
        • +
      • [PHPBB3-11645] - Rename ".MODs" tab in the ACP
        • +
      • [PHPBB3-11693] - Change phpbb_db_driver::sql_build_array() to support DELETE
        • +
      • [PHPBB3-11716] - Migration to convert soft delete/trash bin mods to 3.1 soft delete
        • +
      • [PHPBB3-12029] - Module names in the ACP should not be truncated when they are too long
        • +
      • [PHPBB3-12073] - Small text size in ACP between <samp></samp> and <code></code> tags
        • +
      • [PHPBB3-12106] - Document exceptions to "Disable Board" in ACP.
        • +
      • [PHPBB3-12114] - Convert current profile fields to custom-profile-field system
        • +
      • [PHPBB3-12117] - Nested Set Tree Classes Should be able to get all roots
        • +
      • [PHPBB3-12166] - Add template event "quickreply_editor_message_box_before"
        • +
      • [PHPBB3-12167] - Allow users to change style via style parameter by default
        • +
      • [PHPBB3-12190] - Add core event "core.modify_submit_post_data"
        • +
      • [PHPBB3-12217] - Add template events to viewtopic_body.html
        • +
      • [PHPBB3-12224] - Add template method to assign block arrays
        • +
      • [PHPBB3-12231] - Add template events to forumlist_body.html
        • +
      • [PHPBB3-12238] - There is no cancel input type.
        • +
      • [PHPBB3-12239] - Move deprecated password functions to compatibility file
        • +
      • [PHPBB3-12240] - Adding specific class names to buttons in posting_buttons.html
        • +
      • [PHPBB3-12241] - Event to add and/or modify acp_board configurations
        • +
      • [PHPBB3-12244] - Remove ambiguity between Extension Tab and Extensions Management links
        • +
      • [PHPBB3-12248] - Extension Details Homepage should be a clickable link
        • +
      • [PHPBB3-12259] - Too many redundant tests are run on Travis
        • +
      • [PHPBB3-12260] - Add core event to delete_posts() function
        • +
      • [PHPBB3-12262] - Adjust a script to export the events in wiki format
        • +
      +

      Sub-task

      +
        +
      • [PHPBB3-12115] - Convert occupation/interests profile field to custom field
        • +
      • [PHPBB3-12169] - Convert location user field to profile field
        • +
      • [PHPBB3-12187] - Convert website user field to profile field
        • +
      • [PHPBB3-12233] - Allowing CPF to be have an icon on viewtopic and be listed in the contact section of the profile
        • +
      • [PHPBB3-12234] - Convert ICQ user field to profile field
        • +
      • [PHPBB3-12235] - Convert MSN/WLM user field to profile field
        • +
      • [PHPBB3-12236] - Convert AOL user field to profile field
        • +
      • [PHPBB3-12237] - Convert Yahoo user field to profile field
        • +
      +

      Task

      +
        +
      • [PHPBB3-10763] - Audit code for non-static functions called statically
        • +
      • [PHPBB3-10793] - Use db_tools in create_schema_files
        • +
      • [PHPBB3-11509] - Travis should check commit message format
        • +
      • [PHPBB3-11764] - Remove Subsilver2 from installation packages
        • +
      • [PHPBB3-12177] - Add event ucp_zebra_friend_list_before/after
        • +
      • [PHPBB3-12180] - CodeSniffer: Ensure each file ends with a single newline
        • +
      + + +

      1.ii. Changes since 3.1.0-a2

      Bug

        @@ -197,7 +345,7 @@
      • [PHPBB3-12147] - Remove Travis CI notification configuration
      -

      1.ii. Changes since 3.1.0-a1

      +

      1.iii. Changes since 3.1.0-a1

      Bug

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

      1.iii. Changes since 3.0.x

      +

      1.iv. Changes since 3.0.x

      Bug

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

      1.iv. Changes since 3.0.11

      +

      1.v. Changes since 3.0.11

      Bug

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

      1.v. Changes since 3.0.10

      +

      1.vi. Changes since 3.0.10

      Bug

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

      1.vi. Changes since 3.0.9

      +

      1.vii. Changes since 3.0.9

      Bug

        @@ -1370,7 +1518,7 @@
      • [PHPBB3-10480] - Automate changelog building
      -

      1.vii. Changes since 3.0.8

      +

      1.viii. Changes since 3.0.8

      Bug

      @@ -1738,7 +1886,7 @@ -

      1.viii. Changes since 3.0.7-PL1

      +

      1.ix. Changes since 3.0.7-PL1

      Security

        @@ -2196,13 +2344,13 @@
      -

      1.ix. Changes since 3.0.7

      +

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

      +

      1.xi. Changes since 3.0.6

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

      1.xi. Changes since 3.0.5

      +

      1.xii. Changes since 3.0.5

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

      1.xii. Changes since 3.0.4

      +

      1.xiii. Changes since 3.0.4

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

      1.xiii. Changes since 3.0.3

      +

      1.xiv. Changes since 3.0.3

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

      1.xiv. Changes since 3.0.2

      +

      1.xv. Changes since 3.0.2

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

      +

      1.xvi. Changes since 3.0.1

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

      1.xvi. Changes since 3.0.0

      +

      1.xvii. Changes since 3.0.0

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

      1.xvii. Changes since 3.0.RC8

      +

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

      1.xviii. Changes since 3.0.RC7

      +

      1.xix. Changes since 3.0.RC7

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

      1.xix. Changes since 3.0.RC6

      +

      1.xx. Changes since 3.0.RC6

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

      1.xx. Changes since 3.0.RC5

      +

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

      1.xxi. Changes since 3.0.RC4

      +

      1.xxii. Changes since 3.0.RC4

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

      1.xxii. Changes since 3.0.RC3

      +

      1.xxiii. Changes since 3.0.RC3

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

      1.xxiii. Changes since 3.0.RC2

      +

      1.xxiv. Changes since 3.0.RC2

      • [Fix] Re-allow searching within the memberlist
        • @@ -3190,7 +3338,7 @@
      -

      1.xxiv. Changes since 3.0.RC1

      +

      1.xxv. 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 c2c7ca0abd..fe23ed5a9a 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -24,7 +24,7 @@ if (!defined('IN_PHPBB')) */ // phpBB Version -define('PHPBB_VERSION', '3.1.0-a4-dev'); +define('PHPBB_VERSION', '3.1.0-b2-dev'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index 034b590331..e8c8a7431d 100644 --- a/phpBB/install/convertors/convert_phpbb20.php +++ b/phpBB/install/convertors/convert_phpbb20.php @@ -33,7 +33,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-a3', + 'phpbb_version' => '3.1.0-b1', 'author' => 'phpBB Group', 'dbms' => $dbms, 'dbhost' => $dbhost, diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 306098bc2b..885093f1ed 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -269,7 +269,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-a4-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.0-b2-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/beta1.php b/phpBB/phpbb/db/migration/data/v310/beta1.php new file mode 100644 index 0000000000..36d0c62b6f --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v310/beta1.php @@ -0,0 +1,33 @@ +