aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11643] generate_text_for_display on mcp/mcp_queue.phpBruno Ais2013-07-161-11/+1
| | | | | | | sub-task of ticket PHPBB3-11635: find and fix all bypasses of generate_text_for_* PHPBB3-11643
* 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
* | | Merge pull request #1522 from igorw/feature/bootstrap-dicNils Adermann2013-07-111-12/+68
|\ \ \ | | | | | | | | [feature/bootstrap-dic] Bootstrap container from config.php
| * | | [feature/bootstrap-dic] Bootstrap container from config.phpIgor Wiedler2013-07-111-12/+68
| | | | | | | | | | | | | | | | PHPBB3-11651
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-07-121-1/+2
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | | | | | | | * develop-olympus: [ticket/11548] Use new static methods for request and submit [ticket/11548] Run array_map on complete error array and not just colour_error Conflicts: tests/functional/ucp_groups_test.php
| * | Merge branch 'develop-olympus' of https://github.com/phpbb/phpbb3 into ↵Marc Alexander2013-07-118-17/+45
| |\ \ | | | | | | | | | | | | ticket/11548
| | * \ Merge remote-tracking branch 'remotes/nickv/ticket/8319' into develop-olympusNathaniel Guse2013-07-111-3/+11
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling * remotes/nickv/ticket/8319: [ticket/8319] Do not repeat the replacement [ticket/8319] Add explanation for RELATIVE_URL and update LOCAL_URL [ticket/8319] Update BBCodes that currently use the LOCAL_URL tag on update [ticket/8319] Add new token RELATIVE_URL to allow foreign relative URL parts [ticket/8319] Prepend Board URL to LOCAL_URL links to prevent abuse
| * | | | [ticket/11548] Run array_map on complete error array and not just colour_errorMarc Alexander2013-07-111-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Up to now the array_map() that turns error messages into the localized output was only ran if the group's color was set. With this patch it'll run the array_map() on the complete error array if it's not empty. PHPBB3-11548
* | | | | [ticket/11388] INCLUDECSSNathaniel Guse2013-07-114-0/+71
| | | | | | | | | | | | | | | | | | | | PHPBB3-11388
* | | | | Merge pull request #1470 from EXreaction/feature/twigNils Adermann2013-07-1132-2040/+2211
|\ \ \ \ \ | | | | | | | | | | | | Feature/twig
| * | | | | [ticket/11388] Do not append assets_version if using remote path (e.g. http)Nathaniel Guse2013-07-111-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11388
| * | | | | [ticket/11388] Fix typoNathaniel Guse2013-07-111-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11388
| * | | | | [ticket/11388] Remove typehints (causing tests to fail)Nathaniel Guse2013-07-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11388
| * | | | | [ticket/11388] Disable cache if IN_INSTALL definedNathaniel Guse2013-07-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11388
| * | | | | [ticket/11388] Do not modify by referenceNathaniel Guse2013-07-111-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11388
| * | | | | [ticket/11388] typehitsNathaniel Guse2013-07-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11388
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 16:36:48 +0000