aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* [ticket/11215] Don't try to use when it isn't thereDavid King2013-07-131-2/+2
* Merge branch 'develop' into ticket/11215David King2013-07-1327-252/+577
|\
| * Merge branch 'develop-olympus' into developNathaniel Guse2013-07-132-2/+55
| |\
| | * 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
| | | * [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-132-64/+118
| |\ \ \
| | * | | [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] Fix notification options conversionNathaniel Guse2013-05-022-64/+106
| * | | | [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-126-84/+78
| |\ \ \ \ \
| | * | | | | [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-121-0/+26
| |\ \ \ \ \
| | * | | | | [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-123-5/+5
| | * | | [develop-olympus] Bumping version numbers to final for 3.0.12 releases.Andreas Fischer2013-07-1210-12/+12
| * | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-07-121-1/+2
| |\ \ \ \ | | |/ / /
| | * | | [ticket/11548] Fix incorrect usage of array_map on acp groups pageMarc Alexander2013-07-121-1/+2
| * | | | [ticket/11665] Can't change file names already sent to set_filenamesNathaniel Guse2013-07-121-1/+1
| * | | | Merge pull request #1526 from bantu/ticket/11662-developNathan Guse2013-07-124-4/+4
| |\ \ \ \
| | * | | | [ticket/11662] Typos: occured -> occurredAndreas Fischer2013-07-124-4/+4
| * | | | | Merge remote-tracking branch 'EXreaction/ticket/11660' into developAndreas Fischer2013-07-121-5/+9
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | [ticket/11660] Fix bugs from bugs in #11651 (missing vars, db->sql_connect)Nathaniel Guse2013-07-121-5/+9
| * | | | | Merge branch 'develop-olympus' into developNathaniel Guse2013-07-124-6/+6
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
| | * | | [ticket/11662] Typos: occured -> occurredAndreas Fischer2013-07-124-6/+6
* | | | | [ticket/11215] Don't try to correct paths during testsDavid King2013-07-121-1/+1
* | | | | [ticket/11215] use globalDavid King2013-07-111-2/+2