Permalink
Switch branches/tags
Commits on Jan 4, 2012
  1. prepared the 1.5.0 release

    fabpot committed Jan 4, 2012
Commits on Jan 3, 2012
  1. fixed doc (closes #577)

    fabpot committed Jan 3, 2012
  2. merged branch lyrixx/patch-1 (PR #576)

    fabpot committed Jan 3, 2012
    Commits
    -------
    
    7e8df56 Fixed CS
    
    Discussion
    ----------
    
    Fixed CS
    
    I just fixed the CS in the doc
  3. Fixed CS

    lyrixx committed Jan 3, 2012
Commits on Jan 2, 2012
  1. simplified code

    fabpot committed Jan 2, 2012
  2. added a unit test

    fabpot committed Jan 2, 2012
Commits on Dec 30, 2011
  1. prepared the 1.5.0-RC2 release

    fabpot committed Dec 30, 2011
  2. updated doc for the date filter

    fabpot committed Dec 30, 2011
  3. refactored date filter code

    fabpot committed Dec 30, 2011
  4. merged branch alefranz/patch-2 (PR #575)

    fabpot committed Dec 30, 2011
    Commits
    -------
    
    b295274 fix Date Format filter: DateInterval does not provide setTimezone()
    
    Discussion
    ----------
    
    fix Date Format filter: DateInterval does not provide setTimezone()
Commits on Dec 29, 2011
Commits on Dec 28, 2011
  1. tweaked previous merge

    fabpot committed Dec 28, 2011
  2. merged branch markstory/number-format (PR #573)

    fabpot committed Dec 28, 2011
    Commits
    -------
    
    e3b81ad Add documentation page for number_format.
    0edcfdd Add number_format filter.
    
    Discussion
    ----------
    
    Implement number_format filter
    
    Implement a `number_format` filter that wraps the native PHP `number_format`.
    
    Fixes #417
  3. Add number_format filter.

    markstory committed Dec 28, 2011
    Refs #417
Commits on Dec 26, 2011
  1. prepared the 1.5.0-RC1 release

    fabpot committed Dec 26, 2011
  2. fixed markup

    fabpot committed Dec 26, 2011
  3. added missing doc for the do tag

    fabpot committed Dec 26, 2011
  4. fixed typo

    fabpot committed Dec 26, 2011
  5. changed hash key expression support (expression must now be enclosed …

    fabpot committed Dec 26, 2011
    …with parentheses and hash keys can now be names)
  6. merged branch jeserkin/jeserkin (PR #570)

    fabpot committed Dec 26, 2011
    Commits
    -------
    
    fd78ec0 Fixed PhpDoc for Twig_TokenParserInterface and all other TokenParsers
    
    Discussion
    ----------
    
    Fixed PhpDoc for Twig_TokenParserInterface and all other TokenParsers
Commits on Dec 25, 2011
Commits on Dec 24, 2011
  1. Revert "Revert "merged branch arnaud-lb/hash-key-expr (PR #514)""

    fabpot committed Dec 24, 2011
    This reverts commit 99b2c5b.
Commits on Dec 23, 2011
  1. merged branch javiereguiluz/add-nl2br-notice (PR #568)

    fabpot committed Dec 23, 2011
    Commits
    -------
    
    7194b1a Added a notice in the `nl2br` filter documentation about the proper Twig version to use it
    
    Discussion
    ----------
    
    Added a notice in the `nl2br` filter documentation ...
    
    ... about the proper Twig version to use it (1.5)
  2. Revert "merged branch arnaud-lb/hash-key-expr (PR #514)"

    fabpot committed Dec 23, 2011
    This reverts commit 8665c64, reversing
    changes made to 4aba337.
Commits on Dec 22, 2011
  1. updated doc

    fabpot committed Dec 22, 2011
  2. updated CHANGELOG

    fabpot committed Dec 22, 2011
  3. merged branch arnaud-lb/hash-key-expr (PR #514)

    fabpot committed Dec 22, 2011
    Commits
    -------
    
    542e9e7 added getKeyValuePairs() on Twig_Node_Expression_Array
    3f64f1d added test for hash keys
    4bdb3a9 fixed tests
    3b1f269 support any expression as hash key
    
    Discussion
    ----------
    
    Allow hash keys to be any expression
    
    This allows hash keys to be any expression
    
    ---------------------------------------------------------------------------
    
    by fabpot at 2011/12/07 02:08:19 -0800
    
    I had not implemented this feature back then because I'm not sure it makes sense to support it in the context of a templating system. I'm still not convinced that this is useful.