aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [ticket/11647] Allow custom portsVjacheslav Trushkin2013-07-111-4/+0
* [ticket/11647] Use $config for assets_versionVjacheslav Trushkin2013-07-111-1/+1
* [ticket/11647] Fix invalid variable nameVjacheslav Trushkin2013-07-111-3/+2
* [ticket/11647] New assets handlingVjacheslav Trushkin2013-07-112-14/+197
* [ticket/11647] Fix tests for INCLUDEJSVjacheslav Trushkin2013-07-112-10/+10
* Merge pull request #1470 from EXreaction/feature/twigNils Adermann2013-07-1174-2638/+2645
|\
| * [ticket/11388] Do not append assets_version if using remote path (e.g. http)Nathaniel Guse2013-07-112-6/+5
| * [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
| * [ticket/11388] typehitsNathaniel Guse2013-07-111-1/+1
| * [ticket/11388] INCLUDEJS test for //(url)Nathaniel Guse2013-07-112-0/+6
| * [ticket/11388] INCLUDEJS supports //(url)Nathaniel Guse2013-07-111-1/+1
| * [ticket/11388] Fixing includejs testNathaniel Guse2013-07-102-44/+118
| * [ticket/11388] includejs inherit from includeassetNathaniel Guse2013-07-102-31/+73
| * Merge remote-tracking branch 'remotes/cyberalien/feature/twig/includejs_tests...Nathaniel Guse2013-07-102-7/+32
| |\
| | * [feature/twig] Unit tests for includejsVjacheslav Trushkin2013-07-102-7/+32
| * | [feature/twig] Add simple test to make sure Twig filters/tags are workingNathan Guse2013-07-083-0/+20
| * | [feature/twig] Variable regular expressions should be lazyNathan Guse2013-07-081-3/+3
| |/
| * [feature/twig] If DEBUG, EVENT will always look for new/missing tpl event filesNathan Guse2013-07-061-3/+23
| * [feature/twig] Put $SCRIPTS below overall_footer_after, use includejs for coreNathan Guse2013-07-052-3/+7
| * [feature/twig] Use Twig mask for IF statements instead of our own tokenparserNathan Guse2013-07-053-90/+6
| * [feature/twig] context_recursive_loop_builder isn't used anymore, removing itNathan Guse2013-07-051-22/+0
| * [feature/twig] Add check for defined IN_PHPBB in all new Twig related filesNathan Guse2013-07-0515-0/+135
| * [feature/twig] Can't use typehint here, causes tests to failNathan Guse2013-07-051-1/+1
| * [feature/twig] Add template tests for S_NUM_ROWS and S_BLOCK_NAMENathan Guse2013-07-052-3/+34
| * [feature/twig] Fix S_NUM_ROWS assignmentNathan Guse2013-07-051-1/+1
| * [feature/twig] Remove style dependency for controller helperNathan Guse2013-07-053-26/+2
| * [feature/twig] Add template test for ===, !==Nathan Guse2013-07-052-4/+26
| * [feature/twig] Clarify commentNathan Guse2013-07-051-1/+1
| * [feature/twig] SpacingNathan Guse2013-07-051-1/+1
| * [feature/twig] Nicer code for get_user_style.php()Nathan Guse2013-07-051-4/+9
| * [feature/twig] Docs/typehinting for Twig extensionNathan Guse2013-07-051-1/+13
| * [feature/twig] Removing template/renderer.php (no longer used)Nathan Guse2013-07-051-35/+0
| * [feature/twig] Remove debug codeNathaniel Guse2013-07-041-5/+0
| * [feature/twig] SpacingNathaniel Guse2013-07-041-1/+1
| * [feature/twig] acp module tpls are in ext/adm, ucp/mcp in styles/Nathaniel Guse2013-07-041-17/+35
| * [feature/twig] Fix copy/pasted codeNathaniel Guse2013-07-041-1/+1
| * [feature/twig] Attempt to automatically set style dir for ext modulesNathaniel Guse2013-07-041-1/+19
| * [feature/twig] Trying some new debug code for this mkdir errorNathaniel Guse2013-07-041-8/+4
| * [feature/twig] Fix a regular expressionNathaniel Guse2013-07-041-1/+1
| * [feature/twig] Fix helper URL testNathaniel Guse2013-07-041-1/+4
| * [feature/twig] Fix debug codeNathaniel Guse2013-07-041-1/+1
| * [feature/twig] Support using Twig filters on {VAR}, add masks for Twig tagsNathaniel Guse2013-07-042-7/+71
| * Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/twigNathaniel Guse2013-07-0426-1081/+1697
| |\
| * | [feature/twig] Make style dependency optional for resolverNathaniel Guse2013-07-041-2/+2
| * | [feature/twig] Safety check for 2fb48d6Nathaniel Guse2013-07-041-1/+1
| * | Revert "[feature/twig] Call set_style in the foo/bar controller for functiona...Nathaniel Guse2013-07-041-2/+0
| * | [feature/twig] Attempt to automatically set style dir for ext controllersNathaniel Guse2013-07-042-2/+28