Commit Graph

810 Commits

Author SHA1 Message Date
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
Greg McAvoy-Jensen e278aeed3f Update templates.rst
Fixed typo (missing word).
2014-01-29 16:01:00 -08:00
Fabien Potencier e9e4748475 added a note about how to check for dynamic attribute existence in the docs 2014-01-29 09:45:07 +01:00
Brandon Kelly 8958565cef Added a more clear example in the cycle() docs
The previous one was potentially misleading if you were focussed on the actual numbers (0 is even, not odd! etc.), and 99% of the time you’re going to be passing loop.index0 into cycle, so I felt that should be included in the example.
2014-01-24 04:27:48 -08:00
Fabien Potencier 2b0b904340 minor #1290 [Docs] Fix example: space missing between concatenated strings (GromNaN)
This PR was merged into the 1.15-dev branch.

Discussion
----------

[Docs] Fix example: space missing between concatenated strings

The expression `'Hello'~'Fabien'` produces `'HelloFabien'`, not `'Hello Fabien'`. I've just added a space after `'Hello'`.

Commits
-------

d6e0357 Fix doc example: space missing between concatenated strings
2013-12-27 15:27:14 +01:00
ureimers d8ea1b1784 Fixed rendering of `-3`
The missing space between "``-3``" and "(this is just syntactic[...])" led to the ``-3`` being rendered wrong. The parser must've ignored the closing "``" when it was directly followed by a non-space character.
2013-12-10 11:19:22 +01:00
Jérôme Tamarelle d6e03576f6 Fix doc example: space missing between concatenated strings 2013-12-07 20:09:53 +01:00
Fabien Potencier fcecb284f0 fixed markup 2013-12-03 15:16:16 +01:00
Fabien Potencier 7e7818e48f feature #1277 Added min and max function (lyrixx)
This PR was merged into the master branch.

Discussion
----------

Added min and max function

usefull for pagination

Commits
-------

