# 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
This will fix the errors that appeared in the functional groups test due to
the changes in the new avatar system. The patch will make them work again.
PHPBB3-11548
The upload avatar URL was checked for its length in phpBB 3.0. Additionally,
starting with the new avatar system in phpBB 3.1, the URL was checked to
prevent improper URLs being submitted. This minor change is needed for proper
testing of the ucp and acp groups pages.
PHPBB3-11548
* develop-olympus:
[ticket/11548] Fix incorrect usage of array_map on acp groups page
Conflicts:
tests/functional/common_groups_test.php
tests/functional/ucp_groups_test.php
The array_map was only ran on small parts of the actual error array instead
of the whole one. This resulted in the output of the language variables' names
rather than their actual value.
PHPBB3-11548
