Commit Graph

1071 Commits

Author SHA1 Message Date
Fabien Potencier de4e46e77e Merge branch '1.x' into 2.x
* 1.x:
  Update api.rst
  Fix typo
  Fix CI on PHP5
2020-04-24 08:31:39 +02:00
Yohann Durand abe625a1a1 Update api.rst 2020-04-24 08:25:17 +02:00
Pierre Grimaud 0273057622 Fix typos 2020-04-24 08:22:30 +02:00
Fabien Potencier 0190450d97 Fix typo 2020-03-30 13:39:48 +02:00
SpacePossum 628fde13ba [docs] CoreExtension::setEscaper is deprecated 2020-03-30 12:14:13 +02:00
XenoX 6df2e2c318 Remove extra Mardown word in classname 2020-03-27 17:41:01 +01:00
Fabien Potencier 27af7d9cd1 Merge branch '1.x' into 2.x
* 1.x:
  fix node class namespace
2020-03-24 13:35:30 +01:00
Christian Flothmann 06ff4bdf9a fix node class namespace 2020-03-24 12:12:57 +01:00
Fabien Potencier bf64959fb8 Merge branch '1.x' into 2.x
* 1.x:
  Tweaking phpdoc above Environment
  Identity Equals - Best practices
  Update default.rst
2020-03-17 15:09:30 +01:00
Nicolas Sauveur 9ff9a4d3c0 Update default.rst
Add warning for potentially confusing behaviour and alternative solution.
2020-02-26 13:13:20 +01:00
Fabien Potencier 10e5015411 Merge branch '1.x' into 2.x
* 1.x:
  Fix format of the CHANGELOG
  Update advanced.rst
2020-02-14 16:15:19 +01:00
Abdouni Abdelkarim e030bf6e38 Update advanced.rst
Hello,

I just updated the class name 😉
2020-02-13 13:50:04 +01:00
Fabien Potencier e52bcf67cf Merge branch '1.x' into 2.x
* 1.x:
  Syntax error in doc
