aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [ticket/11684] Remove useless confirmation page after login and admin loginJoas Schilling2013-07-132-4/+3
* Merge branch 'develop-olympus' into developNathaniel Guse2013-07-134-2/+63
|\
| * Merge remote-tracking branch 'remotes/igorw/ticket/11668-travis' into develop...Nathaniel Guse2013-07-132-0/+8
| |\
| | * [ticket/11668] Move lint test to the end for travisIgor Wiedler2013-07-122-0/+8
| * | Merge branch 'prep-release-3.0.12' into develop-olympusNathaniel Guse2013-07-132-54/+115
| |\ \
| | * | [ticket/11671] Update composer.lockNathaniel Guse2013-07-131-0/+4
| | * | Merge remote-tracking branch 'remotes/naderman/ticket/11671' into prep-releas...Nathaniel Guse2013-07-132-58/+115
| | |\ \
| | | * | [ticket/11671] Add phing as a dependency and upgrade depsNils Adermann2013-07-122-58/+115
| | |/ /
* | | | Merge remote-tracking branch 'EXreaction/ticket/11420' into developJoas Schilling2013-07-135-64/+329
|\ \ \ \
| * | | | [ticket/11420] Fix testsNathaniel Guse2013-07-121-0/+21
| * | | | [ticket/11420] Fix testsNathaniel Guse2013-07-111-1/+1
| * | | | [ticket/11420] Fix testsNathaniel Guse2013-07-111-0/+7
| * | | | [ticket/11420] Use !==, === when comparing stringsNathan Guse2013-07-061-3/+3
| * | | | [ticket/11420] Fix comments, license linkNathan Guse2013-07-061-3/+15
| * | | | [ticket/11420] Rename migrations file to something more helpfulNathan Guse2013-05-101-2/+2
| * | | | [ticket/11420] Forgot to include mock sql_insert_bufferNathaniel Guse2013-05-031-0/+21
| * | | | [ticket/11420] Fix notification options conversionNathaniel Guse2013-05-024-64/+268
* | | | | [ticket/11671] Update composer.lockNathaniel Guse2013-07-131-15/+28
* | | | | 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