# By Igor Wiedler (1) and others
* develop-olympus:
[ticket/11671] Update composer.lock
[ticket/11671] Add phing as a dependency and upgrade deps
[ticket/11668] Move lint test to the end for travis
Conflicts:
phpBB/composer.lock
# By Nathaniel Guse (1) and Nils Adermann (1)
* prep-release-3.0.12:
[ticket/11671] Update composer.lock
[ticket/11671] Add phing as a dependency and upgrade deps
* phpbb/develop: (216 commits)
[ticket/11626] Remove last reference to template in ldap
[ticket/11626] Remove LDAP dependency on template
[develop-olympus] Increment version number to 3.0.13-dev.
[develop-olympus] Add changelog for 3.0.12 release.
[develop-olympus] Bump version numbers for 3.0.12-RC1 release.
[develop-olympus] Bumping version numbers to final for 3.0.12 releases.
[ticket/11669] Fix PHP bug #55124 (recursive mkdir on /./)
[ticket/11668] Run lint test at the end of the test suite
[ticket/11548] Fix test errors in groups test on develop
[ticket/11548] Check upload avatar URL the same way as in phpBB 3.0
[ticket/11548] Fix incorrect usage of array_map on acp groups page
[ticket/11665] Fix test class name
[ticket/11664] Stop creating php.html file in root path in tests
[ticket/11665] Can't change file names already sent to set_filenames
[ticket/11662] Typos: occured -> occurred
[ticket/11662] Typos: occured -> occurred
[ticket/11660] Fix bugs from bugs in #11651 (missing vars, db->sql_connect)
[feature/auth-refactor] Add parent::setUp() in setUp()
[feature/auth-refactor] Changes
[feature/auth-refactor] DataProvider for acp_board test
...
# By Joseph Warner
# Via Joseph Warner
* remotes/Hardolaf/ticket/11626:
[ticket/11626] Remove last reference to template in ldap
[ticket/11626] Remove LDAP dependency on template
[ticket/11626] Make identifier uppercase per style requirements
[ticket/11626] Change the identifier template file in the template
[ticket/11626] Call method only one time per provider
[ticket/11626] Change interface to match functionality
[ticket/11626] Include the template file in acp_board
[ticket/11626] LDAP Auth ACP Template File
[ticket/11626] Create get_acp_template method for auth providers
* 'develop' of git://github.com/phpbb/phpbb3:
[ticket/11548] Fix test errors in groups test on develop
[ticket/11548] Check upload avatar URL the same way as in phpBB 3.0
* develop-olympus:
[develop-olympus] Increment version number to 3.0.13-dev.
[develop-olympus] Add changelog for 3.0.12 release.
[develop-olympus] Bump version numbers for 3.0.12-RC1 release.
[develop-olympus] Bumping version numbers to final for 3.0.12 releases.
Conflicts:
build/build.xml
phpBB/docs/INSTALL.html
phpBB/includes/constants.php
phpBB/install/convertors/convert_phpbb20.php
phpBB/install/database_update.php
phpBB/install/schemas/schema_data.sql
phpBB/styles/prosilver/imageset/imageset.cfg
phpBB/styles/prosilver/style.cfg
phpBB/styles/prosilver/template/template.cfg
phpBB/styles/prosilver/theme/theme.cfg
phpBB/styles/subsilver2/imageset/imageset.cfg
phpBB/styles/subsilver2/style.cfg
phpBB/styles/subsilver2/template/template.cfg
phpBB/styles/subsilver2/theme/theme.cfg
# By Marc Alexander
# Via Marc Alexander
* remotes/Marc/ticket/11548-develop:
[ticket/11548] Fix test errors in groups test on develop
[ticket/11548] Check upload avatar URL the same way as in phpBB 3.0
# By Igor Wiedler
# Via Igor Wiedler (1) and Nathaniel Guse (1)
* develop-olympus:
[ticket/11668] Run lint test at the end of the test suite
Conflicts:
phpunit.xml.all
phpunit.xml.dist
phpunit.xml.functional
