Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Apr 8, 2013
  1. prepared the 1.12.2 release

    authored
  2. Fixed twig filesystemloader security issue + test (closes #1026)

    Rick Prent authored committed
  3. tweaked previous merge

    authored
  4. merged branch ThatGuyBen/patch-1 (PR #1048)

    authored
    This PR was merged into the master branch.
    
    Discussion
    ----------
    
    Update json_encode.rst
    
    a more-useful description of the "options" argument >_>
    
    Commits
    -------
    
    742043f Update json_encode.rst
Commits on Apr 1, 2013
  1. Update json_encode.rst

    Ben authored
    a more-useful description of the "options" argument >_>
  2. updated CHANGELOG

    authored
  3. merged branch ShadowPrince/master (PR #1042)

    authored
    This PR was squashed before being merged into the master branch (closes #1042).
    
    Discussion
    ----------
    
    Registration a Twig_SimpleFunction after extensions initialized throw not LogicException, but Fatal Error
    
    Registration a Twig_SimpleFunction after extensions initialized throw not LogicException, but Fatal Error:
    
    $environment->addFunction(new Twig_SimpleFunction(...))
    after 
    $environment->render(...)
    throws Fatal Error: 
    object of Twig_SimpleFunction could not be converted to string
    
    Commits
    -------
    
    92e97b9 Registration a Twig_SimpleFunction after extensions initialized throw not LogicException, but Fatal Error
  4. @ShadowPrince

    Registration a Twig_SimpleFunction after extensions initialized throw…

    ShadowPrince authored committed
    … not LogicException, but Fatal Error
Commits on Mar 25, 2013
  1. tweaked previous merge

    authored
  2. merged branch beryllium/patch-1 (PR #1032)

    authored
    This PR was merged into the master branch.
    
    Discussion
    ----------
    
    Adding a section about the slice filter to doc/tags/for.rst
    
    This code example shows how to loop over a subset of values in order to implement one common use-case of "break" in PHP. I decided to use the "full" notation of slice rather than the sugared version (that example would just be "for user in users[:10]")
    
    Commits
    -------
    
    202641a Adding link to slice filter per Stof's suggestion
    8ebbaaa Adding a section about the slice filter
  3. merged branch ricardclau/typo_sort_doc (PR #1039)

    authored
    This PR was merged into the master branch.
    
    Discussion
    ----------
    
    Minor typo in sort filter documentation
    
    I've found this small typo while working on shuffle filter documentation in https://github.com/fabpot/Twig/pull/1038
    
    I decided to create separate PR in case https://github.com/fabpot/Twig/pull/1038 got rejected
    
    Best regards!
    
    Commits
    -------
    
    1443b76 minor typo in sort documentation
  4. merged branch tommygnr/fix-docs-batch-filter (PR #1040)

    authored
    This PR was merged into the master branch.
    
    Discussion
    ----------
    
    Fix filename for batch filter documentation
    
    The documentation on the website for the batch filter currently 404s See: http://twig.sensiolabs.org/doc/filters/batch.html
    
    I believe this is because the filename is incorrect. This PR fixes that.
    
    Commits
    -------
    
    bb05942 Fix filename for batch filter documentation
  5. @tommygnr
Commits on Mar 24, 2013
  1. @ricardclau
Commits on Mar 22, 2013
  1. merged branch tucksaun/fix-5.2-TSRM (PR #1037)

    authored
    This PR was merged into the master branch.
    
    Discussion
    ----------
    
    Revert "merged branch pierrejoye/master (PR #855)"
    
    This reverts commit 347bc81
    
    This commit make compilation failed for PHP5.2 with thread-safe enabled (see https://travis-ci.org/fabpot/Twig/jobs/5523865)
    
    Commits
    -------
    
    4383388 Revert "merged branch pierrejoye/master (PR #855)"
  2. @tucksaun

    Revert "merged branch pierrejoye/master (PR #855)"

    tucksaun authored
    This reverts commit 347bc81, reversing
    changes made to 5d7baaf.
  3. merged branch specialguest/patch-1 (PR #1034)

    authored
    This PR was merged into the master branch.
    
    Commits
    -------
    
    c6ef23a Update striptags.rst
    
    Discussion
    ----------
    
    Update striptags.rst
    
    Hello
    
    I just changed
    {% some_html|striptags %}
    to
    {{ some_html|striptags }}
    
    Regards
    
    Julien
Commits on Mar 18, 2013
  1. @beryllium
  2. @specialguest

    Update striptags.rst

    specialguest authored
  3. @beryllium

    Adding a section about the slice filter

    beryllium authored
    This code example shows how to loop over a subset of values in order to implement one common use-case of "break" in PHP. I decided to use the "full" notation of slice rather than the sugared version (that example would just be "for user in users[:10]")
Commits on Mar 10, 2013
  1. merged branch pborreli/typos (PR #1028)

    authored
    This PR was merged into the master branch.
    
    Commits
    -------
    
    49488b8 Fixed typos
    
    Discussion
    ----------
    
    Fixed typos
  2. @pborreli

    Fixed typos

    pborreli authored
Commits on Mar 7, 2013
  1. merged branch carlwitt/patch-1 (PR #1022)

    authored
    This PR was merged into the master branch.
    
    Commits
    -------
    
    59d0eed Update merge.rst
    
    Discussion
    ----------
    
    Update merge.rst
    
    Typo in first line:
    The merge filter merges an array with [removed: the] another array
Commits on Mar 4, 2013
  1. @carlwitt

    Update merge.rst

    carlwitt authored
    Typo in first line:
    The merge filter merges an array with [removed: the] another array
Commits on Feb 28, 2013
  1. fixed phpdoc

    authored
Commits on Feb 26, 2013
  1. merged branch Tobion/buildquery (PR #1009)

    authored
    This PR was squashed before being merged into the master branch (closes #1009).
    
    Commits
    -------
    
    fcf9525 let url_encode filter also accept array of query parameters
    
    Discussion
    ----------
    
    let url_encode filter also accept array of query parameters
    
    BC break: no
    feature addition: yes
    tests pass: yes
    documentation: yes
    
    This is also supported in Jinja and so it's consistent: [jinja urlencode](http://modular.math.washington.edu/home/wstein/www/home/bjarke/sage-4.4.4/local/LIB/python/site-packages/Jinja-1.2-py2.6-linux-x86_64.egg/docs/html/builtins.html)
  2. @Tobion

    let url_encode filter also accept array of query parameters

    Tobion authored committed
  3. Merge remote-tracking branch 'lyrixx/feat-batch-ceil'

    authored
    * lyrixx/feat-batch-ceil:
      Ceil the size in batch filter
    
    Conflicts:
    	test/Twig/Tests/Fixtures/filters/batch.test
  4. merged branch Felds/optimize-batch (PR #1007)

    authored
    This PR was merged into the master branch.
    
    Commits
    -------
    
    ccf3cd1 optimize batch function and add tests
    
    Discussion
    ----------
    
    Optimize batch function and add tests
    
    see a50bc8c#commitcomment-2665059
Commits on Feb 25, 2013
  1. merged branch minchal/master (PR #1013)

    authored
    This PR was merged into the master branch.
    
    Commits
    -------
    
    c82308a deprecated use, -4 files to include.
    
    Discussion
    ----------
    
    Depraceted use of Twig_Filter_Function in Core Extension
    
    Simple fix, that reduces included files count by 4 (in default configuration).
  2. deprecated use, -4 files to include.

    Michał Pawłowski authored
Commits on Feb 24, 2013
  1. removed unneeded PHPdoc tags

    authored
Commits on Feb 22, 2013
  1. @lyrixx

    Ceil the size in batch filter

    lyrixx authored
Commits on Feb 21, 2013
  1. @felds
Something went wrong with that request. Please try again.