6aa06de Added min and max function
2013-12-03 14:05:12 +01:00
Grégoire Pineau 6aa06dea05 Added min and max function 2013-12-03 13:46:57 +01:00
Fabien Potencier c9eca3508c fixed typo 2013-12-03 13:41:51 +01:00
ureimers a360bc037c Corrected description of the "//" operator
The operator was previously described to truncate the the value when it in fact floors the result of the division (which can be seen in https://github.com/fabpot/Twig/blob/master/lib/Twig/Node/Expression/Binary/FloorDiv.php#L20).
By the old description one would think that ``{{ -20 // 7 }}`` would yield -2 (as in ``(int)(-20/7)``) when it actually returns -3 (as in ``floor(-20/7)``). Floor is not truncate (cast to int).
2013-12-03 12:55:12 +01:00
Philipp Rieber 6ea9d8f17d [Docs] Fix typos 2013-11-24 06:39:33 +01:00
Fabien Potencier f7c00d336f feature #1255 added the round filter (fabpot)
This PR was merged into the master branch.

Discussion
----------

added the round filter

fixes #1238

Commits
-------

ff4a7d2 added the round filter
2013-11-23 22:24:07 +01:00
Philipp Rieber a21df952ab [Docs] Some minor fixes: Typos, Notations 2013-11-23 21:51:26 +01:00
Fabien Potencier ff4a7d29ac added the round filter 2013-11-12 08:49:56 +01:00
Ralph KEMPS f9013d5546 fix typo 'in' operator
Fixed a small typo in the negative 'in' test operator
2013-11-06 10:39:15 +01:00
Tugdual Saunier 2b102e366b Fixed ZendServer specific DLL Path in install doc
It seems the \ need to be escaped in the tip section.

(see the file on github or the Twig website)
2013-11-03 20:10:18 +01:00
Fabien Potencier dff7d2c758 added a source function to include the content of a template without rendering it 2013-10-31 13:38:11 +01:00
Fabien Potencier 52c952c1a6 allowed tests to be made of 1 or 2 words 2013-10-27 19:31:19 +01:00
Fabien Potencier 932f7fcb75 removed whitespaces in docs 2013-10-26 08:34:09 +02:00
Fabien Potencier 25e7befa37 fixed CS in docs 2013-10-26 08:29:21 +02:00
Karl Horky 9b7322496e missing closing parenthesis 2013-10-17 10:00:32 +02:00
Steve Oliver 6c80601634 Update grammar of internals.rst
Some changes that I think help the docs read easier.
2013-10-03 22:15:48 -07:00
Fabien Potencier 74586e9f08 Revert "merged branch hason/macros (PR #1139)"
This reverts commit 03926034c4, reversing
changes made to 730aa25bed.

Conflicts:
	CHANGELOG
	doc/tags/macro.rst
	doc/templates.rst
	lib/Twig/ExpressionParser.php
2013-10-02 21:50:59 +02:00
Fabien Potencier 606f88b1bc feature #1209 added the starts with, ends with, and matches operators (fabpot)
This PR was merged into the master branch.

Discussion
----------

added the starts with, ends with, and matches operators

Adds three new operators:

 * `ends with`
 * `starts with`
 * `matches`

I've not added the `contains` operator as it would be equivalent with the existing `in` one.

TODO:

 * [x] add docs
 * [x] fix on PHP 5.2.

Commits
-------

b66181d added the starts with, ends with, and matches operators
2013-10-02 21:38:09 +02:00
Fabien Potencier b66181d1c5 added the starts with, ends with, and matches operators 2013-10-02 21:13:57 +02:00
Fabien Potencier c579a81414 minor #1203 Change wording of indentation coding standards (mdavis1982)
This PR was merged into the master branch.

Discussion
----------

Change wording of indentation coding standards

The documentation says to use indentation consistent with the main language of the **File**. But in a Twig template, that language is going to be Twig. This PR changes the wording to indicate that the indentation rules inside tags should be consistent with the main language of the **Project** Twig is being used within.

```
| Q             | A
| ------------- | ---
| Doc fix?      | yes
| New docs?     | no
| Applies to    | all
| Fixed tickets | none
```

Commits
-------

435e3b2 Update wording of the indentation coding standards documentation
09b58e1 Change wording of indentation coding standards
2013-10-02 07:57:25 +02:00
Nicolas Bastien fc1950d5a9 [Doc] corrects number_format argument namming 2013-09-29 16:14:18 +02:00
Fabien Potencier dd1ead2323 tweaked intro chapter 2013-09-28 10:52:29 +02:00
Fabien Potencier a0efdc988e simplified the intro doc page 2013-09-28 10:52:00 +02:00
Fabien Potencier 98aaffddcf minor#1202 Missing doc details for building C extension on windows (Matzz)
This PR was squashed before being merged into the master branch (closes #1202).

Discussion
----------

Missing doc details for building C extension on windows

Commits
-------

1a65132 Missing doc details for building C extension on windows
2013-09-27 22:04:22 +02:00
Mateusz Zakarczemny 1a65132f06 Missing doc details for building C extension on windows 2013-09-27 22:04:22 +02:00
Fabien Potencier f5da56ff68 feature#1189 added a way to add custom escaping strategies (fabpot)
This PR was merged into the master branch.

Discussion
----------

added a way to add custom escaping strategies

This adds the possibility to define custom escapers that can be used with the `escape` filter.

That would close #1178 and #1177, but I'm not sure that this is a good idea.

What do you think?

Commits
-------

55f8b27 added a way to add custom escaping strategies
2013-09-27 21:58:41 +02:00
Matthew Davis 435e3b2a85 Update wording of the indentation coding standards documentation 2013-09-27 16:32:11 +01:00
Matthew Davis 09b58e1423 Change wording of indentation coding standards 2013-09-27 15:57:10 +01:00
unkind c735d6de7a Add "cols" parameter to the textarea macro
Macro textarea depends on cols variable, but there is no way to pass it.
2013-09-17 11:34:02 +04:00
Fabien Potencier 55f8b27e12 added a way to add custom escaping strategies 2013-09-11 20:26:15 +02:00
Fabien Potencier 1600817425 fixed markup 2013-09-06 12:25:58 +02:00
Tugdual Saunier 12500b3e1f Added doc for building C extension on windows 2013-09-06 12:05:05 +02:00
Tugdual Saunier a53c467e66 Removed link to pre-build DLL for windows as they are outdated 2013-09-06 11:34:45 +02:00
Peter Kokot d8346d49e7 Vim integration updated with alternative, Jinja for Vim link updated to the latest 2013-09-04 16:57:27 +02:00
Fabien Potencier b5516cadf6 fixed CS 2013-09-04 08:20:08 +02:00