geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-09 17:06:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,211 Commits 9 Branches 273 Tags
e67d976fce25152ef596d1920f2cf5b200205bd5
Commit Graph

1211 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabien Potencier e67d976fce added one more rule to the coding standards 2012-01-08 21:24:46 +01:00
Fabien Potencier 27137f6023 re-added the version in composer.json (if not, the version on packagist is master-dev instead of the more desirable 1.6-dev) 2012-01-08 20:40:34 +01:00
Fabien Potencier 50f3d0ef2e merged branch aerialls/patch-1 (PR #585) 
Commits
-------

3c934f4 Update doc/coding_standards.rst

Discussion
----------

Update doc/coding_standards.rst
 2012-01-08 20:38:51 +01:00
Julien Brochet 3c934f40fe Update doc/coding_standards.rst 2012-01-08 20:37:45 +01:00
Fabien Potencier f06ac33b53 fixed markup in doc 2012-01-08 20:24:02 +01:00
Fabien Potencier bdcb176cc8 added coding standards in the docs 2012-01-08 20:19:11 +01:00
Fabien Potencier e7510cb1d3 merged branch lyrixx/patch-dead-code (PR #584) 
Commits
-------

6ca2ca6 [Tests] Removed dead code in core test

Discussion
----------

[Tests] Removed dead code in core test

$core is never used. Test keeps passing.
 2012-01-08 17:57:34 +01:00
Grégoire Pineau 6ca2ca6050 [Tests] Removed dead code in core test 2012-01-08 17:27:53 +01:00
Fabien Potencier fa08e76f09 added a recipe for stateful node visitors 2012-01-07 09:53:33 +01:00
Fabien Potencier 260505129e added missing phpdoc 2012-01-06 20:35:29 +01:00
Fabien Potencier 764829f55a added a date function to ease date comparison (closes #571) 2012-01-06 20:32:26 +01:00
Fabien Potencier c07014a387 updated CHANGELOG 2012-01-06 19:48:27 +01:00
Fabien Potencier 8fb4172a04 fixed unary operators precedence (closes #583) 2012-01-06 19:47:50 +01:00
Fabien Potencier 46bd737007 merged branch vicb/doc/use (PR #581) 
Commits
-------

28b9b7b [Twig] Add a note about multiple inheritance (use tag)

Discussion
----------

[Twig] Add a note about multiple inheritance (use tag)

To add some visibility to this feature
 2012-01-06 12:47:43 +01:00
Victor Berchet 28b9b7ba44 [Twig] Add a note about multiple inheritance (use tag) 2012-01-06 09:22:05 +01:00
Fabien Potencier e74205e21e bumped version to 1.6.0-DEV 2012-01-05 15:35:20 +01:00
Fabien Potencier 5bba149706 prepared the 1.5.1 release v1.5.1 2012-01-05 15:34:14 +01:00
Fabien Potencier ee39215cc2 fixed regression in string parsing (closes #580) 2012-01-05 15:29:43 +01:00
Fabien Potencier 5fdf6599da merged branch lenar/patch-1 (PR #578) 
Commits
-------

5214794 compiles -> compile

Discussion
----------

compiles -> compile
 2012-01-04 15:40:11 +01:00
Lenar Lõhmus 5214794f97 compiles -> compile 2012-01-04 16:26:15 +02:00
Fabien Potencier aa037c80c4 added a note about the Twig extension DLL for Windows 2012-01-04 15:15:01 +01:00
Fabien Potencier d76d670b54 bumped version to 1.6.0-DEV 2012-01-04 14:31:46 +01:00
Fabien Potencier f6e49636d1 prepared the 1.5.0 release v1.5.0 2012-01-04 14:20:58 +01:00
Fabien Potencier 029ebe93c3 fixed doc (closes #577) 2012-01-03 21:52:27 +01:00
Fabien Potencier b626798160 merged branch lyrixx/patch-1 (PR #576) 
Commits
-------

7e8df56 Fixed CS

Discussion
----------

Fixed CS

I just fixed the CS in the doc
 2012-01-03 21:50:50 +01:00
Grégoire Pineau 7e8df56852 Fixed CS 2012-01-03 18:31:08 +01:00
Fabien Potencier b44dba5c7c fixed the join filter when several items have the same key 2012-01-02 15:13:27 +01:00
Fabien Potencier 64e3ce6a11 simplified code 2012-01-02 14:20:16 +01:00
Fabien Potencier c03458483b added a unit test 2012-01-02 13:14:06 +01:00
Fabien Potencier 19ba9c2141 added Traversable objects support for the join filter 2012-01-02 13:10:08 +01:00
Fabien Potencier 956830c7ee prepared the 1.5.0-RC2 release v1.5.0-RC2 2011-12-30 16:23:51 +01:00
Fabien Potencier f64d976182 updated doc for the date filter 2011-12-30 09:21:01 +01:00
Fabien Potencier 736dfa84d0 added a way to set the default global date interval format 2011-12-30 09:15:53 +01:00
Fabien Potencier 519b6805b0 refactored date filter code 2011-12-30 08:58:12 +01:00
Fabien Potencier bd0807221b merged branch alefranz/patch-2 (PR #575) 
Commits
-------

b295274 fix Date Format filter: DateInterval does not provide setTimezone()

Discussion
----------

fix Date Format filter: DateInterval does not provide setTimezone()
 2011-12-30 08:50:36 +01:00
alefranz b2952743d1 fix Date Format filter: DateInterval does not provide setTimezone() 2011-12-29 19:46:53 +01:00
Fabien Potencier fc85a16886 refactored Twig_Template::display() to ease its extension 2011-12-28 23:05:59 +01:00
Fabien Potencier 88de457774 tweaked previous merge 2011-12-28 20:34:32 +01:00
Fabien Potencier a9c53bc3fb merged branch markstory/number-format (PR #573) 
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
 2011-12-28 20:32:43 +01:00
Mark Story e3b81ad8cd Add documentation page for number_format. 2011-12-28 11:18:31 -05:00
Mark Story 0edcfdd28b Add number_format filter. 
Refs #417
 2011-12-28 10:39:04 -05:00
Fabien Potencier 670d5d7100 fixed Twig_Node_Expression_Array::hasElement() 2011-12-26 22:06:43 +01:00
Fabien Potencier fb6d5660ab prepared the 1.5.0-RC1 release v1.5.0-RC1 2011-12-26 11:40:36 +01:00
Fabien Potencier 5ee53cd550 fixed markup 2011-12-26 11:32:17 +01:00
Fabien Potencier 4b8a0e5e7a added missing doc for the do tag 2011-12-26 11:21:22 +01:00
Fabien Potencier a9aeea41d2 fixed typo 2011-12-26 11:17:02 +01:00
Fabien Potencier f3de043d0e changed hash key expression support (expression must now be enclosed with parentheses and hash keys can now be names) 2011-12-26 09:35:38 +01:00
Fabien Potencier 0d48b6d19d merged branch jeserkin/jeserkin (PR #570) 
Commits
-------

fd78ec0 Fixed PhpDoc for Twig_TokenParserInterface and all other TokenParsers

Discussion
----------

Fixed PhpDoc for Twig_TokenParserInterface and all other TokenParsers
 2011-12-26 09:08:00 +01:00
Eugene Serkin fd78ec0bf1 Fixed PhpDoc for Twig_TokenParserInterface and all other TokenParsers 2011-12-26 01:55:03 +02:00
Fabien Potencier b7de8e40c8 added convenience methods to manipulate an array node 2011-12-25 22:34:12 +01:00