aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* [ticket/15904] Fix counting empty template blockskasimi2018-12-081-1/+2
* [ticket/15542] Only add assets version for relative pathsMarc Alexander2018-10-291-0/+5
* [ticket/15542] Always append assets versions to assetsMarc Alexander2018-10-291-1/+1
* Merge pull request #5249 from senky/ticket/15659Tristan Darricau2018-07-081-0/+10
|\
| * [ticket/15659] Fix retrieve_block_vars()Jakub Senko2018-07-071-0/+10
* | [ticket/15666] Fix array key in twig lang() callJakub Senko2018-06-181-1/+1
|/
* [ticket/15099] Remove type attr from INCLUDECSS and INCLUDEJSJakub Senko2018-01-171-2/+2
* [ticket/14972] replace all occurrences of sizeof() with the count()rxu2018-01-011-1/+1
* [ticket/14972] Fix template context use of sizeof()Marc Alexander2018-01-011-46/+33
* [ticket/14994] Refactor template->assign_block_varjaviexin2017-11-011-1/+1
* [ticket/14994] Refactor template->assign_block_varjaviexin2017-11-011-19/+4
* [ticket/14994] Refactor template->assign_block_varjaviexin2017-10-291-51/+46
* Merge branch 'ticket/15178' into ticket/15179Marc Alexander2017-05-312-2/+11
|\
* \ Merge remote-tracking branch 'javiexin/ticket/15068' into 3.2.xMarc Alexander2017-05-293-0/+126
|\ \
| * \ Merge branch '3.2.x' into ticket/15068javiexin2017-03-0916-146/+509
| |\ \
| * | | [ticket/15068] Add template vars retrieval from the template objectjaviexin2017-03-092-4/+20
| * | | [ticket/15068] Add template vars retrieval from the template objectjaviexin2017-02-053-0/+110
* | | | [ticket/14990] Move dispatcher object to the front of the options arrayrxu2017-04-161-2/+2
* | | | [ticket/14990] Fix event name, email parsing, installer and dispatcher callsrxu2017-04-161-14/+18
* | | | [ticket/14990] Add core events to the Twig environmentrxu2017-04-161-1/+31
* | | | Merge pull request #4612 from javiexin/ticket/14950Marc Alexander2017-04-152-2/+43
|\ \ \ \ | |_|/ / |/| | |
| * | | [ticket/14950] Add possibility to delete a template blockjaviexin2017-01-121-1/+1
| * | | [ticket/14950] Add possibility to delete a template blockjaviexin2017-01-042-2/+43
| |/ /
* | | 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/14661] Fix a typo in twig.phplavigor2016-06-051-1/+1
| * [ticket/14099] Fix the assetsTristan Darricau2015-08-181-3/+14
| * [ticket/14099] Fix testsTristan Darricau2015-08-141-0/+8
* | [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