Commit Graph

602 Commits

Author SHA1 Message Date
Fabien Potencier 01ab6f317b added some more tests for the filename autoescape strategy 2015-01-14 07:56:45 +01:00
Fabien Potencier 4481bf5f38 added an escaping strategy based on the template filename extension 2015-01-13 16:33:59 +01:00
Fabien Potencier 2615ae34dd minor #1581 Adding example with `not for if` (InFog)
This PR was merged into the 1.16-dev branch.

Discussion
----------

Adding example with ``not`` for ``if``

I could not find an example with ``not``, so I added it here.

Commits
-------

4a75e40 Adding example with ``not`` for ``if``
2014-12-25 20:53:02 +01:00
Paul Mallet d5fe41344b Add display information to slice example 2014-12-22 16:39:55 +01:00
Evaldo Junior 4a75e4024e Adding example with `not for if`
I could not find an example with ``not``, so I added it here.
2014-12-16 11:00:43 +01:00
Christian Raue ba04803ed3 fixed alphabetic order in lists of filters and tags 2014-11-10 14:17:24 +01:00
maxstekel 435534ef05 first argument of Twig_Loader_Array must be an array 2014-10-23 11:29:06 +02:00
Fabien Potencier e37fc6b059 updated repo URLs in the docs 2014-10-21 16:58:01 +02:00
Fabien Schurter 882f44b0d3 Correct base template name
The base template name used in $loader1 and $loader2 is actually
"base.html", not "base.twig".
2014-10-16 09:32:46 +02:00
Fabien Potencier 91a3660f7b reordered doc index to match the website 2014-10-16 08:05:34 +02:00
Fabien Potencier 92847ed0d8 fixed table format in docs 2014-10-16 07:50:15 +02:00
Fabien Potencier 98f1a4b280 simplifies Twig installation instructions 2014-10-14 09:04:21 +02:00
Fabien Potencier d12f7afbbe made it clear that Twig_Loader_String must not be used by end users 2014-10-11 22:30:59 +02:00
Fabien Potencier 997f2f0823 fixed formatting in the docs 2014-10-11 01:31:53 +02:00
Fabien Potencier 0b2f373fc4 deprecated Node::toXml() 2014-10-01 13:19:23 +02:00
Fabien Potencier fcdb9487cc minor #1509 Update convert_encoding.rst: wrong argument order (binarious)
This PR was merged into the 1.16-dev branch.

Discussion
----------

Update convert_encoding.rst: wrong argument order

The arguments are in incorrect order. The first should be `to` and the second should be `from` - just like the text describes it.

Commits
-------

4e1d9a7 Update convert_encoding.rst
2014-10-01 07:31:33 +02:00
Brandon Kelly 2f5a927b72 date() documentation correction 2014-09-30 10:07:37 -07:00
binarious 4e1d9a7522 Update convert_encoding.rst
The arguments were in incorrect order. The first should be `to` and the second should be `from` - just like the text describes it.
2014-09-22 11:29:45 +02:00
Fabien Potencier 9cd07271c3 minor #1474 Update installation.rst (soatok)
This PR was merged into the 1.16-dev branch.

Discussion
----------

Update installation.rst

Refer to PGP signature verification in the installation instructions for tarballs.

Commits
-------

3c48cb1 Update installation.rst
2014-08-27 11:26:36 +02:00
Fabien Potencier a4867487f2 minor #1487 Added note about array_merge php function (pulzarraider)
This PR was merged into the 1.16-dev branch.

Discussion
----------

Added note about array_merge php function

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT

Just a small doc improvement.

Commits
-------

f712b8f Added note about array_merge php function
2014-08-27 11:25:58 +02:00
Andrej Hudec f712b8f8e6 Added note about array_merge php function 2014-08-24 00:31:40 +02:00
John Berberich 4e1515c3c5 Delimit comment in template using correct syntax
Enclose the comment in '{# #}' instead of beginning line with '#'.
2014-08-22 10:11:09 -04:00
Soatok 3c48cb1140 Update installation.rst
Refer to PGP signature verification in the installation instructions for tarballs.
2014-08-05 08:33:51 -04:00
Fabien Potencier 21f0b829f9 added more docs for the if tag 2014-08-01 09:38:44 +02:00
Brandon Kelly 33dcbc8c76 Fixed the matches operator code example
It wasn't working because the backslashes themselves needed to be escaped by additional backslashes. Also switched to using forwardslashes for the regex delimiters rather than curly brackets.
2014-07-28 11:37:46 -07:00
Fabien Potencier 5fd428ed76 fixed some typos 2014-07-08 15:46:25 +02:00
Fabien Potencier 82a034c591 minor #1333 Added disambiguation on using raw in expressions (OwlyCode)
This PR was merged into the 1.16-dev branch.

