Permalink
Switch branches/tags
Commits on Oct 19, 2012
  1. prepared the 1.10.3 release

    fabpot committed Oct 19, 2012
  2. changed Node instances line numbers from 0 to 1 in unit tests to bett…

    fabpot committed Oct 19, 2012
    …er reflect what really happens when using Twig
Commits on Oct 18, 2012
  1. updated CHANGELOG

    fabpot committed Oct 18, 2012
  2. reverted BC break

    fabpot committed Oct 18, 2012
Commits on Oct 16, 2012
  1. fixed previous merge

    fabpot committed Oct 16, 2012
  2. merged branch innsand/split-filter_fix (PR #811)

    fabpot committed Oct 16, 2012
    This PR was merged into the master branch.
    
    Commits
    -------
    
    d5df200 * bug fixes. * str_split on empty delimeter. * tests and documentation updated.
    e3c201a Added "split" filter aka explode.
    
    Discussion
    ----------
    
    Split filter fix
    
    Modification of request #621:
    str_split, bug fixes
    
    ---------------------------------------------------------------------------
    
    by senz at 2012-08-21T05:56:51Z
    
    @fabpot this is squashed and fixed (hopefully) #621
  3. fixed import doc

    fabpot committed Oct 16, 2012
Commits on Oct 15, 2012
  1. bumped version to 1.10.3-DEV

    fabpot committed Oct 15, 2012
  2. prepared the 1.10.2 release

    fabpot committed Oct 15, 2012
  3. fixed macro calls on PHP 5.4

    fabpot committed Oct 15, 2012
  4. bumped version to 1.10.2-DEV

    fabpot committed Oct 15, 2012
  5. prepared the 1.10.1 release

    fabpot committed Oct 15, 2012
Commits on Oct 13, 2012
  1. merged branch Adel-E/update-api-docs (PR #858)

    fabpot committed Oct 13, 2012
    This PR was merged into the master branch.
    
    Commits
    -------
    
    bee4cd1 Update doc to correspond to the following: http://twig.sensiolabs.org/documentation http://twig.sensiolabs.org/doc/filters/escape.html
    
    Discussion
    ----------
    
    Update api docs
    
    Update doc to correspond to the following:
    http://twig.sensiolabs.org/documentation
    http://twig.sensiolabs.org/doc/filters/escape.html
Commits on Oct 12, 2012
  1. optimized macros when imported via the "import" tag

    fabpot committed Oct 12, 2012
    This commit unifies the way macros are called independently of how they
    were included (via the from or import tag -- see e81c932).
Commits on Oct 8, 2012
  1. merged branch pierrejoye/master (PR #855)

    fabpot committed Oct 8, 2012
    This PR was merged into the master branch.
    
    Commits
    -------
    
    d398e55 - drop tsrm fetch, not necessary as it is passed as argument already
    
    Discussion
    ----------
    
    drop unnecessary tsrmls_fetch
Commits on Oct 6, 2012
  1. refactored some unit tests

    fabpot committed Oct 6, 2012
Commits on Oct 5, 2012
  1. updated CHANGELOG

    fabpot committed Oct 5, 2012
Commits on Oct 4, 2012
  1. merged branch weltling/master (PR #854)

    fabpot committed Oct 4, 2012
    This PR was merged into the master branch.
    
    Commits
    -------
    
    b013ede fix windows build
    
    Discussion
    ----------
    
    Trivial fix for windows build
  2. fix windows build

    weltling committed Oct 4, 2012
Commits on Sep 29, 2012
  1. merged branch greg0ire/patch-1 (PR #851)

    fabpot committed Sep 29, 2012
    This PR was merged into the master branch.
    
    Commits
    -------
    
    d52e15b remove tautology
    
    Discussion
    ----------
    
    remove tautology
    
    We already know the example is "for example".
  2. fixed blanks in the doc

    fabpot committed Sep 29, 2012
  3. remove tautology

    greg0ire committed Sep 29, 2012
  4. fixed a doc anchor

    fabpot committed Sep 29, 2012
Commits on Sep 28, 2012
  1. updated CHANGELOG

    fabpot committed Sep 28, 2012
  2. fixed CS

    fabpot committed Sep 28, 2012