Commit Graph

293 Commits

Author SHA1 Message Date
Fabien Potencier 8599981de8 Merge branch '2.x' into 3.x
* 2.x:
  Bump min version for pinky
  fix variable name
2019-09-17 08:08:20 +02:00
Fabien Potencier d83802c011 Bump min version for pinky 2019-09-17 08:08:14 +02:00
Fabien Potencier ab735c7a1d Merge branch '2.x' into 3.x
* 2.x:
  Move country_timezone to a function
  Renamed inky to inky_to_html
  Minor fix in a filter description
  Minor fixes in the docs of some intl filters
2019-09-07 14:46:43 +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 890d507ff1 Minor fix in a filter description 2019-09-06 19:55:25 +02:00
Fabien Potencier e5b29ee1f7 Merge branch '2.x' into 3.x
* 2.x:
  cleaned up the code
  Fix intl-extra docs and links
  removed unneeded condition
  moved mime to req
2019-08-12 09:27:28 +02:00
Fabien Potencier 163f6a0979 minor #3126 Clean up the code (fabpot)
This PR was merged into the 2.x branch.

Discussion
----------

Clean up the code

Commits
-------

ba8f7a5e cleaned up the code
2019-08-12 09:26:54 +02:00
Fabien Potencier ba8f7a5e4c cleaned up the code 2019-08-12 09:23:06 +02:00
Pierre du Plessis 6f73ac72de Fix intl-extra docs and links 2019-08-12 09:17:28 +02:00
Fabien Potencier cf444dde71 removed unneeded condition 2019-08-12 08:43:14 +02:00
Fabien Potencier 9dc85f5e0c moved mime to req 2019-08-11 19:49:57 +02:00
Fabien Potencier 635504c988 Merge branch '2.x' into 3.x
* 2.x:
  fixed code
  updated CHANGELOG
2019-08-11 12:37:18 +02:00
Fabien Potencier d937ff1f91 fixed code 2019-08-11 12:37:10 +02:00
Fabien Potencier d706fc259d Merge branch '2.x' into 3.x
* 2.x:
  added the cssinliner and inky extensions
  tweaked doc
2019-08-11 12:21:19 +02:00
Fabien Potencier 37ed0436dd added the cssinliner and inky extensions 2019-08-11 12:14:28 +02:00
Fabien Potencier 4d34327368 fixed versions of extra exts 2019-08-10 16:56:24 +02:00
Fabien Potencier 5b1f41b855 Merge branch '2.x' into 3.x
* 2.x:
  fixed markup in docs
  fixed markup in docs
  fixed typo
  fixed CS
  fixed typo
2019-08-10 16:16:55 +02:00
Fabien Potencier d3ee0f7479 fixed typo 2019-08-10 16:12:34 +02:00
Fabien Potencier b41eb45c3b fixed typo 2019-08-10 16:08:18 +02:00
Fabien Potencier fdf44d29d8 Merge branch '2.x' into 3.x
* 2.x:
  added the Intl extension
2019-08-10 16:03:35 +02:00
Fabien Potencier 03d93aace8 added the Intl extension 2019-08-10 15:59:48 +02:00
Fabien Potencier c4279abb1f Merge branch '2.x' into 3.x
* 2.x:
  disabled some tests that are not compatible with pHp 7.4 yet
  fixed typos
2019-08-10 15:49:59 +02:00
Fabien Potencier 7fedcba568 disabled some tests that are not compatible with pHp 7.4 yet 2019-08-10 15:48:29 +02:00
Fabien Potencier 6b9c3aeacd Merge branch '2.x' into 3.x
* 2.x:
  fixed wrong class usage
  made a class final
  added suggestions for extra extensions
  fixed path
  added missing dep
  fixed Travis config
  fixed config/ directory in extra bundle
  Revamping bundle structure to not mix source code with config files
  Fix PHPDoc of twig_get_attribute()
2019-08-10 14:59:35 +02:00
Fabien Potencier f3355fe878 fixed wrong class usage 2019-08-10 14:59:27 +02:00
Fabien Potencier 51242d807f made a class final 2019-08-10 14:48:51 +02:00
Fabien Potencier 908eef05de added suggestions for extra extensions 2019-08-10 14:29:58 +02:00
Fabien Potencier 879d1b1e76 fixed path 2019-08-10 14:29:31 +02:00
Fabien Potencier a8ccf22d4b added missing dep 2019-08-10 14:21:21 +02:00
Fabien Potencier 2658b4a390 fixed config/ directory in extra bundle 2019-08-10 14:18:25 +02:00
Yonel Ceruto f24f057a15 Revamping bundle structure to not mix source code with config files 2019-08-10 08:00:43 -04:00
Fabien Potencier f8d0cb73f6 Merge branch '2.x' into 3.x
* 2.x:
  fixed composer.json
2019-08-10 11:55:29 +02:00
Fabien Potencier 33fbbe5097 fixed composer.json 2019-08-10 11:50:28 +02:00
Fabien Potencier c3a6f3cf31 Merge branch '2.x' into 3.x
* 2.x:
  added the Markdown extension
2019-08-10 11:31:32 +02:00
Fabien Potencier 741ea46e02 added the Markdown extension 2019-08-10 11:29:35 +02:00
Fabien Potencier 32ef272559 Merge branch '2.x' into 3.x
* 2.x:
  fixed package name
2019-08-10 11:25:12 +02:00
Fabien Potencier f8c0c76f46 fixed package name 2019-08-10 11:23:15 +02:00
Fabien Potencier 6d14d9c9db Merge branch '2.x' into 3.x
* 2.x:
  fixed HTML extension
2019-08-10 11:13:02 +02:00
Fabien Potencier 5cc40a06f1 fixed HTML extension 2019-08-10 11:07:38 +02:00
Fabien Potencier 41ab8b9699 Merge branch '2.x' into 3.x
* 2.x:
  moved the HTML extension to an external Composer package
2019-08-10 07:48:25 +02:00
Fabien Potencier 59bb9d1033 moved the HTML extension to an external Composer package 2019-08-08 18:10:45 +02:00