2020-01-13 09:20:25 +01:00
JakeFr fbfac78fbd Syntax error in doc
This code sample in advanced.rst is not highlighted in php because the second semicolon is missing
2020-01-13 08:58:15 +01:00
fancyweb 6b25dccf33 Fix versionadded in doc 2020-01-11 12:21:32 +01:00
Fabien Potencier e770b80203 minor #3235 Minor fixes in docs (l-vo)
This PR was squashed before being merged into the 2.x branch (closes #3235).

Discussion
----------

Minor fixes in docs

Commits
-------

59243e8c Minor fixes in docs
2020-01-03 20:00:30 +01:00
Laurent VOULLEMIER 59243e8ce3 Minor fixes in docs 2020-01-03 20:00:22 +01:00
Fabien Potencier e74a51ecb1 Merge branch '1.x' into 2.x
* 1.x:
  Update doc with new escaping behavior
  Remove obsolete page
  language typo
2019-12-28 08:09:20 +01:00
Laurent VOULLEMIER 92e1cd35c5 Update doc with new escaping behavior
When applied on ternary statements
2019-12-27 08:28:48 +01:00
feldenla 8b8cfb0f4e language typo 2019-12-20 13:13:08 +01:00
Fabien Potencier 46e232b37c Merge branch '1.x' into 2.x
* 1.x:
  Add missing link in docs
  Correct return type of twig_date_converter
2019-12-09 17:39:17 +01:00
Fabien Potencier 335dcad4b0 Add missing link in docs 2019-12-09 17:35:58 +01:00
Fabien Potencier aecce3d92e Merge branch '1.x' into 2.x
* 1.x:
  Remove mention of the obsolete twig-extensions repository
  Remove usage of the old Autoloader class in the docs
2019-11-18 18:29:44 +01:00
Fabien Potencier 7f48a181cd Remove mention of the obsolete twig-extensions repository 2019-11-18 18:27:43 +01:00
Fabien Potencier 240e967c61 Remove usage of the old Autoloader class in the docs 2019-11-15 16:44:44 +01:00
Fabien Potencier 208b745286 Fix docs 2019-11-15 13:40:08 +01:00
Fabien Potencier 69030c7fb5 Fixed doc markup 2019-11-15 13:37:35 +01:00
Kevin Verschaeve d48aceb870 Fix small typo 2019-10-17 11:30:47 +02:00
Fabien Potencier 8fc2999a40 Fix CS 2019-10-17 09:25:45 +02:00
Fabien Potencier a7057700ec minor #3170 doc: number_format add math calculation hint (gimler)
This PR was merged into the 2.x branch.

Discussion
----------

doc: number_format add math calculation hint

Add hint about number_format and math calculation

Commits
-------

954ab4b8 doc: number_format add math calculation hint
2019-10-17 09:25:09 +02:00
Fabien Potencier 00e0b53100 Add missing docs 2019-10-17 08:49:30 +02:00
Tugdual Saunier ae50257dd0 Update documentation for inky_to_html 2019-10-16 10:29:01 +02:00
Gordon Franke 954ab4b8e3 doc: number_format add math calculation hint 2019-10-13 13:36:48 +02:00
Fabien Potencier 4625774716 feature #3157 Twig 2 is compatible with PHP 7.0 (nicolas-grekas)
This PR was merged into the 2.x branch.

Discussion
----------

Twig 2 is compatible with PHP 7.0

7.1 was needed for #3102, but this is not the case anymore since #3113

Commits
-------

b845ed96 Twig 2 is compatible with PHP 7.0
2019-10-01 12:31:38 +02:00
Fabien Potencier f8c5f86761 Merge branch '1.x' into 2.x
* 1.x:
  Fix issue #3159
  Fix issue #3160
2019-10-01 12:18:48 +02:00
Eric MORAND cfac11e98a Fix issue #3159 2019-10-01 12:18:00 +02:00
Eric MORAND 4eb40f2fc8 Fix issue #3160 2019-10-01 12:13:28 +02:00
Nicolas Grekas b845ed969e Twig 2 is compatible with PHP 7.0 2019-09-20 15:13:40 +02:00
Claudio Galdiolo 2cb5387e75 fix variable name 2019-09-14 13:04:38 +02:00
Fabien Potencier ac72085e78 feature #3149 Move country_timezone to a function (fabpot)
This PR was merged into the 2.x branch.

Discussion
----------

Move country_timezone to a function

Commits
-------

c046e69e Move country_timezone to a function
2019-09-07 09:26:32 +02:00
Fabien Potencier c046e69e67 Move country_timezone to a function 2019-09-07 08:58:31 +02:00
Fabien Potencier 9f9a2088a7 Renamed inky to inky_to_html 2019-09-07 08:57:51 +02:00
Javier Eguiluz b9abb294ab Minor fixes in the docs of some intl filters 2019-09-06 17:34:43 +02:00
Fabien Potencier f5950a5b1f added the spaceship operator 2019-08-20 10:30:06 +02:00
Fabien Potencier 330024b67e added support for an "arrow" function on the "sort" filter 2019-08-20 10:18:43 +02:00
Pierre du Plessis 6f73ac72de Fix intl-extra docs and links 2019-08-12 09:17:28 +02:00
Fabien Potencier 21f5b49e43 feature #3122 Add the cssinliner and inky extensions (fabpot)
This PR was merged into the 2.x branch.

Discussion
----------

Add the cssinliner and inky extensions

Commits
-------

37ed0436 added the cssinliner and inky extensions
2019-08-11 12:20:08 +02:00
Fabien Potencier 37ed0436dd added the cssinliner and inky extensions 2019-08-11 12:14:28 +02:00
Fabien Potencier 499a6eeb13 tweaked doc 2019-08-11 11:46:30 +02:00
Fabien Potencier 5168c0e2fe fixed markup in docs 2019-08-10 16:16:47 +02:00