geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-08-30 20:16:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,808 Commits 9 Branches 273 Tags
e5a146fd8c889ffdde46a9634352afc8e77354f8
Commit Graph

22 Commits

Author SHA1 Message Date
Fabien Potencier e5a146fd8c This reverts commit 7389f48a1f. 2022-01-03 11:41:54 +01:00
Fabien Potencier e3eb9fcc42 Merge branch '2.x' into 3.x 
* 2.x:
  Update CHANGELOG
  Add compat with PHP 7.1 back
 2022-01-03 11:40:21 +01:00
Fabien Potencier 7389f48a1f Add compat with PHP 7.1 back 2022-01-03 11:35:05 +01:00
Fabien Potencier ec23eba2ad Merge branch '2.x' into 3.x 
* 2.x:
  Add 8.1 in tests
  Allow null when Twig expects a string
 2022-01-02 17:23:10 +01:00
Fabien Potencier 3deeb0b2c0 Add 8.1 in tests 2022-01-02 16:26:34 +01:00
Fabien Potencier 4e479f140e Merge branch '2.x' into 3.x 
* 2.x:
  Move Drupal test file to tests/
  fix file permissions
  Bump version
  Prepare the 2.14.6 release
  Bump version
  Prepare the 1.44.4 release
 2021-05-18 13:11:52 +02:00
Fabien Potencier 66fa6d37f7 Merge branch '1.x' into 2.x 
* 1.x:
  Move Drupal test file to tests/
  fix file permissions
  Bump version
  Prepare the 1.44.4 release
 2021-05-18 13:10:20 +02:00
Fabien Potencier 2fa8bce914 Move Drupal test file to tests/ 2021-05-18 13:09:01 +02:00
Fabien Potencier 94b7c1c2f6 Merge branch '2.x' into 3.x 
* 2.x:
  Fix CS
  added PHP 8.1 as experimental
 2021-03-22 09:23:56 +01:00
Fabien Potencier 0b103dfeb0 Merge branch '1.x' into 2.x 
* 1.x:
  added PHP 8.1 as experimental
 2021-03-22 09:23:06 +01:00
Oleg Andreyev bef89dcc1e added PHP 8.1 as experimental 2021-03-22 09:19:53 +01:00
Fabien Potencier 4d036a9148 Add a cache tag 2021-01-05 10:59:10 +01:00
Fabien Potencier b0afeb512e Merge branch '2.x' into 3.x 
* 2.x:
  Move Extra Bundle config from XML to PHP
  bump license year
 2021-01-01 15:33:39 +01:00
Fabien Potencier b9712ce137 Move Extra Bundle config from XML to PHP 2021-01-01 15:29:30 +01:00
Fabien Potencier e7a4b69e95 minor #3417 Enhancement: Introduce DOCtor-RST config + GithubAction (OskarStark) 
This PR was squashed before being merged into the 3.x branch.

Discussion
----------

Enhancement: Introduce DOCtor-RST config + GithubAction

Commits
-------

8ac8cb71 Enhancement: Introduce DOCtor-RST config + GithubAction
 2020-11-06 08:11:00 +01:00
Oskar Stark 8ac8cb719a Enhancement: Introduce DOCtor-RST config + GithubAction 2020-11-06 08:10:54 +01:00
Oskar Stark 8ac1f822ac Enhancement: Use GithubActions instead of Travis for tests 2020-11-05 20:12:42 +01:00
Fabien Potencier 9d3963d059 Fix branch in tests 2020-11-05 18:38:53 +01:00
Oskar Stark fdafd40626 Enhancement: Use GithubActions instead of Travis for tests 2020-11-05 14:17:52 +01:00
Fabien Potencier 960e3e1fa3 minor #3430 Enhancement: Introduce DOCtor-RST config + Sphinx build + GithubActions (OskarStark) 
This PR was squashed before being merged into the 1.x branch.

Discussion
----------

Enhancement: Introduce DOCtor-RST config + Sphinx build + GithubActions

Commits
-------

c9328ad6 Enhancement: Introduce DOCtor-RST config + Sphinx build + GithubActions
 2020-11-05 13:09:12 +01:00
Oskar Stark c9328ad613 Enhancement: Introduce DOCtor-RST config + Sphinx build + GithubActions 2020-11-05 13:09:07 +01:00
Oskar Stark 4438d4c1bb Enhancement: Use GithubActions instead of Travis for tests 2020-11-05 13:04:03 +01:00