aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [ticket/9657] Define user before injectingJoas Schilling2013-07-135-1/+5
* [ticket/9657] Remove old codeJoas Schilling2013-07-131-1/+0
* Merge remote-tracking branch 'phpbb/develop' into ticket/9657Joas Schilling2013-07-13122-2824/+3600
|\
| * Merge remote-tracking branch 'remotes/Hardolaf/ticket/11626' into developNathaniel Guse2013-07-126-54/+89
| |\
| | * [ticket/11626] Remove last reference to template in ldapJoseph Warner2013-07-121-2/+0
| | * [ticket/11626] Remove LDAP dependency on templateJoseph Warner2013-07-124-20/+26
| | * [ticket/11626] Make identifier uppercase per style requirementsJoseph Warner2013-07-112-2/+2
| | * [ticket/11626] Change the identifier template file in the templateJoseph Warner2013-07-112-2/+2
| | * [ticket/11626] Call method only one time per providerJoseph Warner2013-07-111-1/+1
| | * [ticket/11626] Change interface to match functionalityJoseph Warner2013-07-114-50/+8
| | * [ticket/11626] Include the template file in acp_boardJoseph Warner2013-07-113-6/+5
| | * [ticket/11626] LDAP Auth ACP Template FileJoseph Warner2013-07-112-0/+34
| | * [ticket/11626] Create get_acp_template method for auth providersJoseph Warner2013-07-114-1/+41
| * | Merge pull request #1515 from Hardolaf/feature/auth-refactorNathan Guse2013-07-129-84/+155
| |\ \
| | * | [feature/auth-refactor] Add parent::setUp() in setUp()Joseph Warner2013-07-111-0/+2
| | * | [feature/auth-refactor] ChangesJoseph Warner2013-07-111-7/+12
| | * | [feature/auth-refactor] DataProvider for acp_board testJoseph Warner2013-07-111-7/+14
| | * | [feature/auth-refactor] Test selecting invalid provider as wellJoseph Warner2013-07-111-2/+4
| | * | [feature/auth-refactor] Code style changeJoseph Warner2013-07-111-3/+3
| | * | [feature/auth-refactor] Move test classes into separate directoryJoseph Warner2013-07-113-13/+31
| | * | [feature/auth-refactor] Test that acp_board excludes invalid providersJoseph Warner2013-07-111-0/+43
| | * | [feature/auth-refactor] Fix style issueJoseph Warner2013-07-111-1/+1
| | * | [feature/auth-refactor] Fix typoJoseph Warner2013-07-111-1/+1
| | |/
| | * [feature/auth-refactor] Remove invalid providers from acp selectJoseph Warner2013-07-111-6/+4
| | * [feature/auth-refactor] Check that providers implement auth interfaceJoseph Warner2013-07-112-0/+12
| | * [feature/auth-refactor] Remove full stopJoseph Warner2013-07-111-1/+1
| | * [feature/auth-refactor] Code style fix for doc blocksJoseph Warner2013-07-111-14/+14
| | * [feature/auth-refactor] Change 'must' to 'should'Joseph Warner2013-07-111-1/+1
| | * [feature/auth-refactor] Remove implements on classes extending baseJoseph Warner2013-07-113-4/+1
| | * [feature/auth-refactor] Prevent fatal error in php < 5.3.23Joseph Warner2013-07-111-5/+0
| | * [feature/auth-refactor] Have a base auth classJoseph Warner2013-07-114-83/+75
| * | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into developAndreas Fischer2013-07-122-7/+34
| |\ \
| | * \ Merge remote-tracking branch 'remotes/Marc/ticket/11548-develop' into developNathaniel Guse2013-07-122-7/+34
| | |\ \
| | | * | [ticket/11548] Fix test errors in groups test on developMarc Alexander2013-07-121-7/+8
| | | * | [ticket/11548] Check upload avatar URL the same way as in phpBB 3.0Marc Alexander2013-07-121-0/+26
| * | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-07-122-22/+167
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | [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
| |\ \ \ \ | | |/ / /
| | * | | Merge remote-tracking branch 'remotes/igorw/ticket/11668' into develop-olympusNathaniel Guse2013-07-123-0/+12
| | |\ \ \
| | | * | | [ticket/11668] Run lint test at the end of the test suiteIgor Wiedler2013-07-123-0/+12
| | |/ / /
| * | | | Merge remote-tracking branch 'EXreaction/ticket/11669' into developAndreas Fischer2013-07-121-0/+3
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | [ticket/11669] Fix PHP bug #55124 (recursive mkdir on /./)Nathaniel Guse2013-07-121-0/+3
| * | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-07-123-50/+51
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge remote-tracking branch 'marc1706/ticket/11548-develop-olympus' into dev...Andreas Fischer2013-07-123-50/+51
| | |\ \ \
| | | * | | [ticket/11548] Fix incorrect usage of array_map on acp groups pageMarc Alexander2013-07-123-50/+51
| | |/ / /
| * | | | Merge remote-tracking branch 'EXreaction/ticket/11665' into developAndreas Fischer2013-07-122-1/+30
| |\ \ \ \
| | * | | | [ticket/11665] Fix test class nameNathaniel Guse2013-07-121-1/+1