aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/template
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '3.2.x' into ticket/15068javiexin2017-03-0916-146/+509
|\
| * Merge branch '3.1.x' into 3.2.xMarc Alexander2017-02-231-29/+40
| |\
| | * Merge pull request #4605 from javiexin/ticket/14943Marc Alexander2017-02-231-29/+40
| | |\
| | | * [ticket/14943] Fix template loop access by indexjaviexin2017-01-121-30/+39
| | | * [ticket/14943] Fix template loop access by indexjaviexin2017-01-011-1/+3
| * | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-02-193-0/+108
| |\ \ \ | | |/ /
| | * | Merge pull request #4598 from javiexin/ticket/14944Marc Alexander2017-02-193-0/+108
| | |\ \
| | | * | [ticket/14944] Add possibility to search for template loop indexes by keyjaviexin2017-01-283-3/+3
| | | * | [ticket/14944] Add possibility to search for template loop indexes by keyjaviexin2017-01-081-2/+14
| | | * | [ticket/14944] Add possibility to search for template loop indexes by keyjaviexin2016-12-301-5/+5
| | | * | [ticket/14944] Add possibility to search for template loop indexes by keyjaviexin2016-12-283-0/+96
| * | | | Merge branch '3.1.x' into 3.2.xMarc Alexander2017-01-061-2/+1
| |\ \ \ \ | | |/ / /
| | * | | [ticket/14958] Optimize Twig extension lang() functionrxu2017-01-051-2/+1
| | | |/ | | |/|
| * | | Merge branch '3.1.x' into 3.2.xTristan Darricau2016-12-301-4/+4
| |\ \ \ | | |/ /
| | * | [ticket/14943] Fix template loop access by indexjaviexin2016-12-281-4/+4
| | |/
| * | [ticket/14867] Revert back to twig 1.26.* and update dependenciesMarc Alexander2016-11-161-6/+1
| * | [ticket/14716] Update dependencies to latest versionsMarc Alexander2016-11-031-1/+6
| * | [ticket/14807] s9e/textformatter 0.8.1Tristan Darricau2016-10-101-1/+0
| * | [ticket/14807] Updates TwigTristan Darricau2016-10-021-0/+11
| * | [ticket/13616] Uses symfony/proxy-manager-bridge to lazy load twig lexerTristan Darricau2016-04-031-19/+2
| * | [ticket/14457] Handle the case where there isn't any 'definition' bagTristan Darricau2016-02-181-2/+5
| * | [ticket/14457] Don't set CSS to JS and JS to CSSTristan Darricau2016-02-181-2/+2
| * | [ticket/14457] CSTristan Darricau2016-02-181-4/+4
| * | [ticket/14457] Fix twig/twig::assign_displayTristan Darricau2016-02-181-1/+1
| * | [ticket/14457] Uses a random placeholder to inject css and jsTristan Darricau2016-02-182-26/+17
| * | [ticket/14446] Add predefined placeholder variables to twig definitionMarc Alexander2016-02-022-3/+4
| * | [ticket/13717] Fix testsTristan Darricau2016-01-251-1/+16
| * | [ticket/13717] Set the assets after rendering the whole templateTristan Darricau2016-01-255-48/+160
| * | [ticket/13454] Remove unused variablesMarc Alexander2016-01-061-2/+0
| * | [ticket/12633] Doesn't use DEBUG to debug templates eventsTristan Darricau2015-09-181-3/+3
| * | [ticket/13645] Move the feeds to controllersNicofuma2015-08-231-0/+43
| * | Merge branch '3.1.x'Marc Alexander2015-07-081-1/+1
| |\ \
| * \ \ Merge branch '3.1.x'Nils Adermann2015-05-3013-13/+0
| |\ \ \
| * \ \ \ Merge branch '3.1.x'Joas Schilling2015-05-165-7/+15
| |\ \ \ \
| * \ \ \ \ Merge pull request #3591 from Nicofuma/ticket/12632Oliver Schramm2015-05-161-1/+1
| |\ \ \ \ \
| | * | | | | [ticket/12632] Add twig.debug and twig.auto_reload in config.ymlTristan Darricau2015-05-041-1/+1
| * | | | | | [ticket/13804] Remove unnecessary array_mergeMateBartus2015-05-111-6/+1
| * | | | | | [ticket/13804] Make template's user dependency optionalMateBartus2015-05-052-3/+43
| * | | | | | [ticket/13638] Inject $filesystem in \phpbb\template\assetNicofuma2015-05-053-9/+29
| * | | | | | [ticket/13638] Handle assets outside of phpbb_root_pathNicofuma2015-05-041-3/+15
| * | | | | | [ticket/13638] Prepend the assets path phpbb rootNicofuma2015-05-041-2/+2
| |/ / / / /
| * | | | | [ticket/13762] Replace user service with lang in twig extensionMateBartus2015-05-021-6/+6
| * | | | | [ticket/13697] Moving filesystem related functions to filesystem serviceMateBartus2015-04-161-2/+20
| * | | | | [ticket/13132] Twig: Add loops content to the root contextTristan Darricau2015-03-051-0/+6
| * | | | | [ticket/13139] Fix testsNicofuma2015-02-031-0/+7
| * | | | | [ticket/10388] Update deprecation commentMatt Friedman2015-01-311-1/+2
| * | | | | [ticket/10388] Update deprecation date for addslashesMatt Friedman2015-01-291-1/+1
| * | | | | [ticket/10388] Use TWIG escape JS filter instead of addslashesMatt Friedman2015-01-292-5/+5
| * | | | | Merge branch 'develop-ascraeus' into developTristan Darricau2015-01-201-4/+4
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'develop-ascraeus' into developJoas Schilling2014-11-211-4/+28
| |\ \ \ \ \ \