aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop' into ticket/11215David King2013-07-132-14/+191
|\ | | | | | | | | | | | | | | | | | | * 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-132-14/+191
| |\ | | | | | | Fix INCLUDEJS URLs handling
| | * [ticket/11647] Always use & for URLsVjacheslav Trushkin2013-07-111-3/+2
| | | | | | | | | | | | | | | | | | | | | 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/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-1318-208/+290
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 remote-tracking branch 'EXreaction/ticket/11420' into developJoas Schilling2013-07-132-64/+118
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 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] Fix notification options conversionNathaniel Guse2013-05-022-64/+106
| | | | | | | | | | | | | | | | PHPBB3-11420
| * | | Merge remote-tracking branch 'remotes/Hardolaf/ticket/11626' into developNathaniel Guse2013-07-124-53/+56
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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-123-19/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Returns template vars rather than requiring the template. PHPBB3-11626
| | * | | [ticket/11626] Make identifier uppercase per style requirementsJoseph Warner2013-07-111-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11626
| | * | | [ticket/11626] Change the identifier template file in the templateJoseph Warner2013-07-111-1/+1
| | | | | | | | | | | | | | | | | | | | 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-112-5/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-11626
| | * | | [ticket/11626] LDAP Auth ACP Template FileJoseph Warner2013-07-111-0/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-11626
| | * | | [ticket/11626] Create get_acp_template method for auth providersJoseph Warner2013-07-113-1/+40
| | | | | | | | | | | | | | | | | | | | PHPBB3-11626
| * | | | Merge pull request #1515 from Hardolaf/feature/auth-refactorNathan Guse2013-07-126-84/+78
| |\ \ \ \ | | | | | | | | | | | | [feature/auth-refactor] Use a base class for all authentication providers
| | * | | | [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
| | * | | [feature/auth-refactor] Code style fix for doc blocksJoseph Warner2013-07-111-14/+14
| | | | | | | | | | | | | | | | | | | | PHPBB3-9734
| | * | | [feature/auth-refactor] Change 'must' to 'should'Joseph Warner2013-07-111-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-9734
| | * | | [feature/auth-refactor] Remove implements on classes extending baseJoseph Warner2013-07-113-4/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-9734
| | * | | [feature/auth-refactor] Prevent fatal error in php < 5.3.23Joseph Warner2013-07-111-5/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-9734
| | * | | [feature/auth-refactor] Have a base auth classJoseph Warner2013-07-114-83/+75
| | | | | | | | | | | | | | | | | | | | PHPBB3-9734
| * | | | Merge branch 'develop' of git://github.com/phpbb/phpbb3 into developAndreas Fischer2013-07-121-0/+26
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'develop' of git://github.com/phpbb/phpbb3: [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] Check upload avatar URL the same way as in phpBB 3.0Marc Alexander2013-07-121-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The upload avatar URL was checked for its length in phpBB 3.0. Additionally, starting with the new avatar system in phpBB 3.1, the URL was checked to prevent improper URLs being submitted. This minor change is needed for proper testing of the ucp and acp groups pages. PHPBB3-11548
| * | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-07-121-2/+2
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [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. Conflicts: build/build.xml phpBB/docs/INSTALL.html phpBB/includes/constants.php phpBB/install/convertors/convert_phpbb20.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql phpBB/styles/prosilver/imageset/imageset.cfg phpBB/styles/prosilver/style.cfg phpBB/styles/prosilver/template/template.cfg phpBB/styles/prosilver/theme/theme.cfg phpBB/styles/subsilver2/imageset/imageset.cfg phpBB/styles/subsilver2/style.cfg phpBB/styles/subsilver2/template/template.cfg phpBB/styles/subsilver2/theme/theme.cfg
| | * | | | [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
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11548] Fix incorrect usage of array_map on acp groups page Conflicts: tests/functional/common_groups_test.php tests/functional/ucp_groups_test.php
| | * | | | [ticket/11548] Fix incorrect usage of array_map on acp groups pageMarc Alexander2013-07-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The array_map was only ran on small parts of the actual error array instead of the whole one. This resulted in the output of the language variables' names rather than their actual value. PHPBB3-11548
| * | | | | [ticket/11665] Can't change file names already sent to set_filenamesNathaniel Guse2013-07-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11665
| * | | | | Merge pull request #1526 from bantu/ticket/11662-developNathan Guse2013-07-123-3/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | [ticket/11662] Typos: occured -> occurred
| | * | | | | [ticket/11662] Typos: occured -> occurredAndreas Fischer2013-07-123-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11662
| * | | | | | Merge remote-tracking branch 'EXreaction/ticket/11660' into developAndreas Fischer2013-07-121-5/+9
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | * EXreaction/ticket/11660: [ticket/11660] Fix bugs from bugs in #11651 (missing vars, db->sql_connect)
| | * | | | | [ticket/11660] Fix bugs from bugs in #11651 (missing vars, db->sql_connect)Nathaniel Guse2013-07-121-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11660
| * | | | | | Merge branch 'develop-olympus' into developNathaniel Guse2013-07-121-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| / / / / | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Andreas Fischer # Via Andreas Fischer (1) and Nathaniel Guse (1) * develop-olympus: [ticket/11662] Typos: occured -> occurred Conflicts: tests/template/template_test.php
| | * | | | [ticket/11662] Typos: occured -> occurredAndreas Fischer2013-07-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11662
* | | | | | [ticket/11215] Don't try to correct paths during testsDavid King2013-07-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11215
* | | | | | [ticket/11215] use globalDavid King2013-07-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11215
generated by cgit v1.2.1 (git 2.21.0) at 2025-04-10 15:15:00 +0000