geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-11 18:06:46 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,896 Commits 9 Branches 273 Tags
468f5cbe21e3fdcd5a351e615c28bf549dbe4dcc
Commit Graph

4896 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabien Potencier 468f5cbe21 Merge branch '1.x' into 2.x 
* 1.x:
  Add support for exponential numbers
  Fix phpdoc
 2019-11-07 22:14:26 +01:00
Fabien Potencier 8f9c0b3267 feature #3182 Add support for exponential numbers (fabpot) 
This PR was merged into the 1.x branch.

Discussion
----------

Add support for exponential numbers

Commits
-------

60921350 Add support for exponential numbers
 2019-11-07 22:14:12 +01:00
Fabien Potencier d073fed7f1 minor #3183 Allow Symfony 5 (nicolas-grekas) 
This PR was merged into the 2.x branch.

Discussion
----------

Allow Symfony 5

Commits
-------

4ab02e3e Allow Symfony 5
 2019-10-23 17:56:47 +02:00
Nicolas Grekas 4ab02e3e9f Allow Symfony 5 2019-10-23 17:53:29 +02:00
Fabien Potencier 6092135057 Add support for exponential numbers 2019-10-22 17:32:36 +02:00
Fabien Potencier d86b8ea580 minor #3180 Fix small typo (kevin-verschaeve) 
This PR was merged into the 2.x branch.

Discussion
----------

Fix small typo

Commits
-------

d48aceb8 Fix small typo
 2019-10-17 13:01:59 +02:00
Kevin Verschaeve d48aceb870 Fix small typo 2019-10-17 11:30:47 +02:00
Fabien Potencier e657c11599 Bump version to 2.12.2-DEV 2019-10-17 09:37:40 +02:00
Fabien Potencier ddd4134af9 Prepare the 2.12.1 release v2.12.1 2019-10-17 09:34:53 +02:00
Fabien Potencier 2024406e8e Fix phpdoc 2019-10-17 09:32:17 +02:00
Fabien Potencier e07296fbaa Merge branch '1.x' into 2.x 
* 1.x:
  Add .gitattributes
 2019-10-17 09:30:01 +02:00
