d4eec01a9b
Move html case up since it is the most likely to be hit
2013-05-06 14:01:58 +02:00
086088e676
Optimize initGlobals to do only one merge call
2013-05-04 22:18:16 +02:00
135b618ff9
enforced usage of named arguments after positional ones
2013-05-01 20:07:00 +02:00
eaf5a2db54
fixed the autoloader for PHP 5.2
2013-05-01 08:42:53 +02:00
a20a46ab4a
simplified code
2013-05-01 07:10:30 +02:00
f29bebbed0
merged branch hason/tests_autoloader (PR #994 )
...
This PR was merged into the master branch.
Discussion
----------
Fixed autoloader registration for tests if phpunit is installed as package together with Twig
Commits
-------
19869ce
2013-05-01 07:08:24 +02:00
536ea37d1f
removed obsolete call to ini_set
2013-04-26 11:34:36 +02:00
19869ce00c
Fixed autoloader registration for tests if phpunit is installed as package together with Twig
2013-04-22 23:29:01 +02:00
08b4a73791
Debug extension is safe in a cli context
2013-04-21 16:30:55 +02:00
f9ad8c089d
merged branch jibriss/fix_defined (PR #1051 )
...
This PR was merged into the master branch.
Discussion
----------
Fixed : fatal error when using defined test on an invalid expression
Commits
-------
e285228
2013-04-13 08:32:43 +02:00
7c8acf712e
Prevent extensions from clobbering all globals.
2013-04-12 11:46:40 +02:00
1819d97520
removed unused variable
2013-04-09 18:55:44 +02:00
e28522812a
Fixed : fatal error when using defined test on an invalid expression
2013-04-08 22:43:53 +02:00
ceadaa68af
bumped version to 1.12.4-DEV
2013-04-08 15:07:19 +02:00
27f3428b08
prepared the 1.12.2 release
2013-04-08 14:40:11 +02:00
3d19a2eed5
Fixed twig filesystemloader security issue + test ( closes #1026 )
2013-04-08 14:15:31 +02:00
92e97b9d90
Registration a Twig_SimpleFunction after extensions initialized throw not LogicException, but Fatal Error
2013-04-01 10:26:39 +02:00
49488b8f24
Fixed typos
2013-03-10 02:06:44 +00:00
39d94faabc
fixed phpdoc
2013-02-28 15:08:49 +01:00
bc30d9b7e2
merged branch Tobion/buildquery (PR #1009 )
...
This PR was squashed before being merged into the master branch (closes #1009 ).
Commits
-------
fcf9525http://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 )
2013-02-26 14:03:39 +01:00
fcf9525dc3
let url_encode filter also accept array of query parameters
2013-02-26 14:03:39 +01:00
7b11c6fd5e
Merge remote-tracking branch 'lyrixx/feat-batch-ceil'
...
* lyrixx/feat-batch-ceil:
Ceil the size in batch filter
Conflicts:
test/Twig/Tests/Fixtures/filters/batch.test
2013-02-26 14:02:07 +01:00
933d2f922c
merged branch Felds/optimize-batch (PR #1007 )
...
This PR was merged into the master branch.
Commits
-------
ccf3cd1https://github.com/fabpot/Twig/commit/a50bc8c95be668c35cda5a6efc6a1e8413d52670#commitcomment-2665059
2013-02-26 13:59:54 +01:00
c82308ace4
deprecated use, -4 files to include.
2013-02-25 02:03:01 +01:00
214385dccf
removed unneeded PHPdoc tags
2013-02-24 22:41:17 +01:00
50f5271ef0
Ceil the size in batch filter
2013-02-22 16:02:01 +01:00
ccf3cd1c81
optimize batch function and add tests
2013-02-21 12:11:54 -03:00
a50bc8c95b
added a batch filter
2013-02-21 07:38:58 +01:00
ac86c6368c
changed an exception to be consistent with other ones (and also to better help debugging problems)
2013-02-17 20:51:08 +01:00
72c8bb73e9
bumped version to 1.12.3-DEV
2013-02-09 19:37:02 +01:00
a56f7405be
prepared the 1.12.2 release
2013-02-09 19:21:53 +01:00
b5438c2745
added some unit tests for previous merge
2013-02-08 21:59:58 +01:00
6a3a42a30e
merged branch andrewjbaker/force-timezone (PR #964 )
...
This PR was merged into the master branch.
Commits
-------
999b1c4http://uk3.php.net/manual/en/datetime.construct.php
"The $timezone parameter and the current timezone are ignored when the $time parameter either is a UNIX timestamp (e.g. @946684800) or specifies a timezone (e.g. 2010-01-28T15:00:00+02:00)."
Accepting this pull request is dependent on whether the desired functionality of the date filter should honour the PHP way of doing things, or the more logical and natural functionality anticipated by a Twig template designer; always ensuring the timezone passed into the date filter is applied.
2013-02-08 20:01:59 +01:00
d13027d163
fixed globals when getGlobals is called early on ( closes #990 )
2013-02-08 18:01:47 +01:00
f8d4db4107
added the first and last filters ( closes #951 )
2013-01-26 16:59:11 +01:00
5218db7796
added an exception when trying to render a template when no loader has been set ( closes #975 )
2013-01-26 16:09:24 +01:00
88cefd3712
tweaked previous merge
2013-01-26 15:57:10 +01:00
a1b7ec56e6
Tweak twig_constant()
2013-01-16 09:40:49 +01:00
2a7d317cf9
bumped version to 1.12.2-DEV
2013-01-15 21:09:30 +01:00
7c124c94a5
prepared the 1.12.1 release
2013-01-15 21:03:52 +01:00
7c2479d47b
tweaked previous merge
2013-01-15 20:56:11 +01:00
19053ab492
merged branch markstory/object-constants (PR #961 )
...
This PR was merged into the master branch.
Commits
-------
8bb953cc7dafb7cb921ce998b367#954 .
2013-01-15 20:54:16 +01:00
5abad16081
relaxed globals management to avoid a BC break ( closes #965 )
2013-01-15 20:48:33 +01:00
999b1c48c5
Force timezone setting in date filter
2013-01-14 16:07:52 +00:00
8bb953cb65
Fix doc block for twig_constant.
2013-01-11 09:44:29 -05:00
cb921ce602
Implement getting constants from objects.
2013-01-10 23:38:01 -05:00
d10ebfa3d4
added support for {{ some_string[:2] }} ( closes #952 )
2013-01-08 15:19:19 +01:00
ad31e1765a
bumped version to 1.12.1-DEV
2013-01-08 15:08:36 +01:00
19c860742b
prepared the 1.12.0 release
2013-01-08 14:42:43 +01:00
56bef3fa37
forbid mixed usage of raw/verbatim
2013-01-08 13:28:45 +01:00
Jordi Boggiano
Fabien Potencier
Martin Hasoň
Grégoire Pineau
Andrew Winter
Jerome Brissonnet
Rick Prent
Vasiliy Horbachenko
Pascal Borreli
Tobias Schultze
Michał Pawłowski
Luiz “Felds” Liscia
Eugene Leonovich
Andrew Baker
Mark Story