geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-25 01:29:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,759 Commits 16 Branches 274 Tags
7cf279d3d64e12a7d6b2ab4fa8f4a3e7176fd41d
Commit Graph

22 Commits

Author SHA1 Message Date
Nicolas Grekas 1e53d27a37 Merge branch '2.x' into 3.x 
* 2.x:
  Allow Symfony 6
 2021-05-20 16:28:34 +02:00
Nicolas Grekas ea5de7e626 Allow Symfony 6 2021-05-20 16:22:31 +02:00
Fabien Potencier cb88e0a68c Merge branch '2.x' into 3.x 
* 2.x:
  Move things around
 2021-01-01 15:58:18 +01:00
Fabien Potencier 1868918724 Move things around 2021-01-01 15:53:48 +01:00
Fabien Potencier 351a97ed15 Fix Composer version 2021-01-01 10:05:00 +01:00
Fabien Potencier dae3868f04 Fix Composer version 2021-01-01 10:02:52 +01:00
Nicolas Grekas 3aa40a42b3 Merge branch '2.x' into 3.x 
* 2.x:
  Try running all tests on nightly
  Minor fixes
  Fix Travis config
 2020-05-21 11:56:39 +02:00
Nicolas Grekas 4e0008cd82 Try running all tests on nightly 2020-05-21 11:54:27 +02:00
Fabien Potencier 090a7d86a7 Merge branch '2.x' into 3.x 
* 2.x:
  Fix extra package deps
 2020-05-21 08:01:55 +02:00
Fabien Potencier 74f3ffe4b6 Fix extra package deps 2020-05-21 08:01:43 +02:00
Fabien Potencier d57e50d778 Merge branch '2.x' into 3.x 
* 2.x:
  Allow dev versions
  Allow PHP 8 for extra packages
  Fix Travis
  Bump version to 2.13
  Fix integration tests
  Fix PHP 8 compat
  Install the phpunit-bridge with PHP 7.4 when testing nightly
  Add PHP 8 / nightly in Travis matrix
  Drop support for PHP 7.0
 2020-05-19 15:23:33 +02:00
Fabien Potencier 9270d3e0e0 Allow dev versions 2020-05-19 15:17:30 +02:00
Fabien Potencier 2d58a54b4a Allow PHP 8 for extra packages 2020-05-19 15:12:25 +02:00
Fabien Potencier e5ae15e7de Merge branch '2.x' into 3.x 
* 2.x:
  support Sf5
  Fix constraints
  Update doc with new escaping behavior
  Remove obsolete page
  language typo
  Add missing suggestions in Twig Extra Bundle
 2019-12-28 08:09:27 +01:00
Fabien Potencier 7f75a23f85 minor #3230 Fix constraints (fabpot) 
This PR was merged into the 2.x branch.

Discussion
----------

Fix constraints

Commits
-------

966fa451 Fix constraints
 2019-12-27 08:37:45 +01:00
Axel Guckelsberger d735a43e4e support Sf5 2019-12-27 08:36:07 +01:00
Fabien Potencier 966fa45126 Fix constraints 2019-12-27 08:33:44 +01: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 9dc85f5e0c moved mime to req 2019-08-11 19:49:57 +02:00
Fabien Potencier 4d34327368 fixed versions of extra exts 2019-08-10 16:56:24 +02:00
Fabien Potencier f8c0c76f46 fixed package name 2019-08-10 11:23:15 +02:00
Fabien Potencier 5cc40a06f1 fixed HTML extension 2019-08-10 11:07:38 +02:00