aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11667] Make functions abstract in includeassetNathaniel Guse2013-07-123-8/+35
| | | | | | Also comment properly PHPBB3-11667
* [ticket/11667] includeasset should be abstractNathaniel Guse2013-07-121-1/+1
| | | | PHPBB3-11667
* 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
| * | | | [ticket/11388] INCLUDEJS supports //(url)Nathaniel Guse2013-07-111-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11388
| * | | | [ticket/11388] includejs inherit from includeassetNathaniel Guse2013-07-102-31/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copied from the INCLUDECSS PR, since this needed to be modified. Added checks for argument strings/anchors/http/https paths in asset files to load files properly PHPBB3-11388
| * | | | [feature/twig] Variable regular expressions should be lazyNathan Guse2013-07-081-3/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-11598
| * | | | [feature/twig] If DEBUG, EVENT will always look for new/missing tpl event filesNathan Guse2013-07-061-3/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If debug mode is enabled, lets check for new/removed EVENT templates on page load rather than at compile. This is slower, but makes developing extensions easier (no need to purge the cache when a new event template file is added) PHPBB3-11598
| * | | | [feature/twig] Use Twig mask for IF statements instead of our own tokenparserNathan Guse2013-07-053-90/+6
| | | | | | | | | | | | | | | | | | | | PHPBB3-11598
| * | | | [feature/twig] context_recursive_loop_builder isn't used anymore, removing itNathan Guse2013-07-051-22/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-11598
| * | | | [feature/twig] Add check for defined IN_PHPBB in all new Twig related filesNathan Guse2013-07-0515-0/+135
| | | | | | | | | | | | | | | | | | | | PHPBB3-11598
| * | | | [feature/twig] Can't use typehint here, causes tests to failNathan Guse2013-07-051-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11598
| * | | | [feature/twig] Fix S_NUM_ROWS assignmentNathan Guse2013-07-051-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11598
| * | | | [feature/twig] Remove style dependency for controller helperNathan Guse2013-07-051-24/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a controller wants to use set_style, it can just use phpbb_style PHPBB3-11598
| * | | | [feature/twig] Clarify commentNathan Guse2013-07-051-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11598
| * | | | [feature/twig] SpacingNathan Guse2013-07-051-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11598
| * | | | [feature/twig] Nicer code for get_user_style.php()Nathan Guse2013-07-051-4/+9
| | | | | | | | | | | | | | | | | | | | PHPBB3-11598
| * | | | [feature/twig] Docs/typehinting for Twig extensionNathan Guse2013-07-051-1/+13
| | | | | | | | | | | | | | | | | | | | PHPBB3-11598
| * | | | [feature/twig] Removing template/renderer.php (no longer used)Nathan Guse2013-07-051-35/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-11598
| * | | | [feature/twig] SpacingNathaniel Guse2013-07-041-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11598
| * | | | [feature/twig] acp module tpls are in ext/adm, ucp/mcp in styles/Nathaniel Guse2013-07-041-17/+35
| | | | | | | | | | | | | | | | | | | | PHPBB3-11598
| * | | | [feature/twig] Fix copy/pasted codeNathaniel Guse2013-07-041-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11598
| * | | | [feature/twig] Attempt to automatically set style dir for ext modulesNathaniel Guse2013-07-041-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extension authors can change it themselves if necessary PHPBB3-11598
| * | | | [feature/twig] Fix a regular expressionNathaniel Guse2013-07-041-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11598
| * | | | [feature/twig] Fix debug codeNathaniel Guse2013-07-041-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11598
| * | | | [feature/twig] Support using Twig filters on {VAR}, add masks for Twig tagsNathaniel Guse2013-07-042-7/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now we can do {L_TITLE|upper}, {SITENAME|lower}, etc We can also use all the Twig tags in our own syntax. E.g. <!-- BLOCK foo --> = {% block foo %]. All tags are the same as the Twig tag names, but are in uppercase. PHPBB3-11598
| * | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/twigNathaniel Guse2013-07-0413-1005/+1154
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joseph Warner (44) and others # Via Joas Schilling (4) and others * 'develop' of https://github.com/phpbb/phpbb3: (63 commits) [ticket/11617] Remove spaces and tabs from empty lines [ticket/11617] Missing U_ACTION in acp_captcha.php [feature/auth-refactor] Fix code style issue [feature/auth-refactor] Fix comment grammar [feature/auth-refactor] Fix the actual cause of test failures [feature/auth-refactor] A possible fix for the functional test failures [ticket/11566] Subsilver template error displayed after table headers [ticket/11566] Remove extra pair of brackets from conditional statement [ticket/11566] Check that guest doesn't have reporting permission by default [ticket/11566] Add captcha to report post template in subsilver [ticket/11566] Use the new constant CONFIRM_REPORT for captcha init [ticket/11566] Rename var to $visual_confirmation_response [ticket/11566] Revert forum permission changes [ticket/11566] Use language variable instead of hardcode [ticket/11566] add tests for reporting post [ticket/11566] add captcha reset and hidden fields [ticket/11566] display error instead of trigger_error [ticket/11566] add error in template [ticket/11566] add error functionality [ticket/11566] add interface for captcha ...
| * | | | | [feature/twig] Make style dependency optional for resolverNathaniel Guse2013-07-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11598
| * | | | | [feature/twig] Safety check for 2fb48d6Nathaniel Guse2013-07-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11598
| * | | | | [feature/twig] Attempt to automatically set style dir for ext controllersNathaniel Guse2013-07-041-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extension authors can change it themselves if necessary PHPBB3-11598
| * | | | | [feature/twig] Indentation and commentsNathaniel Guse2013-07-042-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11598
| * | | | | [feature/twig] Add set_style function to controller helperNathaniel Guse2013-07-041-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11598
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 16:47:33 +0000