geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-15 20:06:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,094 Commits 10 Branches 273 Tags
76283cc37b73aae1da596ffcc2caceb95c42423d
Commit Graph

529 Commits

Author SHA1 Message Date
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
Uplink03 744ad32ceb Clarify what the "date" filter takes as parameter 
Clarify what the "date" filter takes as parameter.

I went through Twig/Extension/Core.php to figure what's happening. I haven't verified that I'm actually correct, but it looks like I am.
 2013-09-03 16:25:30 +01:00
Fabien Potencier 3db6b6aeb9 fixed markup 2013-08-28 08:01:53 +02:00
Katherine Senzee bd1cb91251 grammar and punctuation fixes 2013-08-27 15:48:13 -07:00
oktron 8d93a1e454 Add missing apostrophe 2013-08-07 11:02:14 +02:00
Fabien Potencier 7b80c942e2 removed usage of deprecated constants 2013-08-05 18:25:53 +02:00
Fabien Potencier 8b576e08f2 fixed versions in docs 2013-08-04 13:34:56 +02:00
Fabien Potencier 0559cacfaf tweaked documentation about overloading existing filters, ... (closes #1094) 2013-08-04 08:56:55 +02:00
Fabien Potencier 6c5f966045 added a note about how to use our PEAR channel to install the Twig C extension 2013-08-03 19:28:06 +02:00
Martin Hasoň 3004ba19d4 Added support for directly call macros defined in the same template 2013-07-29 23:14:04 +02:00
Martin Hasoň 63615a6cc3 Added support for named arguments for macros 2013-07-29 23:13:25 +02:00
Fabien Potencier 3e6e70e228 fixed a typo in the docs (closes #1136) 2013-07-13 21:17:34 +02:00
Fabien Potencier e142fcad9a fixed a typo in the docs (closes #1137) 2013-07-13 21:15:14 +02:00
Mark Story da06f59033 Add more complete documentation for building tests. 2013-07-05 13:12:07 -04:00
Fabien Potencier 4299df571b tweaked previous merge (refs #1114) 2013-06-27 08:19:57 +02:00
Fabien Potencier ca54a9f325 merged branch LouTerrailloune/patch-2 (PR #1114) 
This PR was merged into the master branch.

Discussion
----------

Update url_encode.rst

Documented hidden feature to use rawurlencode.

Commits
-------

594e2db Update url_encode.rst
 2013-06-27 08:19:31 +02:00
Matt Janssen 2861befc42 Updated {% spaceless %} example to show how spaces in strings are handled. 
Updated output to show space is preserved within `<div><strong>foo bar</strong></div>` HTML.
 2013-06-26 14:20:02 -05:00
Igor Santos fb3fdac64f Update include.rst 
Fixing typo: "Twig will ignore the statement if the template to be *ignored* does not exist."
 2013-06-08 17:56:44 -03:00
Vincent Terraillon 594e2db830 Update url_encode.rst 
Documented hidden feature to use rawurlencode.
 2013-06-07 11:55:43 +03:00
Martin Hasoň 3c6362697c Fixed typo in doc for the reverse filter 2013-06-06 22:55:44 +02:00
Fabien Potencier 11d2079104 added documentation for the preverse_keys argument of the reverse filter (closes #1112) 2013-06-06 07:56:57 +02:00
Fabien Potencier e8be092e18 merged branch luiges90/patch-1 (PR #1107) 
This PR was merged into the master branch.

Discussion
----------

Update slice.rst

I was (somehow) misled by the example, thinking `'1234'[2:]` outputs `34` because it `2:` mean copy the last 2 characters...

This happens when you are in a hurry and didn't look into the text.

Let makes it less ambiguous.

Commits
-------

3ddff67 Update slice.rst
 2013-05-29 09:19:45 +02:00
Johnny Robeson 5746c11153 change mention of print to sprintf in format filter 
The format specifiers are actually mentioned on the [sprintf(http://php.net/sprintf)] page
 2013-05-29 04:15:52 -03:00
Peter WONG 3ddff676f8 Update slice.rst 
I was (somehow) misled by the example, thinking `'1234'[2:]` outputs `34` because it `2:` mean copy the last 2 characters...

This happens when you are in a hurry and didn't look into the text.

Let makes it less ambiguous.
 2013-05-29 11:18:36 +08:00
Fabien Potencier fd9643071c fixed doc markup (closes #1106) 2013-05-27 08:04:18 +02:00
Fabien Potencier b081e3f1ed tweaked previous merge (refs #1103) 2013-05-25 17:56:42 +02:00
Fabien Potencier 6726e60155 merged branch kimu/patch-1 (PR #1103) 
This PR was squashed before being merged into the master branch (closes #1103).

Discussion
----------

Added info about variable declarations inside a loop

Commits
-------

d5f4ec3 Added info about variable declarations inside a loop
 2013-05-25 17:52:49 +02:00
kimu d5f4ec309b Added info about variable declarations inside a loop 2013-05-25 17:52:49 +02:00
DieterDePaepe 550503ec2d Add missing semicolon 2013-05-25 14:42:31 +02:00
Fabien Potencier 6939565867 added support for object instances as the second argument of the constant test (closes #1100) 2013-05-23 18:28:53 +02:00
Simon Constans e9c197967f fix documentation code block 2013-05-13 22:34:50 +02:00
Bilal Amarni 12a5d026ed [doc] switched a BC call 2013-05-13 13:14:39 +02:00