* develop-ascraeus:
[ticket/12311] Use British-English spelling of licence in lang file
[ticket/12311] Use valid composer schema - license - for extensions
* vsephpbb/ticket/12311:
[ticket/12311] Use British-English spelling of licence in lang file
[ticket/12311] Use valid composer schema - license - for extensions
* develop-ascraeus:
[ticket/11230] Add missing last returns to dock block
[ticket/11230] Update cache driver dock blocks
[ticket/11230] Use inheritdoc in docblocks in cache drivers
* vsephpbb/ticket/11230:
[ticket/11230] Add missing last returns to dock block
[ticket/11230] Update cache driver dock blocks
[ticket/11230] Use inheritdoc in docblocks in cache drivers
* develop-ascraeus:
[ticket/11360] Updating default value of $display_online_list
[ticket/11360] Avoiding online list where not required
[ticket/11360] Change second parameter in page_header function
* geetakshi/ticket/11360:
[ticket/11360] Updating default value of $display_online_list
[ticket/11360] Avoiding online list where not required
[ticket/11360] Change second parameter in page_header function
Upgrade all composer.phar to 1.0.0-alpha8
* s9e/ticket/12302:
[ticket/12302] Added `--no-dev` to composer call in build.xml
[ticket/12302] Updated composer.phar to 1.0.0-alpha8
[ticket/12257] Use MyISAM in PHP 5.3 environment such that FULLTEXT test...
* bantu/ticket/12257:
[ticket/12257] Use MyISAM in PHP 5.3 environment such that FULLTEXT tests run.
Conflicts:
.travis.yml
Changing the language string from "Ban usernames" to "Ban users"
to clarify its use. It bans users by their name and not the username itself
PHPBB3-10174
# By Joas Schilling
# Via Dhruv (1) and Joas Schilling (1)
* develop-ascraeus:
[ticket/12268] Do not use substr but just compare the character
[ticket/12268] Rename class file to recursive_dot_prefix_filter_iterator.php
[ticket/12268] Move class out of extension namespace and rename it
[ticket/12268] Do not search in folders starting with a dot
[ticket/12268] Use FilesystemIterator::SKIP_DOTS
[ticket/12268] Extension finder should not crawl through .git/ of extensions
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/ticket/12268:
[ticket/12268] Do not use substr but just compare the character
[ticket/12268] Rename class file to recursive_dot_prefix_filter_iterator.php
[ticket/12268] Move class out of extension namespace and rename it
[ticket/12268] Do not search in folders starting with a dot
[ticket/12268] Use FilesystemIterator::SKIP_DOTS
[ticket/12268] Extension finder should not crawl through .git/ of extensions
* develop-ascraeus:
[ticket/12035] Correcting the condition
[ticket/12035] Adding necessary conditions
[ticket/12035] Adding link to user posts to ACP page
* develop-olympus:
[ticket/12035] Correcting the condition
[ticket/12035] Adding necessary conditions
[ticket/12035] Adding link to user posts to ACP page
Conflicts:
phpBB/adm/style/acp_users_overview.html
* geetakshi/ticket/12035:
[ticket/12035] Correcting the condition
[ticket/12035] Adding necessary conditions
[ticket/12035] Adding link to user posts to ACP page
