5a56076659
fixed CS
2019-05-18 11:24:16 +02:00
07f294c9a3
minor #3022 Update docs for macros (fabpot)
...
This PR was merged into the 2.x branch.
Discussion
----------
Update docs for macros
Commits
-------
c71026be
2019-05-18 11:15:50 +02:00
c71026beab
updated docs for macros
2019-05-18 11:14:27 +02:00
78e4508a7c
Merge branch '1.x' into 2.x
...
* 1.x:
simplified code
2019-05-18 10:57:00 +02:00
2a8fa63690
minor #3021 Simplify code (fabpot)
...
This PR was merged into the 1.x branch.
Discussion
----------
Simplify code
Commits
-------
3ed9fae6
2019-05-18 10:56:15 +02:00
3ed9fae6fa
simplified code
2019-05-18 10:50:41 +02:00
3249a7710e
Merge branch '1.x' into 2.x
...
* 1.x:
tweaked docs for macros
2019-05-18 10:44:15 +02:00
a0fea74c7a
minor #3020 Tweak docs for macros (fabpot)
...
This PR was merged into the 1.x branch.
Discussion
----------
Tweak docs for macros
Commits
-------
53496d53
2019-05-18 10:42:02 +02:00
53496d53d8
tweaked docs for macros
2019-05-18 10:33:25 +02:00
a38ccea3d1
feature #3018 Add a better error message for unknown macros (fabpot)
...
This PR was merged into the 2.x branch.
Discussion
----------
Add a better error message for unknown macros
Commits
-------
1153534a
2019-05-18 09:08:39 +02:00
1153534aac
added a better error message for unknown macros
2019-05-18 09:01:55 +02:00
60ab3e7134
fixed CS
2019-05-18 06:15:39 +02:00
6d94b6405b
Merge branch '1.x' into 2.x
...
* 1.x:
fixed CS
2019-05-18 06:15:17 +02:00
f31aa2185b
fixed CS
2019-05-18 06:14:51 +02:00
84c698c99a
simplified code
2019-05-18 06:10:53 +02:00
347202d06b
Merge branch '1.x' into 2.x
...
* 1.x:
fixed the "filter" filter when the argument is \Traversable but does not implement \Iterator
2019-05-18 06:08:10 +02:00
d0c65c3a82
bug #3017 Fix the "filter" filter when the argument is \Traversable but does not implement \Iterator (fabpot)
...
This PR was merged into the 1.x branch.
Discussion
----------
Fix the "filter" filter when the argument is \Traversable but does not implement \Iterator
close #3015 , closes #3016
Commits
-------
c2f685e1
2019-05-18 06:06:26 +02:00
c2f685e16f
fixed the "filter" filter when the argument is \Traversable but does not implement \Iterator
2019-05-18 06:01:24 +02:00
7c098a2209
feature #3014 Add support for macros on "is defined" tests (fabpot)
...
This PR was merged into the 2.x branch.
Discussion
----------
Add support for macros on "is defined" tests
closes #1313
Commits
-------
9fe3213d
2019-05-17 18:55:44 +02:00
9fe3213d1b
added support for macros on "is defined" tests
2019-05-17 18:04:15 +02:00
257e6c29d3
fixed version
2019-05-17 14:21:21 +02:00
6cfd53fa5c
Merge branch '1.x' into 2.x
...
* 1.x:
fixed typo
update docs for for loop with conditional to reference filter filters
2019-05-17 14:21:07 +02:00
d3dcd6d3c5
fixed typo
2019-05-17 14:20:59 +02:00
4c19987663
minor #3006 update docs for for loop with conditional to reference filter filters (shieldo)
...
This PR was submitted for the 2.x branch but it was merged into the 1.x branch instead (closes #3006 ).
Discussion
----------
update docs for for loop with conditional to reference filter filters
I don't know if there needs to be the same emphasis for this case as there's no special syntax for this any more? This PR assumes the same emphasis.
Commits
-------
b905e023
2019-05-17 14:19:56 +02:00
b905e02333
update docs for for loop with conditional to reference filter filters
2019-05-17 14:19:50 +02:00
f6855c6182
feature #3012 Macros imported "globally" in a template are now available in macros without re-importing them (fabpot)
...
This PR was merged into the 2.x branch.
Discussion
----------
Macros imported "globally" in a template are now available in macros without re-importing them
closes #1790 , closes #1052 , closes #2414 , closes #2442
Commits
-------
e1381640
2019-05-17 14:15:30 +02:00
e138164015
macros imported "globally" in a template are now available in macros without re-importing them
2019-05-17 13:03:55 +02:00
cd49c5d44b
added more tests
2019-05-17 11:15:47 +02:00
8a9308c268
Merge branch '1.x' into 2.x
...
* 1.x:
added some tests
2019-05-17 09:44:35 +02:00
f74ce7190a
added some tests
2019-05-17 08:38:57 +02:00
3d1e5f6493
bumped version to 2.11
2019-05-17 08:23:38 +02:00
26b21cc24c
Merge branch '1.x' into 2.x
...
* 1.x:
bumped version to 1.42
2019-05-17 08:23:11 +02:00
0f5a056968
bumped version to 1.42
2019-05-17 08:22:23 +02:00
c8d2cc3ae5
Merge branch '1.x' into 2.x
...
* 1.x:
fixed typo
2019-05-17 08:14:40 +02:00
b086d4f4bb
fixed typo
2019-05-17 08:14:31 +02:00
a571638929
fixed tests
2019-05-17 08:14:18 +02:00
e9a09d90c3
Merge branch '1.x' into 2.x
...
* 1.x:
fixed a PHP fatal error when calling a macro imported in the template in a nested block
2019-05-17 08:09:05 +02:00
62748c9559
bug #3013 Fix a PHP fatal error when calling a macro imported in the template in a nested block (fabpot)
...
This PR was merged into the 1.x branch.
Discussion
----------
Fix a PHP fatal error when calling a macro imported in the template in a nested block
Commits
-------
11353ce3
2019-05-17 08:08:49 +02:00
11353ce3a7
fixed a PHP fatal error when calling a macro imported in the template in a nested block
2019-05-17 08:04:06 +02:00
bb01eb1c9c
Merge branch '1.x' into 2.x
...
* 1.x:
fixed typo
2019-05-16 21:07:33 +02:00
8c80142ba3
fixed typo
2019-05-16 21:07:25 +02:00
4e1c3b8a7c
Merge branch '1.x' into 2.x
...
* 1.x:
added some tests
2019-05-16 21:02:31 +02:00
6b341104ec
added some tests
2019-05-16 21:02:14 +02:00
73326f0ddc
Merge branch '1.x' into 2.x
...
* 1.x:
fixed a regression
2019-05-16 20:18:06 +02:00
bd1f9eb39b
bug #3011 Fix a regression (fabpot)
...
This PR was merged into the 1.x branch.
Discussion
----------
Fix a regression
Commits
-------
3c7602b9
2019-05-16 20:17:10 +02:00
3c7602b9da
fixed a regression
2019-05-16 19:44:44 +02:00
e671f267ce
Merge branch '1.x' into 2.x
...
* 1.x:
made code more readable
2019-05-16 16:31:36 +02:00
06670f3630
made code more readable
2019-05-16 16:30:26 +02:00
ad1d08a431
Merge branch '1.x' into 2.x
...
* 1.x:
tweaked the error message when using extends in a block/macro
2019-05-16 16:16:50 +02:00
0968176a05
bug #3010 Tweak the error message when using extends in a block/macro (fabpot)
...
This PR was merged into the 1.x branch.
Discussion
----------
Tweak the error message when using extends in a block/macro
Commits
-------
70c1b3a2
2019-05-16 16:16:26 +02:00
Fabien Potencier
Douglas Greenshields