aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* [ticket/11667] Make functions abstract in includeassetNathaniel Guse2013-07-123-8/+35
* [ticket/11667] includeasset should be abstractNathaniel Guse2013-07-121-1/+1
* Merge pull request #1526 from bantu/ticket/11662-developNathan Guse2013-07-124-4/+4
|\
| * [ticket/11662] Typos: occured -> occurredAndreas Fischer2013-07-124-4/+4
* | Merge remote-tracking branch 'EXreaction/ticket/11660' into developAndreas Fischer2013-07-121-5/+9
|\ \ | |/ |/|
| * [ticket/11660] Fix bugs from bugs in #11651 (missing vars, db->sql_connect)Nathaniel Guse2013-07-121-5/+9
* | Merge branch 'develop-olympus' into developNathaniel Guse2013-07-124-6/+6
|\ \ | |/ |/|
| * [ticket/11662] Typos: occured -> occurredAndreas Fischer2013-07-124-6/+6
* | Merge pull request #1522 from igorw/feature/bootstrap-dicNils Adermann2013-07-111-12/+68
|\ \
| * | [feature/bootstrap-dic] Bootstrap container from config.phpIgor Wiedler2013-07-111-12/+68
* | | Merge branch 'develop-olympus' into developAndreas Fischer2013-07-121-1/+2
|\ \ \ | |/ / |/| / | |/
| * Merge branch 'develop-olympus' of https://github.com/phpbb/phpbb3 into ticket...Marc Alexander2013-07-1120-104/+248
| |\
| * | [ticket/11548] Run array_map on complete error array and not just colour_errorMarc Alexander2013-07-111-1/+2
* | | [ticket/11388] INCLUDECSSNathaniel Guse2013-07-116-0/+75
* | | Merge pull request #1470 from EXreaction/feature/twigNils Adermann2013-07-1146-2136/+2356
|\ \ \
| * | | [ticket/11388] Do not append assets_version if using remote path (e.g. http)Nathaniel Guse2013-07-111-3/+2
| * | | [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 supports //(url)Nathaniel Guse2013-07-111-1/+1
| * | | [ticket/11388] includejs inherit from includeassetNathaniel Guse2013-07-102-31/+73
| * | | [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] Fix S_NUM_ROWS assignmentNathan Guse2013-07-051-1/+1
| * | | [feature/twig] Remove style dependency for controller helperNathan Guse2013-07-052-25/+1
| * | | [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] 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] Fix a regular expressionNathaniel Guse2013-07-041-1/+1
| * | | [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-0420-1081/+1321
| |\ \ \
| * | | | [feature/twig] Make style dependency optional for resolverNathaniel Guse2013-07-041-2/+2
| * | | | [feature/twig] Safety check for 2fb48d6Nathaniel Guse2013-07-041-1/+1
| * | | | [feature/twig] Attempt to automatically set style dir for ext controllersNathaniel Guse2013-07-042-2/+28
| * | | | [feature/twig] Indentation and commentsNathaniel Guse2013-07-042-10/+12
| * | | | [feature/twig] Add set_style function to controller helperNathaniel Guse2013-07-042-1/+25