aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/template
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/develop-ascraeus' into ticket/12594Yuriy Rusko2014-05-281-6/+26
|\
| * [ticket/12509] Add example in doc blockTristan Darricau2014-05-271-0/+4
| * [ticket/12509] Fix doc blockTristan Darricau2014-05-131-1/+1
| * [ticket/12509] Fix the call to set_custom_file in adm/index and messengerTristan Darricau2014-05-131-3/+11
| * [ticket/12509] Add an option to set the path of custom file for extensionsTristan Darricau2014-05-131-5/+13
* | [ticket/12594] Remove @package tags and update file headersYuriy Rusko2014-05-2727-85/+194
|/
* [ticket/12382] Allow nested loops in included files.Nils Adermann2014-05-031-4/+11
* Merge remote-tracking branch 'rxu3/ticket/12224' into developJoas Schilling2014-03-103-0/+34
|\
| * [ticket/12224] Add template wrapper method to assign block arraysrxu2014-02-233-0/+34
* | [ticket/12232] Fix a similar excessive pattern in the method.Cesar G2014-02-271-1/+2
* | [ticket/12232] Remove excessive calls to sizeof() in assign_block_vars() methodCesar G2014-02-271-1/+2
|/
* [ticket/12100] Re-order arguments in template environment constructorMatt Friedman2014-01-272-7/+8
* [ticket/12100] Ensure enabled extensions are fresh in Twig environmentMatt Friedman2014-01-272-7/+7
* [ticket/11943] Throw an exception if DEFINE is setup improperlyNathan Guse2013-11-091-0/+7
* [ticket/11943] Split fix_inline_variable_tokens into 3 stepsNathan Guse2013-11-081-10/+50
* [ticket/11943] Require stricter DEFINE statements for templatesNathan Guse2013-11-081-9/+1
* [ticket/11943] Do not quote the value when it is exactly true, false, or nullNathan Guse2013-11-041-0/+8
* [task/code-sniffer] Replace spaces with tabs.Andreas Fischer2013-10-303-43/+43
* [task/code-sniffer] Remove the IN_PHPBB check side-effect from class files.Andreas Fischer2013-10-3023-184/+0
* [task/code-sniffer] Fix argument list spacing.Andreas Fischer2013-10-291-1/+1
* [ticket/11981] Fix code sniffer complaintsMarc Alexander2013-10-283-4/+4
* [ticket/11852] Split filesystem and path_helper into 2 classesJoas Schilling2013-09-264-28/+28
* 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