[ticket/13331] Use docs target for this branch, add docs-all for all branches
* bantu/ticket/13331:
[ticket/13331] Use docs target for this branch, add docs-all for dev branches.
Conflicts:
build/build.xml
build/sami-checkout.conf.php
* develop-ascraeus:
[ticket/13271] Disable CC sender feature for anonymous users
[prep-release-3.1.1] Add 3.1.1 CHANGELOG
[prep-release-3.1.1] Add 3.1.1 migration file
[ticket/13263] Make sure default style exists and clean up code
[ticket/13263] Only install/set prosilver if no style available
[ticket/13263] Use prosilver as default style if user's style doesn't exist
[ticket/security-164] Correctly format page_name
[ticket/security-164] Sanitize all global variables in symfony_request class
[ticket/13248] Use functional framework login method in tests
[ticket/13248] Correctly pass provider name
[ticket/13248] Always use provider collection for getting provider
[ticket/13248] Allow specifying different auth provider in provider collection
[ticket/13248] Use auth provider collection for getting provider
[ticket/13262] Mention htaccess file when updating from 3.0 to 3.1
[ticket/13267] Update Automatic Update instructions to include vendor directory
[ticket/13268] Properly append ternary result in get_existing_indexes()
[prep-release-3.1.1] Update version number to 3.1.1
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/schemas/schema_data.sql
phpBB/styles/prosilver/style.cfg
phpBB/styles/subsilver2/style.cfg
phpBB/styles/subsilver2/template/memberlist_email.html
* prep-release-3.1.1:
[ticket/13271] Disable CC sender feature for anonymous users
[prep-release-3.1.1] Add 3.1.1 CHANGELOG
[prep-release-3.1.1] Add 3.1.1 migration file
[ticket/13263] Make sure default style exists and clean up code
[ticket/13263] Only install/set prosilver if no style available
[ticket/13263] Use prosilver as default style if user's style doesn't exist
[ticket/security-164] Correctly format page_name
[ticket/security-164] Sanitize all global variables in symfony_request class
[ticket/13248] Use functional framework login method in tests
[ticket/13248] Correctly pass provider name
[ticket/13248] Always use provider collection for getting provider
[ticket/13248] Allow specifying different auth provider in provider collection
[ticket/13248] Use auth provider collection for getting provider
[ticket/13262] Mention htaccess file when updating from 3.0 to 3.1
[ticket/13267] Update Automatic Update instructions to include vendor directory
[ticket/13268] Properly append ternary result in get_existing_indexes()
[prep-release-3.1.1] Update version number to 3.1.1
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/schemas/schema_data.sql
* develop-ascraeus:
[ticket/13137] Create schema.json in build script
[ticket/13137] Improve output of create_schema_files.php
[ticket/13137] Add schema.json file to .gitignore
[ticket/13137] Generate the schema when the schema.json file is not available
[ticket/13137] Remove schema.json file
* develop-ascraeus:
[prep-release-3.1.0-RC4] Update phpBB Version for RC4 development
[prep-release-3.1.0-RC4] Add changelog for 3.1.0-RC4
[prep-release-3.1.0-RC4] Prepare Changelog
[prep-release-3.1.0-RC4] Add migration for 3.1.0-RC4
[prep-release-3.1.0-RC4] Update version to 3.1.0-RC4
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/schemas/schema_data.sql
phpBB/styles/prosilver/style.cfg
phpBB/styles/subsilver2/style.cfg
* develop-ascraeus:
[prep-release-3.1.0-RC3] Update phpBB Version for RC4 development
[prep-release-3.1.0-RC3] Add changelog for 3.1.0-RC3
[prep-release-3.1.0-RC3] Prepare Changelog
[prep-release-3.1.0-RC3] Add migration for 3.1.0-RC3
[prep-release-3.1.0-RC3] Update version to 3.1.0-RC3
Conflicts:
phpBB/styles/subsilver2/style.cfg
The --ignore parameter takes a case-insensitive pattern and as such
'phpBB/phpbb/*' matches any '/home/travis/build/phpbb/phpbb/...' file name.
This results in nothing being checked against ruleset-php-legacy.xml.
Using absolute paths in the --ignore pattern fixes this issues.
PHPBB3-12682
* task/sami:
[task/sami] Replace phpdoctor with sami.
[task/sami] Add sami/sami as a composer development dependency.
Conflicts:
phpBB/composer.json
phpBB/composer.lock
