aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Expand)AuthorAgeFilesLines
* [ticket/11653] Use $parse_flagsBruno Ais2013-08-011-1/+2
* [ticket/11653] generate_text_for_display on mcp/mcp_topic.phpBruno Ais2013-07-161-7/+1
* Merge remote-tracking branch 'remotes/Hardolaf/ticket/11626' into developNathaniel Guse2013-07-124-53/+56
|\
| * [ticket/11626] Remove last reference to template in ldapJoseph Warner2013-07-121-2/+0
| * [ticket/11626] Remove LDAP dependency on templateJoseph Warner2013-07-123-19/+26
| * [ticket/11626] Make identifier uppercase per style requirementsJoseph Warner2013-07-111-1/+1
| * [ticket/11626] Change the identifier template file in the templateJoseph Warner2013-07-111-1/+1
| * [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-112-5/+4
| * [ticket/11626] LDAP Auth ACP Template FileJoseph Warner2013-07-111-0/+2
| * [ticket/11626] Create get_acp_template method for auth providersJoseph Warner2013-07-113-1/+40
* | 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-121-2/+2
|\ \ \ | |/ / |/| |
| * | [develop-olympus] Increment version number to 3.0.13-dev.Andreas Fischer2013-07-121-1/+1
| * | [develop-olympus] Bump version numbers for 3.0.12-RC1 release.Andreas Fischer2013-07-121-1/+1
* | | 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-123-3/+3
|\ \ \
| * | | [ticket/11662] Typos: occured -> occurredAndreas Fischer2013-07-123-3/+3
* | | | 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-121-1/+1
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | [ticket/11662] Typos: occured -> occurredAndreas Fischer2013-07-121-1/+1
* | | Merge pull request #1522 from igorw/feature/bootstrap-dicNils Adermann2013-07-111-12/+68
|\ \ \
| * | | [feature/bootstrap-dic] Bootstrap container from config.phpIgor Wiedler2013-07-111-12/+68
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-07-121-1/+2
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge branch 'develop-olympus' of https://github.com/phpbb/phpbb3 into ticket...Marc Alexander2013-07-118-17/+45
| |\ \
| | * \ Merge remote-tracking branch 'remotes/nickv/ticket/8319' into develop-olympusNathaniel Guse2013-07-111-3/+11
| | |\ \
| * | | | [ticket/11548] Run array_map on complete error array and not just colour_errorMarc Alexander2013-07-111-1/+2
* | | | | [ticket/11388] INCLUDECSSNathaniel Guse2013-07-114-0/+71
* | | | | Merge pull request #1470 from EXreaction/feature/twigNils Adermann2013-07-1132-2040/+2211
|\ \ \ \ \
| * | | | | [ticket/11388] Do not append assets_version if using remote path (e.g. http)Nathaniel Guse2013-07-111-3/+2
| * | | | | [ticket/11388] Fix typoNathaniel Guse2013-07-111-3/+3
| * | | | | [ticket/11388] Remove typehints (causing tests to fail)Nathaniel Guse2013-07-111-1/+1
| * | | | | [ticket/11388] Disable cache if IN_INSTALL definedNathaniel Guse2013-07-111-1/+1
| * | | | | [ticket/11388] Do not modify by referenceNathaniel Guse2013-07-111-6/+8