aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/template
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.1.x'Marc Alexander2015-07-081-1/+1
|\ | | | | | | | | Conflicts: tests/template/template_includecss_test.php
| * [ticket/13995] Remove deprecated projection media typeMatt Friedman2015-07-071-1/+1
| | | | | | | | PHPBB3-13995
* | Merge branch '3.1.x'Nils Adermann2015-05-3013-13/+0
|\ \ | |/ | | | | | | | | | | | | | | * 3.1.x: [ticket/13790] Update phpcs Conflicts: phpBB/composer.json phpBB/composer.lock
| * Merge pull request #3560 from Nicofuma/ticket/13790Nils Adermann2015-05-3013-13/+0
| |\ | | | | | | [ticket/13790] Update phpcs
| | * [ticket/13790] Update phpcsTristan Darricau2015-05-1913-13/+0
| | | | | | | | | | | | PHPBB3-13790
* | | Merge branch '3.1.x'Joas Schilling2015-05-165-7/+15
|\ \ \ | |/ /
| * | [ticket/13838] Fix coding styleNicofuma2015-05-145-7/+15
| |/ | | | | | | PHPBB3-13838
* | Merge pull request #3591 from Nicofuma/ticket/12632Oliver Schramm2015-05-161-1/+1
|\ \ | | | | | | | | | [ticket/12632] Add twig.debug and twig.auto_reload in config.yml
| * | [ticket/12632] Add twig.debug and twig.auto_reload in config.ymlTristan Darricau2015-05-041-1/+1
| | | | | | | | | | | | | | | PHPBB3-13206 PHPBB3-12632
* | | [ticket/13804] Remove unnecessary array_mergeMateBartus2015-05-111-6/+1
| | | | | | | | | | | | PHPBB3-13804
* | | [ticket/13804] Make template's user dependency optionalMateBartus2015-05-052-3/+43
| | | | | | | | | | | | PHPBB3-13804
* | | [ticket/13638] Inject $filesystem in \phpbb\template\assetNicofuma2015-05-053-9/+29
| | | | | | | | | | | | PHPBB3-13638
* | | [ticket/13638] Handle assets outside of phpbb_root_pathNicofuma2015-05-041-3/+15
| | | | | | | | | | | | PHPBB3-13638
* | | [ticket/13638] Prepend the assets path phpbb rootNicofuma2015-05-041-2/+2
|/ / | | | | | | PHPBB3-13638
* | [ticket/13762] Replace user service with lang in twig extensionMateBartus2015-05-021-6/+6
| | | | | | | | PHPBB3-13762
* | [ticket/13697] Moving filesystem related functions to filesystem serviceMateBartus2015-04-161-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Moving filesystem service to \phpbb\filesystem namespace * Wraping Symfony's Filesystem component * Moving filesystem related functions from includes/functions.php into \phpbb\filesystem\filesystem Functions moved (and deprecated): - phpbb_chmod - phpbb_is_writable - phpbb_is_absolute - phpbb_own_realpath - phpbb_realpath * Adding interface for filesystem service PHPBB3-13697
* | [ticket/13132] Twig: Add loops content to the root contextTristan Darricau2015-03-051-0/+6
| | | | | | | | PHPBB3-13132
* | [ticket/13139] Fix testsNicofuma2015-02-031-0/+7
| | | | | | | | PHPBB3-13139
* | [ticket/10388] Update deprecation commentMatt Friedman2015-01-311-1/+2
| | | | | | | | PHPBB3-10388
* | [ticket/10388] Update deprecation date for addslashesMatt Friedman2015-01-291-1/+1
| | | | | | | | PHPBB3-10388
* | [ticket/10388] Use TWIG escape JS filter instead of addslashesMatt Friedman2015-01-292-5/+5
| | | | | | | | PHPBB3-10388
* | Merge branch 'develop-ascraeus' into developTristan Darricau2015-01-201-4/+4
|\ \ | |/ | | | | | | * develop-ascraeus: [ticket/13133] Fix variable name in set_custom_style()
| * [ticket/13133] Fix variable name in set_custom_style()Matt Friedman2015-01-201-4/+4
| | | | | | | | PHPBB3-13133
| * Merge pull request #3099 from Senky/ticket/13266Joas Schilling2014-12-271-0/+5
| |\ | | | | | | | | | [ticket/13266] Enabling twig dump function if DEBUG is defined
| | * [ticket/13266] Enable twig dump functionJakub Senko2014-11-011-0/+5
| | | | | | | | | | | | PHPBB3-13266
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-211-4/+28
|\ \ \ | |/ /
| * | [ticket/13133] Rename $ok variableTristan Darricau2014-11-071-4/+4
| | | | | | | | | | | | PHPBB3-13133
| * | [ticket/13133] Allow @vendor_name for includecssTristan Darricau2014-10-081-4/+28
| |/ | | | | | | PHPBB3-13133
* | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-09-231-3/+3
|\ \ | |/ | | | | | | * develop-ascraeus: [ticket/13070] Use old 'template' class for template class hook
| * [ticket/13070] Use old 'template' class for template class hookMarc Alexander2014-09-221-3/+3
| | | | | | | | PHPBB3-13070
* | Merge branch 'develop-ascraeus' into developMarc Alexander2014-09-021-0/+4
|\ \ | |/
| * [ticket/12661] Add template testPico882014-08-241-1/+1
| | | | | | | | PHPBB3-12661
| * [ticket/12661] Load extensions templates from "all" folder by render()Pico882014-08-241-0/+4
| | | | | | | | PHPBB3-12661
* | [ticket/12957] Removed unused useTristan Darricau2014-08-101-3/+0
| | | | | | | | PHPBB3-12957
* | [ticket/12957] Update the constructions of the template engineTristan Darricau2014-08-102-0/+6
| | | | | | | | PHPBB3-12957
* | [ticket/11649] Fix coding styleTristan Darricau2014-08-091-7/+9
| | | | | | | | PHPBB3-11649
* | [ticket/11649] Expose Twig through the containerTristan Darricau2014-08-092-30/+39
|/ | | | PHPBB3-11649
* [ticket/12557] Template fixesn-aleha2014-08-034-6/+7
| | | | PHPBB3-12557
* [ticket/12892] Do not set S_NUM_ROWS when adding a row to a template loopJoas Schilling2014-07-251-20/+58
| | | | | | | | We do not set S_NUM_ROWS while adding a row, to reduce the complexity If we would set it on adding, each subsequent adding would cause n modifications, resulting in a O(n!) complexity, rather then O(n) PHPBB3-12892
* [ticket/12781] Template regex for IF catch too many thingsTristan Darricau2014-06-271-1/+1
| | | | PHPBB3-12781
* [ticket/12715] Cleanup comments in \phpbb\template\*Tristan Darricau2014-06-1519-124/+132
| | | | PHPBB3-12715
* 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
| | | | | | | | PHPBB3-12509
| * [ticket/12509] Fix doc blockTristan Darricau2014-05-131-1/+1
| | | | | | | | PHPBB3-12509
| * [ticket/12509] Fix the call to set_custom_file in adm/index and messengerTristan Darricau2014-05-131-3/+11
| | | | | | | | PHPBB3-12509
| * [ticket/12509] Add an option to set the path of custom file for extensionsTristan Darricau2014-05-131-5/+13
| | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-12509 PHPBB3-12509
* | [ticket/12594] Remove @package tags and update file headersYuriy Rusko2014-05-2727-85/+194
|/ | | | PHPBB3-12594
* [ticket/12382] Allow nested loops in included files.Nils Adermann2014-05-031-4/+11
| | | | | | They have to reference the fully qualified loop name in BEGIN and END. PHPBB3-12382
* Merge remote-tracking branch 'rxu3/ticket/12224' into developJoas Schilling2014-03-103-0/+34
|\ | | | | | | | | | | * rxu3/ticket/12224: [ticket/12224] Add assign_block_vars_array() test. [ticket/12224] Add template wrapper method to assign block arrays
| * [ticket/12224] Add template wrapper method to assign block arraysrxu2014-02-233-0/+34
| | | | | | | | | | | | | | | | | | | | | | Add one more wrapper template method for the function assign_block_vars() which takes a 2-dimensional array as a parameter and calls assign_block_vars() in a loop to assign the whole block loop at once. This can make the core a little bit more expendable from the point of developing extensions as it allows to pass the data to events before it's being assigned to template. PHPBB3-12224