Discussion
----------

Added disambiguation on using raw in expressions

I recently got in trouble using the ``raw`` filter in a ternary, leading to a value being escaped and me not expecting it. The code was :

```
{{ foo|striptags|length > 250 ? foo|striptags|slice(0, 250) ~ '...' : foo|raw }}
```

When foo's length was under 250 characters, the result of this expression was escaped. Here is the updated documentation to explain why.

Commits
-------

cec2b57 Added disambiguation on using raw in expressions
2014-07-08 15:44:12 +02:00
Barry vd. Heuvel 06ca7f9837 Typo in deprecated.rst 2014-07-05 14:50:30 +02:00
Fabien Potencier f4c41f78a5 fixed the deprecated docs about PEAR 2014-07-05 13:37:05 +02:00
Zoltan Radics c90d46988f Add 'PHP-twig for atom' package to IDEs support 2014-07-05 11:31:15 +02:00
Seb Minderhoud 87165e7ea5 Update slice.rst 2014-06-19 09:49:36 +02:00
Fabien Potencier 1c0bec2814 added a note in the docs about the fact that installing the C ext is optional 2014-05-26 17:15:28 +02:00
Fabien Potencier 1930600e4e fixed url_encode when raw is false and URL is an array 2014-05-26 02:31:15 +02:00
Fabien Potencier fce3b8a928 minor #1409 Update json_encode.rst (matthieuprat)
This PR was merged into the 1.15-dev branch.

Discussion
----------

Update json_encode.rst

Commits
-------

1b3ac0a Update json_encode.rst
2014-05-26 01:53:41 +02:00
Wagner Nicolas 0e228c719a [Doc]Put the return of the split filter in a variable 2014-05-26 01:53:13 +02:00
Matthieu Prat 1b3ac0aa16 Update json_encode.rst 2014-05-22 20:35:52 +02:00
Adam Elsodaney e4b7db1705 Improve the description of the 'same as' test
This description of the 'same as' test is based on the description in the docblock for Twig_Node_Expression_Test_Sameas. It reads better than the one currently used in the docs.
2014-05-20 15:02:48 +01:00
Wouter J 49de7a6b04 Fixed typo 2014-05-14 11:53:45 +02:00
Fabien Potencier 052eb5d1ed fixed markpu 2014-05-05 10:48:03 +02:00
Fabien Potencier 84dcec3086 removed beta versions for PEAR in the docs 2014-05-05 10:32:59 +02:00
Fabien Potencier 1796eb1d95 added a note about PEAR deprecation in the docs 2014-05-05 10:29:57 +02:00
Ahmed Siouani d0de4731f6 Fixed typo (escaping strategy). 2014-04-29 17:56:23 +02:00
Andrew M a8a1f12740 Fix typo: filters => filter 2014-04-06 20:55:25 +03:00
Andrew M. 2511617f7b Fix typo: providing => provided 2014-03-30 18:43:22 +03:00
Fabien Potencier 8c5844a56f minor #1327 Update templates.rst (granitegreg)
This PR was merged into the 1.15-dev branch.

Discussion
----------

Update templates.rst

Fixed typo (missing word).

Commits
-------

e278aee Update templates.rst
2014-02-24 16:39:56 +01:00
Fabien Potencier 8e625ba57d minor #1336 Added additional example to min/max doc (c33s)
This PR was squashed before being merged into the 1.15-dev branch (closes #1336).

Discussion
----------

Added additional example to min/max doc

* fixed typo in the word "four"
* added an additional example with letters

Commits
-------

b709577 Added additional example to min/max doc
2014-02-24 16:39:24 +01:00
Julian b7095770e2 Added additional example to min/max doc 2014-02-24 16:39:24 +01:00
Yaakov Gesher e2f0b2e246 Fixed a number of grammatical errors and the like 2014-02-24 14:42:30 +02:00
Martin Tournoij d73d612c0b Update intro.rst
Quote the shell command, since it contains an asterisk (*).
2014-02-13 22:05:06 +01:00
Tristan Maindron cec2b57415 Added disambiguation on using raw in expressions 2014-02-07 14:31:54 +01:00