aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11643] generate_text_for_display on mcp/mcp_queue.phpBruno Ais2013-07-161-11/+1
| | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11643
* Merge remote-tracking branch 'remotes/Hardolaf/ticket/11626' into developNathaniel Guse2013-07-126-54/+89
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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
| * [ticket/11626] Remove last reference to template in ldapJoseph Warner2013-07-121-2/+0
| | | | | | | | PHPBB3-11626
| * [ticket/11626] Remove LDAP dependency on templateJoseph Warner2013-07-124-20/+26
| | | | | | | | | | | | Returns template vars rather than requiring the template. PHPBB3-11626
| * [ticket/11626] Make identifier uppercase per style requirementsJoseph Warner2013-07-112-2/+2
| | | | | | | | PHPBB3-11626
| * [ticket/11626] Change the identifier template file in the templateJoseph Warner2013-07-112-2/+2
| | | | | | | | PHPBB3-11626
| * [ticket/11626] Call method only one time per providerJoseph Warner2013-07-111-1/+1
| | | | | | | | PHPBB3-11626
| * [ticket/11626] Change interface to match functionalityJoseph Warner2013-07-114-50/+8
| | | | | | | | | | | | | | Changes the interface so that it matches the new functionality of phpbb_provider_auth_interface::acp(). PHPBB3-11626
| * [ticket/11626] Include the template file in acp_boardJoseph Warner2013-07-113-6/+5
| | | | | | | | PHPBB3-11626
| * [ticket/11626] LDAP Auth ACP Template FileJoseph Warner2013-07-112-0/+34
| | | | | | | | PHPBB3-11626
| * [ticket/11626] Create get_acp_template method for auth providersJoseph Warner2013-07-114-1/+41
| | | | | | | | PHPBB3-11626
* | Merge pull request #1515 from Hardolaf/feature/auth-refactorNathan Guse2013-07-129-84/+155
|\ \ | | | | | | [feature/auth-refactor] Use a base class for all authentication providers
| * | [feature/auth-refactor] Add parent::setUp() in setUp()Joseph Warner2013-07-111-0/+2
| | | | | | | | | | | | PHPBB3-9734
| * | [feature/auth-refactor] ChangesJoseph Warner2013-07-111-7/+12
| | | | | | | | | | | | PHPBB3-9734
| * | [feature/auth-refactor] DataProvider for acp_board testJoseph Warner2013-07-111-7/+14
| | | | | | | | | | | | PHPBB3-9734
| * | [feature/auth-refactor] Test selecting invalid provider as wellJoseph Warner2013-07-111-2/+4
| | | | | | | | | | | | PHPBB3-9734
| * | [feature/auth-refactor] Code style changeJoseph Warner2013-07-111-3/+3
| | | | | | | | | | | | PHPBB3-9734
| * | [feature/auth-refactor] Move test classes into separate directoryJoseph Warner2013-07-113-13/+31
| | | | | | | | | | | | PHPBB3-9734
| * | [feature/auth-refactor] Test that acp_board excludes invalid providersJoseph Warner2013-07-111-0/+43
| | | | | | | | | | | | PHPBB3-9734
| * | [feature/auth-refactor] Fix style issueJoseph Warner2013-07-111-1/+1
| | | | | | | | | | | | PHPBB3-9734
| * | [feature/auth-refactor] Fix typoJoseph Warner2013-07-111-1/+1
| |/ | | | | | | PHPBB3-9734
| * [feature/auth-refactor] Remove invalid providers from acp selectJoseph Warner2013-07-111-6/+4
| | | | | | | | PHPBB3-9734
| * [feature/auth-refactor] Check that providers implement auth interfaceJoseph Warner2013-07-112-0/+12
| | | | | | | | PHPBB3-9734
| * [feature/auth-refactor] Remove full stopJoseph Warner2013-07-111-1/+1
| | | | | | | | PHPBB3-9734
| * [feature/auth-refactor] Code style fix for doc blocksJoseph Warner2013-07-111-14/+14
| | | | | | | | PHPBB3-9734
| * [feature/auth-refactor] Change 'must' to 'should'Joseph Warner2013-07-111-1/+1
| | | | | | | | PHPBB3-9734
| * [feature/auth-refactor] Remove implements on classes extending baseJoseph Warner2013-07-113-4/+1
| | | | | | | | PHPBB3-9734
| * [feature/auth-refactor] Prevent fatal error in php < 5.3.23Joseph Warner2013-07-111-5/+0
| | | | | | | | PHPBB3-9734
| * [feature/auth-refactor] Have a base auth classJoseph Warner2013-07-114-83/+75
| | | | | | | | PHPBB3-9734
* | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into developAndreas Fischer2013-07-122-7/+34
|\ \ | | | | | | | | | | | | | | | * '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
| * \ Merge remote-tracking branch 'remotes/Marc/ticket/11548-develop' into developNathaniel Guse2013-07-122-7/+34
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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
| | * | [ticket/11548] Fix test errors in groups test on developMarc Alexander2013-07-121-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | [ticket/11548] Check upload avatar URL the same way as in phpBB 3.0Marc Alexander2013-07-121-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-07-122-22/+167
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | | [develop-olympus] Increment version number to 3.0.13-dev.Andreas Fischer2013-07-123-3/+3
| | | |
| * | | [develop-olympus] Add changelog for 3.0.12 release.Andreas Fischer2013-07-121-20/+165
| | | |
| * | | [develop-olympus] Bump version numbers for 3.0.12-RC1 release.Andreas Fischer2013-07-124-6/+6
| | | |
| * | | [develop-olympus] Bumping version numbers to final for 3.0.12 releases.Andreas Fischer2013-07-1210-12/+12
| | | |
* | | | Merge branch 'develop-olympus' into developNathaniel Guse2013-07-123-0/+12
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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
| * | | Merge remote-tracking branch 'remotes/igorw/ticket/11668' into develop-olympusNathaniel Guse2013-07-123-0/+12
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Igor Wiedler # Via Igor Wiedler * remotes/igorw/ticket/11668: [ticket/11668] Run lint test at the end of the test suite
| | * | | [ticket/11668] Run lint test at the end of the test suiteIgor Wiedler2013-07-123-0/+12
| |/ / / | | | | | | | | | | | | | | | | | | | | The lint test is very slow. Running it at the end should speed up the development cycle. PHPBB3-11668
* | | | Merge remote-tracking branch 'EXreaction/ticket/11669' into developAndreas Fischer2013-07-121-0/+3
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | * EXreaction/ticket/11669: [ticket/11669] Fix PHP bug #55124 (recursive mkdir on /./)
| * | | [ticket/11669] Fix PHP bug #55124 (recursive mkdir on /./)Nathaniel Guse2013-07-121-0/+3
| | | | | | | | | | | | | | | | PHPBB3-11669
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-07-123-50/+51
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | | Merge remote-tracking branch 'marc1706/ticket/11548-develop-olympus' into ↵Andreas Fischer2013-07-123-50/+51
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * marc1706/ticket/11548-develop-olympus: [ticket/11548] Fix incorrect usage of array_map on acp groups page
| | * | | [ticket/11548] Fix incorrect usage of array_map on acp groups pageMarc Alexander2013-07-123-50/+51
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge remote-tracking branch 'EXreaction/ticket/11665' into developAndreas Fischer2013-07-122-1/+30
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/11665: [ticket/11665] Fix test class name [ticket/11665] Can't change file names already sent to set_filenames
| * | | | [ticket/11665] Fix test class nameNathaniel Guse2013-07-121-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11665
| * | | | [ticket/11665] Can't change file names already sent to set_filenamesNathaniel Guse2013-07-122-1/+30
| | |/ / | |/| | | | | | | | | | PHPBB3-11665
* | | | Merge remote-tracking branch 'EXreaction/ticket/11664' into developAndreas Fischer2013-07-122-2/+2
|\ \ \ \ | |/ / / |/| | | | | | | | | | | * EXreaction/ticket/11664: [ticket/11664] Stop creating php.html file in root path in tests