aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/template
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'EXreaction/ticket/11816-2' into developJoas Schilling2013-09-261-4/+4
|\
| * [ticket/11816] Fix multiple parenthesis as well before $VARs in templatesNathan Guse2013-09-191-4/+4
* | [ticket/11700] Fix some more incorrectly changed commentsNils Adermann2013-09-191-1/+1
* | [ticket/11700] Replace some leftover phpbb_filesystem usesNils Adermann2013-09-171-2/+2
* | [ticket/11700] Fix unit tests after develop mergeNils Adermann2013-09-171-2/+2
* | Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700Nils Adermann2013-09-174-15/+55
|\ \ | |/
| * [ticket/11832] get_url() from phpbb_template_asset should return web pathNathan Guse2013-09-152-4/+9
| * [ticket/11832] Fix INCLUDE(JS/CSS)Nathan Guse2013-09-133-13/+47
* | [ticket/11700] And some last comments with backslashesNils Adermann2013-09-162-4/+4
* | [ticket/11700] Fix tests after merging new develop codeNils Adermann2013-09-165-6/+10
* | Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700Nils Adermann2013-09-1611-422/+511
|\ \ | |/
| * [ticket/11843] The twig lexer fixes DEFINE variables with underscores againrechosen2013-09-131-1/+1
| * Merge pull request #1689 from EXreaction/ticket/11727David King2013-09-122-7/+165
| |\
| | * [ticket/11727] Fix indentationNathan Guse2013-09-121-1/+1
| | * [ticket/11727] Fix indentationNathan Guse2013-09-121-9/+9
| | * [ticket/11727] Template loader support for safe directories to load files fromNathan Guse2013-09-022-7/+165
| * | Merge pull request #1705 from EXreaction/ticket/11833David King2013-09-121-3/+3
| |\ \
| | * | [ticket/11833] Prevent Twig errors from invalid template loops using BEGINELSENathan Guse2013-09-091-3/+3
| * | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11816Nathan Guse2013-09-123-6/+41
| |\ \ \
| | * \ \ Merge pull request #1708 from EXreaction/ticket/11828David King2013-09-121-4/+4
| | |\ \ \
| | | * | | [ticket/11828] Fix greedy operators in lexerNathan Guse2013-09-121-4/+4
| | | |/ /
| | * | | Merge pull request #1690 from EXreaction/ticket/11822David King2013-09-122-2/+37
| | |\ \ \ | | | |/ / | | |/| |
| | | * | [ticket/11822] Use namespace lookup order for asset loadingNathan Guse2013-09-022-2/+37
| | | |/
| * | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11816Nathan Guse2013-09-065-380/+249
| |\ \ \ | | |/ /
| | * | [ticket/11812] Fix empty defineNathan Guse2013-09-021-1/+1
| | |/
| | * Merge remote-tracking branch 'EXreaction/ticket/11724' into developJoas Schilling2013-08-301-3/+6
| | |\
| | | * [ticket/11724] Handle ELSE IF separatelyNathan Guse2013-08-281-5/+7
| | | * [ticket/11724] Replace spaces with tabsNathan Guse2013-07-281-1/+1
| | | * [ticket/11724] Support "ELSE IF" and "ELSEIF" in the same wayNathan Guse2013-07-271-1/+2
| | * | [ticket/11628] Create base template class with common functionsNathan Guse2013-08-282-179/+149
| | * | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11628Nathan Guse2013-08-283-11/+18
| | |\ \
| | * | | [ticket/11628] Make get_template_vars protectedNathaniel Guse2013-07-241-1/+1
| | * | | [ticket/11628] Fix a bug I noticed in template->destroyNathaniel Guse2013-07-241-1/+1
| | * | | [ticket/11628] Remove the one usage of get_style_path()Nathaniel Guse2013-07-242-17/+3
| | * | | [ticket/11628] Shorten an if to an inline statementNathaniel Guse2013-07-241-9/+2
| | * | | [ticket/11628] Remove template_path option on set_custom_styleNathaniel Guse2013-07-242-12/+4
| | * | | [ticket/11628] Remove set_style_names function, moved to set_custom_styleNathaniel Guse2013-07-242-31/+6
| | * | | [ticket/11628] Set admin namespace in the constructorNathaniel Guse2013-07-241-13/+6
| | * | | [ticket/11628] Change set_custom_style $template path to default to stringNathaniel Guse2013-07-242-5/+5
| | * | | [ticket/11628] Remove third parameter ($names) from set_custom_styleNathaniel Guse2013-07-242-8/+6
| | * | | [ticket/11628] Return $this from set_style, set_custom_styleNathaniel Guse2013-07-242-6/+6
| | * | | [ticket/11628] Move setting core namespace to set_style()Nathaniel Guse2013-07-241-15/+15
| | * | | [ticket/11628] Remove $this->names, $this->style_names from phpbb_templateNathaniel Guse2013-07-241-16/+3
| | * | | [ticket/11628] Remove phpbb_style (move methods to phpbb_template)Nathaniel Guse2013-07-242-1/+136
| | * | | [ticket/11628] Remove style resource locatorNathaniel Guse2013-07-241-163/+0
| | | |/ | | |/|
| * | | [ticket/11816] Fix define/loop checks in IF statements containing parenthesisNathan Guse2013-08-291-4/+4
| | |/ | |/|
| * | [ticket/11784] Remove naming redundancy for event listenersMatt Friedman2013-08-131-1/+1
| * | [ticket/11777] Require a suffix of '_listener' on extension template listenersrechosen2013-08-121-1/+1
| * | [ticket/11777] Rename the extension template listener subdirectory to 'event/'rechosen2013-08-121-6/+7
| * | [ticket/11777] Add subdirectory 'events/' to the template event search pathrechosen2013-08-121-3/+8