aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop' into ticket/11215David King2013-07-134-34/+205
|\ | | | | | | | | | | | | | | | | | | * develop: [ticket/11647] Always use & for URLs [ticket/11647] Allow custom ports [ticket/11647] Use $config for assets_version [ticket/11647] Fix invalid variable name [ticket/11647] New assets handling [ticket/11647] Fix tests for INCLUDEJS
| * Merge pull request #1519 from cyberalien/ticket/11647Nathan Guse2013-07-134-34/+205
| |\ | | | | | | Fix INCLUDEJS URLs handling
| | * [ticket/11647] Always use & for URLsVjacheslav Trushkin2013-07-113-16/+9
| | | | | | | | | | | | | | | | | | | | | Remove code for URLs separated with ; Add test case for mix of & and & in URLs PHPBB3-11647
| | * [ticket/11647] Allow custom portsVjacheslav Trushkin2013-07-111-4/+0
| | | | | | | | | | | | | | | | | | Allow custom port number in schema-relative URLs PHPBB3-11647
| | * [ticket/11647] Use $config for assets_versionVjacheslav Trushkin2013-07-111-1/+1
| | | | | | | | | | | | PHPBB3-11647
| | * [ticket/11647] Fix invalid variable nameVjacheslav Trushkin2013-07-111-3/+2
| | | | | | | | | | | | PHPBB3-11647
| | * [ticket/11647] New assets handlingVjacheslav Trushkin2013-07-112-14/+197
| | | | | | | | | | | | PHPBB-11647
| | * [ticket/11647] Fix tests for INCLUDEJSVjacheslav Trushkin2013-07-112-10/+10
| | | | | | | | | | | | PHPBB-11647
* | | [ticket/11215] Don't try to use when it isn't thereDavid King2013-07-131-2/+2
| | | | | | | | | | | | PHPBB3-112515
* | | Merge branch 'develop' into ticket/11215David King2013-07-1345-304/+970
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop: (53 commits) [ticket/11671] Update composer.lock [ticket/11671] Update composer.lock [ticket/11671] Add phing as a dependency and upgrade deps [ticket/11668] Move lint test to the end for travis [ticket/11626] Remove last reference to template in ldap [ticket/11626] Remove LDAP dependency on template [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. [ticket/11669] Fix PHP bug #55124 (recursive mkdir on /./) [ticket/11668] Run lint test at the end of the test suite [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 incorrect usage of array_map on acp groups page [ticket/11665] Fix test class name [ticket/11664] Stop creating php.html file in root path in tests [ticket/11665] Can't change file names already sent to set_filenames [ticket/11662] Typos: occured -> occurred [ticket/11662] Typos: occured -> occurred ...
| * | Merge branch 'develop-olympus' into developNathaniel Guse2013-07-134-2/+63
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Igor Wiedler (1) and others * develop-olympus: [ticket/11671] Update composer.lock [ticket/11671] Add phing as a dependency and upgrade deps [ticket/11668] Move lint test to the end for travis Conflicts: phpBB/composer.lock
| | * \ Merge remote-tracking branch 'remotes/igorw/ticket/11668-travis' into ↵Nathaniel Guse2013-07-132-0/+8
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus # By Igor Wiedler # Via Igor Wiedler * remotes/igorw/ticket/11668-travis: [ticket/11668] Move lint test to the end for travis
| | | * | [ticket/11668] Move lint test to the end for travisIgor Wiedler2013-07-122-0/+8
| | | | | | | | | | | | | | | | | | | | PHPBB3-11668
| | * | | Merge branch 'prep-release-3.0.12' into develop-olympusNathaniel Guse2013-07-132-54/+115
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Nathaniel Guse (1) and Nils Adermann (1) * prep-release-3.0.12: [ticket/11671] Update composer.lock [ticket/11671] Add phing as a dependency and upgrade deps
| | | * | | [ticket/11671] Update composer.lockNathaniel Guse2013-07-131-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11671
| | | * | | Merge remote-tracking branch 'remotes/naderman/ticket/11671' into ↵Nathaniel Guse2013-07-132-58/+115
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prep-release-3.0.12 # By Nils Adermann # Via Nils Adermann * remotes/naderman/ticket/11671: [ticket/11671] Add phing as a dependency and upgrade deps
| | | | * | | [ticket/11671] Add phing as a dependency and upgrade depsNils Adermann2013-07-122-58/+115
| | | |/ / / | | | | | | | | | | | | | | | | | | PHPBB3-11671
| * | | | | Merge remote-tracking branch 'EXreaction/ticket/11420' into developJoas Schilling2013-07-135-64/+329
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/11420: [ticket/11420] Fix tests [ticket/11420] Fix tests [ticket/11420] Fix tests [ticket/11420] Use !==, === when comparing strings [ticket/11420] Fix comments, license link [ticket/11420] Rename migrations file to something more helpful [ticket/11420] Forgot to include mock sql_insert_buffer [ticket/11420] Fix notification options conversion
| | * | | | | [ticket/11420] Fix testsNathaniel Guse2013-07-121-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11420
| | * | | | | [ticket/11420] Fix testsNathaniel Guse2013-07-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11420
| | * | | | | [ticket/11420] Fix testsNathaniel Guse2013-07-111-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11420
| | * | | | | [ticket/11420] Use !==, === when comparing stringsNathan Guse2013-07-061-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11420
| | * | | | | [ticket/11420] Fix comments, license linkNathan Guse2013-07-061-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11420
| | * | | | | [ticket/11420] Rename migrations file to something more helpfulNathan Guse2013-05-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11420
| | * | | | | [ticket/11420] Forgot to include mock sql_insert_bufferNathaniel Guse2013-05-031-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11420
| | * | | | | [ticket/11420] Fix notification options conversionNathaniel Guse2013-05-024-64/+268
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11420
| * | | | | | [ticket/11671] Update composer.lockNathaniel Guse2013-07-131-15/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11671
| * | | | | | 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