* upstream/develop: (35 commits)
[ticket/10730] Added label tag around "select" text in post splitting UI
[ticket/10732] Add config_dev.php and config_test.php to .gitignore
[ticket/10586] Added space in if statement
[ticket/10586] Tidy up comments
[task/php5.3] Updated range of tested PHP versions
[task/php5.3] Looks like I missed a few places that needed PHP 5.2 changed to PHP 5.3.2
[task/php5.3] Changed minimum PHP requirement for Ascraeus to 5.3.2
[ticket/10129] Remove apostrophes and plurals in ACP user management -> permissions language file as per ticket.
[ticket/10703] Added a condition to check if ext directory exists
[ticket/10708] Check converted passwords for multi-byte characters
[ticket/10586] Tests finally work (thanks naderman)
[ticket/10586] Correctly purge board cache and don't rename install directory
[ticket/10586] trying to get tests to work
[ticket/10586] more work on getting tests to pass
[ticket/10586] Tests are coming along, just a little more to go
[ticket/10586] Rename install directory back to install/ after tests
[ticket/10586] browse tests now work, but mine dont. at least we are making progress
[ticket/10586] initial work on copying fixtures. Note that this depends on 10706
[ticket/10586] Adding the extensions used by the tests
[ticket/10586] Now tests run, but fail. But here is what I have.
...
Added label tags around the "select" text in the post splitting UI in the MCP.
Had to add IDs based on the post ID to the select boxes to allow label to
work. Tested in Firefox and Chrome.
PHPBB3-10730
* imkingdavid/ticket/10586:
[ticket/10586] Added space in if statement
[ticket/10586] Tidy up comments
[ticket/10586] Tests finally work (thanks naderman)
[ticket/10586] Correctly purge board cache and don't rename install directory
[ticket/10586] trying to get tests to work
[ticket/10586] more work on getting tests to pass
[ticket/10586] Tests are coming along, just a little more to go
[ticket/10586] Rename install directory back to install/ after tests
[ticket/10586] browse tests now work, but mine dont. at least we are making progress
[ticket/10586] initial work on copying fixtures. Note that this depends on 10706
[ticket/10586] Adding the extensions used by the tests
[ticket/10586] Now tests run, but fail. But here is what I have.
[ticket/10586] some bootstrap additions and test changes to try and make it work
[ticket/10586] test stuff. does not work yet, still need to put phpBB objects in bootstrap.php
[ticket/10586] Copy/paste fail fixed
[ticket/10586] Sanitize periods from class names, use manager to get path.
[ticket/10586] Removed file_exists() check because class_exists() covers that.
[ticket/10586] Extension front controller
* brunoais/feature/save-post-on-report:
[feature/save-post-on-report] Changed mark in subsilver2 to look like viewtopic
[feature/save-post-on-report] bbcode_nl2br missing.
[feature/save-post-on-report] Change the column type of reported text
[feature/save-post-on-report] Changed the name of the column
[feature/save-post-on-report] Bug fix table name
[feature/save-post-on-report] Saves the post reported when a report is creat
[feature/save-post-on-report] The complete changes for this feature
* imkingdavid/task/php5.3:
[task/php5.3] Updated range of tested PHP versions
[task/php5.3] Looks like I missed a few places that needed PHP 5.2 changed to PHP 5.3.2
[task/php5.3] Changed minimum PHP requirement for Ascraeus to 5.3.2
* upstream/develop: (30 commits)
[task/travis] Refactor php version check for dbunit install
[task/travis] Exclude functional and slow tests
[ticket/10719] Revert "Skip functional tests on PHP 5.2"
[task/travis-develop2] Update version from 5.3 to 5.3.2
[task/travis] Dropping support for 5.2 in develop branch
[task/travis] Some more small travis fixes
[task/travis] Rename travis phpunit config files
[task/travis] Fixing some travis issues
[ticket/10684] Adjust function and parameter name, minor changes.
[task/travis] Add automated testing to readme
[task/travis] Removing development information
[task/travis] Adding Travis Continuous Intergration Support
[ticket/10704] minor typo in a comment
[ticket/10717] Fix profile field sample in prosilver´s memberlist_view.html
[ticket/10691] Fixed the speed of creating search index
[task/php54-ascraeus] Bring p_master#module_auth into PHP 5 era.
[task/php54] Disable E_STRICT in Olympus when running on PHP 5.4.
[task/php54] Refactor error_reporting call slightly.
[ticket/10690] Fix undefined UNAPPROVED_POSTS_ZERO_TOTAL in queue
[ticket/10689] Fix "First character"-option in "Find a member"-search
...
The existence of ext directory is checked, if not present a proper
error message that file doesn't exist is printed out. No Fatal
Error messages.
PHPBB3-10703
* develop-olympus:
[ticket/10684] Adjust function and parameter name, minor changes.
[ticket/10684] Rename function phpbb_get_banned_users_ids() parameter
[ticket/10684] Remove intval mapping for array keys
[ticket/10684] Adjust pm_notifications() to handle stale bans
[ticket/10684] Cast user_id to integer
[ticket/10684] Refactor $sql_ignore_users array update
[ticket/10684] Remove isset() for $sql_ignore_users update
[ticket/10684] Fix 2 typos in comment lines.
[ticket/10684] Send notifications for users with stale bans
Conflicts:
phpBB/includes/functions_user.php
* rxu/ticket/10684:
[ticket/10684] Adjust function and parameter name, minor changes.
[ticket/10684] Rename function phpbb_get_banned_users_ids() parameter
[ticket/10684] Remove intval mapping for array keys
[ticket/10684] Adjust pm_notifications() to handle stale bans
[ticket/10684] Cast user_id to integer
[ticket/10684] Refactor $sql_ignore_users array update
[ticket/10684] Remove isset() for $sql_ignore_users update
[ticket/10684] Fix 2 typos in comment lines.
[ticket/10684] Send notifications for users with stale bans
With 5efdbfa5e4 reverted.
* develop-olympus:
[task/php54] Disable E_STRICT in Olympus when running on PHP 5.4.
[task/php54] Refactor error_reporting call slightly.
