8e166f2dae
Merge branch '1.x' into 2.x
...
* 1.x:
improved the tag documentation
2019-02-27 08:39:53 +01:00
ab02b24f91
improved the tag documentation
2019-02-26 18:57:58 +01:00
62a1c66397
removed mentions of version 1.x in docs for 2.x
2019-02-25 09:39:24 +01:00
b2883a9885
Merge branch '1.x' into 2.x
...
* 1.x:
fixed wrong version in docs
2019-02-25 09:38:41 +01:00
4f9d21fbce
fixed wrong version in docs
2019-02-25 09:38:34 +01:00
56cab7674c
Merge branch '1.x' into 2.x
...
* 1.x:
improved documentation on tags
2019-02-25 09:36:05 +01:00
571cf6e984
improved documentation on tags
2019-02-25 09:34:06 +01:00
e00241546d
minor #2851 Tweak some docs (fabpot)
...
This PR was merged into the 2.x branch.
Discussion
----------
Tweak some docs
Commits
-------
a12e79b6
2019-02-24 10:13:35 +01:00
a12e79b6a9
tweaked some docs
2019-02-24 10:12:46 +01:00
3f71217f63
deprecated the possibility to change the base template for generated templates
2019-02-17 09:39:54 +01:00
725f94233a
used ::class whenever possible
2019-02-16 19:20:58 +01:00
69f37c164b
moved some more classes to namespaced ones
2019-02-16 19:13:57 +01:00
d1596b6ccf
moved to namespaced classes by default
2019-02-15 08:44:47 +01:00
ff77e221e0
Merge branch '1.x' into 2.x
...
* 1.x:
moved to namespaced classes by default
fixed some class names
bumped version to 1.38
2019-02-15 08:34:23 +01:00
3632a46e82
moved to namespaced classes by default
2019-02-15 08:28:49 +01:00
db751d62d3
fixed some class names
2019-02-15 08:28:49 +01:00
f2eb6afd66
Merge branch '1.x' into 2.x
...
* 1.x:
added some docs about the difference between the include tag and the include function
2019-02-15 04:22:01 +01:00
85972a040e
deprecated Parser::isReservedMacroName()
2019-02-15 03:39:46 +01:00
185a11d243
tweaked message
2019-02-15 03:34:39 +01:00
8488c7c2a4
tweaked deprecations
2019-02-14 07:47:25 +01:00
2d9024843f
added some docs about the difference between the include tag and the include function
2019-02-13 09:34:17 +01:00
de376081a1
Merge branch '1.x' into 2.x
...
* 1.x:
removed the <pre> tag in docblocks
remove duplicated directory separator
Fix typo
bumped version to 1.37.2-DEV
prepared the 1.37.1 release
backport tests
2019-02-12 08:57:33 +01:00
e773c8fc9c
Fix typo
2019-01-15 08:54:07 +01:00
a461e59f65
Merge branch '1.x' into 2.x
...
* 1.x:
fixed tests
added missing information in the precedence paragraph
Add missing ]
fixed float representation in compiled templates
2019-01-12 04:50:09 +01:00
2d66fa85a5
deprecated passing a string as a source on Twig_Error
2019-01-12 03:32:42 +01:00
a4ebc27300
minor #2802 Add missing information in the precedence paragraph (fabpot)
...
This PR was merged into the 1.x branch.
Discussion
----------
Add missing information in the precedence paragraph
closes #2766
closes #2728
closes #2731
Commits
-------
fb511950
2019-01-12 02:59:44 +01:00
fb51195059
added missing information in the precedence paragraph
2019-01-12 02:55:55 +01:00
c760d62a67
Add missing ]
2019-01-11 20:02:58 +01:00
2ed21eea43
Merge branch '1.x' into 2.x
...
* 1.x:
fixed .php_cs CS
removed 5.3 from Travis matrix
removed array notation in comments
enabled short array notation in docs
fixed usage of short array notation in tests
fixed usage of short array notation in tests
fixed more short array notations
switched to use PHP short array notation for Twig's code
switched to use short arrays in generated code
dropped PHP 5.3 support
bumped version
2019-01-08 17:28:13 +01:00
a2c4253406
enabled short array notation in docs
2019-01-08 11:56:48 +01:00
7266c9ade1
Added hint that the php c extension is only for php5
2018-12-16 22:09:22 +01:00
47c7be824f
Merge branch '1.x' into 2.x
...
* 1.x:
tweaked previous merge
Enhances join filter for natural language join (i.e., \"A, B and C\")
2018-12-16 12:04:58 +01:00
e3790ab03c
tweaked previous merge
2018-12-16 12:04:48 +01:00
bf529d0a7a
Enhances join filter for natural language join (i.e., \"A, B and C\")
2018-12-16 11:41:42 +01:00
ba7fdd9122
Merge branch '1.x' into 2.x
...
* 1.x:
Update .travis.yml
fiwed internal link
Make sure twig_include returns a string
2018-11-30 07:25:29 +01:00
434589bd8a
Remove mention of the Twig C extension
...
As per https://github.com/twigphp/Twig/pull/2318
2018-11-30 11:05:44 +11:00
f2b8e9acad
fiwed internal link
2018-10-12 07:15:08 -07:00
c8020aa5d8
Merge branch '1.x' into 2.x
...
* 1.x:
fixed ReST format
Document combining JSON constants
2018-10-12 05:54:33 -07:00
d59dfc979b
fixed ReST format
2018-10-12 05:53:19 -07:00
7f4ecd66f1
Document combining JSON constants
...
Working out how to do this took Slack and StackOverflow. Documenting so others know what to do.
2018-10-12 05:51:35 -07:00
5dd532eed8
Merge branch '1.x' into 2.x
...
* 1.x:
Improved the code of an example
2018-09-27 16:33:35 +02:00
f07a876de6
Improved the code of an example
2018-09-27 16:26:19 +02:00
3da51873fa
Merge branch '1.x' into 2.x
...
* 1.x:
Fix multi-byte UFT-8 in escape('html_attr')
added missing test
Added "deprecated" tag
2018-09-20 16:26:04 +02:00
2ab433833e
Added "deprecated" tag
2018-07-31 08:18:50 -04:00
1329b5580f
bumped versionn to 2.6
2018-07-31 11:41:48 +02:00
0837fda1b7
Merge branch '1.x' into 2.x
...
* 1.x:
Add support for dynamic tests
2018-07-31 11:40:19 +02:00
4beb7bfb0b
Add support for dynamic tests
2018-07-31 11:10:58 +02:00
e3b8a34023
Merge branch '1.x' into 2.x
...
* 1.x:
Ensure that syntax errors are triggered with the right line
fix a typo
2018-06-07 07:41:23 +02:00
36787f01d2
fix a typo
2018-05-30 21:54:04 +02:00
b2dac7df50
deprecated using the spaceless tag at the root level of a child template (noop anyway)
2018-05-18 12:56:53 +02:00
Fabien Potencier
Lesik
rosier
Alexander Schranz
LavaSlider
Dan Barrett
Peter Bowyer
Javier Eguiluz
Yonel Ceruto
Christian Flothmann