dca3f74e49
removed the "if" condition support on the "for" tag
2019-05-14 09:17:47 +02:00
3d1b9a11d8
Merge branch '2.x' into 3.x
...
* 2.x:
fixed CS
added the key to the map and filter filters
added support for iterators
removed fn in front of arrow functions
changed arrow syntax
added "filter", "map", and "reduce" filters
simplified code
fixed CS
bumped version to 2.10
bumped version to 1.41
fixed partial output leak when a PHP fatal error occurs
fixed markup in docs
2019-05-09 13:29:19 +02:00
5c484ce7eb
Merge branch '1.x' into 2.x
...
* 1.x:
added the key to the map and filter filters
added support for iterators
removed fn in front of arrow functions
changed arrow syntax
added "filter", "map", and "reduce" filters
simplified code
fixed CS
fixed partial output leak when a PHP fatal error occurs
2019-05-09 13:25:49 +02:00
5c15f897c7
added the key to the map and filter filters
2019-05-03 19:04:11 +02:00
175041e01b
removed fn in front of arrow functions
2019-05-03 18:12:19 +02:00
b30bce1139
added "filter", "map", and "reduce" filters
2019-05-03 17:09:12 +02:00
79c9b05856
Merge branch '1.x' into 2.x
...
* 1.x:
fixed markup in docs
2019-05-03 05:45:53 +02:00
d3acd0bede
fixed markup in docs
2019-05-03 05:45:17 +02:00
23a5d57cfa
Merge branch '2.x' into 3.x
...
* 2.x:
removed wrong link in docs
fixed doc markup
optimized context access on PHP 7.4
2019-04-30 15:02:09 +02:00
d03684c9f2
Merge branch '1.x' into 2.x
...
* 1.x:
removed wrong link in docs
fixed doc markup
2019-04-30 14:27:24 +02:00
bd7ca26497
removed wrong link in docs
2019-04-30 14:26:21 +02:00
61eb901f16
fixed doc markup
2019-04-30 14:23:18 +02:00
9a4fbac715
fixed doc indexes
2019-04-30 14:19:58 +02:00
12f612f4d9
Merge branch '2.x' into 3.x
...
* 2.x:
fixed doc indexes
fixed doc indexes
add column filter to index
bumped version to 1.40.2-DEV
prepared the 1.40.1 release
revert 1.x changes
fixed regression in NodeTraverser
2019-04-30 14:19:00 +02:00
3806c6db7d
fixed doc indexes
2019-04-30 14:18:53 +02:00
ad467a74d1
Merge branch '1.x' into 2.x
...
* 1.x:
fixed doc indexes
add column filter to index
bumped version to 1.40.2-DEV
prepared the 1.40.1 release
2019-04-30 14:17:39 +02:00
bd5c53f1b2
fixed doc indexes
2019-04-30 14:16:53 +02:00
e804338b2c
add column filter to index
2019-04-30 14:14:19 +02:00
fa813bed88
Merge branch '2.x' into 3.x
...
* 2.x:
tweaked the doc
2019-04-27 16:57:20 +01:00
27a9a4d91d
Merge branch '1.x' into 2.x
...
* 1.x:
tweaked the doc
2019-04-27 16:57:11 +01:00
5ac239ca4f
tweaked the doc
2019-04-27 15:54:47 +01:00
8d86ddeb1a
Merge branch '2.x' into 3.x
...
* 2.x:
fixed doc format
tweaked doc markup
tweaked escape docs
2019-04-25 14:28:32 +02:00
bcc34c4bb7
fixed doc format
2019-04-25 14:27:56 +02:00
97167aab98
Merge branch '1.x' into 2.x
...
* 1.x:
tweaked doc markup
tweaked escape docs
2019-04-25 14:27:37 +02:00
fa836ddfea
tweaked doc markup
2019-04-25 12:14:46 +02:00
6578035968
minor #2980 Tweak escape docs (fabpot)
...
This PR was merged into the 1.x branch.
Discussion
----------
Tweak escape docs
Commits
-------
fb68f487
2019-04-25 12:13:47 +02:00
fb68f487ce
tweaked escape docs
2019-04-25 12:07:29 +02:00
d475a92c83
removed the deprecated filter tag
2019-04-24 21:03:27 +02:00
f1070b1f55
Merge branch '2.x' into 3.x
...
* 2.x:
deprecated the filter tag
fixed bad merge
fixed docs
fixed typo
fixed docs
removed die()
added the apply tag
2019-04-24 20:59:10 +02:00
776e32bc7a
deprecated the filter tag
2019-04-24 20:55:30 +02:00
5dc4f198b2
fixed docs
2019-04-24 19:38:21 +02:00
d7714a6b15
Merge branch '1.x' into 2.x
...
* 1.x:
fixed typo
fixed docs
2019-04-24 19:36:44 +02:00
321c9a855c
fixed typo
2019-04-24 19:36:33 +02:00
31a28fcb8f
fixed docs
2019-04-24 19:36:11 +02:00
f9bc780a62
Merge branch '1.x' into 2.x
...
* 1.x:
added the apply tag
2019-04-24 19:34:20 +02:00
619bc12f62
added the apply tag
2019-04-24 17:20:47 +02:00
a718842015
added some notes in deprecated doc
2019-04-24 15:01:32 +02:00
86eb15dede
removed the "base_template_class" option on Twig\Environment
2019-04-23 17:42:53 +02:00
682a27192b
updated the docs for 3.0
2019-04-23 16:39:10 +02:00
b4cbc2a774
Merge branch '1.x' into 2.x
...
* 1.x:
tweaked macro docs
2019-04-23 09:03:33 +02:00
7446a6d89f
tweaked macro docs
2019-04-23 08:35:30 +02:00
5558a954e5
Merge branch '1.x' into 2.x
...
* 1.x:
added a note about escaping
fixed doc (missing word)
2019-04-22 17:53:59 +02:00
6e93c4d0c8
minor #2950 Add a note about escaping (fabpot)
...
This PR was merged into the 1.x branch.
Discussion
----------
Add a note about escaping
closes #2623 , closes #2661
Commits
-------
a83f7e85
2019-04-22 09:08:02 +02:00
a83f7e855d
added a note about escaping
2019-04-22 09:04:11 +02:00
8e2f11d165
fixed doc (missing word)
2019-04-22 08:28:53 +02:00
253f3e8e88
Merge branch '1.x' into 2.x
...
* 1.x:
made escaping on ternary expressions more fine-grained
2019-04-11 21:10:58 +02:00
dfa9411310
made escaping on ternary expressions more fine-grained
2019-04-11 17:26:15 +02:00
cf98f334e8
Merge branch '1.x' into 2.x
...
* 1.x:
added the possibility to give a nice name to string templates
added the possibility to give a nice name to string templates
2019-04-11 09:58:10 +02:00
d7e2e5418c
added the possibility to give a nice name to string templates
2019-04-11 09:55:43 +02:00
cef61a0cad
Merge branch '1.x' into 2.x
...
* 1.x:
added support for a new whitespace trimming option
made Lexer regexes more readable
simplified Lexer regexes
2019-04-03 16:42:51 +02:00
Fabien Potencier
Pablo Schläpfer