Fabien Potencier e05aa6a489 Add .gitattributes 2019-10-17 09:29:33 +02:00
Fabien Potencier 5750a13b40 Add missing .gitattributes for string-extra 2019-10-17 09:28:42 +02:00
Fabien Potencier 38adb199ea minor #3153 Update .gitattributes to remove tests from "dist" (barryvdh) 
This PR was squashed before being merged into the 2.x branch (closes #3153).

Discussion
----------

Update .gitattributes to remove tests from "dist"

This was proposed many times before, but considering https://github.com/symfony/symfony/pull/33579 is now merged, I propose this again. I refer to that issue as for the reasoning, as it applies here also.

I did not add the `docs` directory as there was much discussion about that before (discussion in  #942)

Related: #942 #1776 #1981 #2292 #2799 2905

Commits
-------

5cde1f50 Update .gitattributes to remove tests from \"dist\"
 2019-10-17 09:27:12 +02:00
Barry vd. Heuvel 5cde1f50bb Update .gitattributes to remove tests from \"dist\" 2019-10-17 09:27:07 +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 5bda1f1eff bug #3179 Add string extra in the bundle (fabpot) 
This PR was merged into the 2.x branch.

Discussion
----------

Add string extra in the bundle

Commits
-------

069fd6db Add string extra in the bundle
 2019-10-17 09:16:43 +02:00
Fabien Potencier 069fd6db49 Add string extra in the bundle 2019-10-17 09:13:47 +02:00
Fabien Potencier 94cc1fda80 feature #3178 Add twig/string-extra extension (nicolas-grekas, fabpot) 
This PR was merged into the 2.x branch.

Discussion
----------

Add twig/string-extra extension

Last step before deprecating https://github.com/twigphp/Twig-extensions entirely.

Commits
-------

00e0b531 Add missing docs
e300e379 Add twig/string-extra extension
 2019-10-17 08:55:29 +02:00
Fabien Potencier 00e0b53100 Add missing docs 2019-10-17 08:49:30 +02:00
Nicolas Grekas e300e37940 Add twig/string-extra extension 2019-10-16 19:46:20 +02:00
Fabien Potencier c59567371a minor #3175 Update documentation for inky_to_html (tucksaun) 
This PR was merged into the 2.x branch.

Discussion
----------

Update documentation for `inky_to_html`

Commits
-------

ae50257d Update documentation for inky_to_html
 2019-10-16 10:31:29 +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 23419a9408 Bump version to 2.12.1-DEV 2019-10-05 18:44:39 +02:00
Fabien Potencier c7a85fd083 Prepare the 2.12.0 release v2.12.0 2019-10-05 18:42:38 +02:00
Fabien Potencier 231a365471 Update CHANGELOG 2019-10-05 18:41:19 +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
Fabien Potencier 8909a16264 minor #3163 Fix issue #3159 (ericmorand) 
This PR was submitted for the 2.x branch but it was merged into the 1.x branch instead (closes #3163).

Discussion
----------

Fix issue #3159

Commits
-------

cfac11e9 Fix issue #3159
 2019-10-01 12:18:05 +02:00
Eric MORAND cfac11e98a Fix issue #3159 2019-10-01 12:18:00 +02:00
Fabien Potencier 0d2b2aabf6 minor #3164 Fix issue #3160 (ericmorand) 
This PR was submitted for the 2.x branch but it was merged into the 1.x branch instead (closes #3164).

Discussion
----------

Fix issue #3160

Commits
-------

4eb40f2f Fix issue #3160
 2019-10-01 12:13:33 +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
Fabien Potencier c2fd9990fc Merge branch '1.x' into 2.x 
* 1.x:
  Optimize block('foo') ?? 'bar'
  bumped version to 1.42.4-DEV
  prepared the 1.42.3 release
  updated  ChANGELOG
 2019-09-20 14:53:54 +02:00
Fabien Potencier 4d766ec17b bug #3155 Optimize block('foo') ?? 'bar' (fabpot) 
This PR was merged into the 1.x branch.

Discussion
----------

Optimize block('foo') ?? 'bar'

closes #3154

Commits
-------

7a99a4e7 Optimize block('foo') ?? 'bar'
 2019-09-20 14:45:25 +02:00
Fabien Potencier 7a99a4e7e5 Optimize block('foo') ?? 'bar' 2019-09-20 12:40:56 +02:00
Fabien Potencier d83802c011 Bump min version for pinky 2019-09-17 08:08:14 +02:00
Fabien Potencier ada3096c0b minor #3150 fix variable name (galdiolo) 
This PR was merged into the 2.x branch.

Discussion
----------

fix variable name

Commits
-------

2cb5387e fix variable name
 2019-09-15 10:34:00 +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 1fcf9143e2 feature #3148 Rename inky to inky_to_html (fabpot) 
This PR was merged into the 2.x branch.

Discussion
----------

Rename inky to inky_to_html

closes #3142

Commits
-------

9f9a2088 Renamed inky to inky_to_html
 2019-09-07 09:25:39 +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
Fabien Potencier 2a9fa7ba93 minor #3147 Minor fix in a filter description (javiereguiluz) 
This PR was merged into the 2.x branch.

Discussion
----------

Minor fix in a filter description

Commits
-------

890d507f Minor fix in a filter description
 2019-09-07 08:25:43 +02:00
Javier Eguiluz 890d507ff1 Minor fix in a filter description 2019-09-06 19:55:25 +02:00
Fabien Potencier 18f56ad9b2 minor #3146 Minor fixes in the docs of some intl filters (javiereguiluz) 
This PR was merged into the 2.x branch.

Discussion
----------

Minor fixes in the docs of some intl filters

I'll do another PR to fix https://github.com/twigphp/intl-extra/README.md

Commits
-------

b9abb294 Minor fixes in the docs of some intl filters
 2019-09-06 17:38:53 +02:00
Javier Eguiluz b9abb294ab Minor fixes in the docs of some intl filters 2019-09-06 17:34:43 +02:00
Fabien Potencier 144c557bb1 bumped version to 1.42.4-DEV 2019-08-24 14:51:38 +02:00