Permalink
Switch branches/tags
Commits on Jul 30, 2011
  1. prepared 1.1.2 released

    fabpot committed Jul 30, 2011
Commits on Jul 28, 2011
  1. fixed Parser bug

    fabpot committed Jul 28, 2011
Commits on Jul 27, 2011
  1. merged branch JEDIBC/master (PR #401)

    fabpot committed Jul 27, 2011
    Commits
    -------
    
    755ea99 Correction of a BC break with json_encode and PHP 5.2.x
    
    Discussion
    ----------
    
    BC break with json_encode and php 5.2.x
    
    Hi,
    
    json_encode on php 5.2.x doesn't take the $options parameter wich result in a warning and the function return nothing.
    
    Cheers.
  2. fixed CS on template output

    fabpot committed Jul 27, 2011
  3. updated CHANGELOG

    fabpot committed Jul 27, 2011
  4. fixed previous merge

    fabpot committed Jul 27, 2011
  5. merged branch hason/optimizer (PR #399)

    fabpot committed Jul 27, 2011
    Commits
    -------
    
    3c5c512 fixed optimization for rendering blocks with variable name
    
    Discussion
    ----------
    
    Fixed bug in optimization
Commits on Jul 26, 2011
  1. updated CHANGELOG

    fabpot committed Jul 26, 2011
  2. merged branch netzhuffle/master (PR #396)

    fabpot committed Jul 26, 2011
    Commits
    -------
    
    7b154d6 Switched a tab to four spaces
    29d3cb2 Added testcase for #395
    4fc7a8d Merge remote-tracking branch 'upstream/master'
    c890cf2 Fixed existing tests
    9822ac4 Changed Module.php to pass existing tests
    fab8c72 fixed issue #395
    
    Discussion
    ----------
    
    Fix for issue #395
    
    Fix for #395
    I hope you can use it.
    
    ---------------------------------------------------------------------------
    
    by fabpot at 2011/07/25 00:07:50 -0700
    
    Can you add some unit tests?
    
    ---------------------------------------------------------------------------
    
    by netzhuffle at 2011/07/25 13:57:55 -0700
    
    Here you are.
  3. removed comment

    fabpot committed Jul 26, 2011
Commits on Jul 25, 2011
  1. Switched a tab to four spaces

    netzhuffle committed Jul 25, 2011
  2. Added testcase for #395

    netzhuffle committed Jul 25, 2011
  3. Fixed existing tests

    netzhuffle committed Jul 25, 2011
  4. simplified CHANGELOG

    fabpot committed Jul 25, 2011
  5. updated CHANGELOG

    fabpot committed Jul 25, 2011
  6. merged branch pulse00/master (PR #389)

    fabpot committed Jul 25, 2011
    Commits
    -------
    
    351910b added twig comments
    2b7e8d9 added phpDocs for TokenParsers, filters and tests
    
    Discussion
    ----------
    
    PHPDocs updated
    
    fixed copy/paste errors and added docs to Sandbox and Use tags
Commits on Jul 24, 2011
  1. fixed issue #395

    netzhuffle committed Jul 24, 2011
Commits on Jul 19, 2011
Commits on Jul 18, 2011
  1. added twig comments

    pulse00 committed Jul 18, 2011
Commits on Jul 17, 2011
  1. prepared 1.1.1 release

    fabpot committed Jul 17, 2011