33a9f2eae3
bug #3464 Fix compat with older Symfony versions (fabpot)
...
This PR was merged into the 2.x branch.
Discussion
----------
Fix compat with older Symfony versions
Commits
-------
f4e14292
2021-01-05 16:23:26 +01:00
f4e1429227
Fix compat with older Symfony versions
2021-01-05 16:21:23 +01:00
393c9086ff
Prepare the 2.14.2 release
2021-01-05 11:26:31 +01:00
3d9c908c84
Merge branch '1.x' into 2.x
...
* 1.x:
Bump version to ${NEXT_VERSION}-DEV
Prepare the 1.44.2 release
Update CHANGELOG
2021-01-05 11:11:45 +01:00
31adc5e157
Bump version to ${NEXT_VERSION}-DEV
2021-01-05 11:10:47 +01:00
138c493c5b
Prepare the 1.44.2 release
2021-01-05 11:10:05 +01:00
c04c68f2d3
Update CHANGELOG
2021-01-05 11:09:30 +01:00
846ebbd7c8
minor #3461 Move things around (fabpot)
...
This PR was merged into the 2.x branch.
Discussion
----------
Move things around
Commits
-------
18689187
2021-01-01 15:57:43 +01:00
1868918724
Move things around
2021-01-01 15:53:48 +01:00
7314edbb8a
minor #3460 Move Extra Bundle config from XML to PHP (fabpot)
...
This PR was merged into the 2.x branch.
Discussion
----------
Move Extra Bundle config from XML to PHP
Commits
-------
b9712ce1
2021-01-01 15:33:06 +01:00
b9712ce137
Move Extra Bundle config from XML to PHP
2021-01-01 15:29:30 +01:00
7fab4be1bb
minor #3457 bump license year (abdounikarim)
...
This PR was submitted for the 3.x branch but it was merged into the 2.x branch instead.
Discussion
----------
bump license year
Hello,
I updated licenses year to 2021.
Commits
-------
bed8f31b
2021-01-01 10:21:08 +01:00
bed8f31b96
bump license year
2021-01-01 10:21:03 +01:00
dae3868f04
Fix Composer version
2021-01-01 10:02:52 +01:00
39991a167c
Remove some PHP in docs
2020-12-30 09:23:51 +01:00
8eb855ffb6
Bump version
2020-12-30 09:17:29 +01:00
9fd55773e3
Merge branch '1.x' into 2.x
...
* 1.x:
Bump copyright year
2020-12-30 09:16:23 +01:00
d6cbc70064
Bump copyright year
2020-12-30 09:16:13 +01:00
c5379903e5
Merge branch '1.x' into 2.x
...
* 1.x:
Fix typo
Typo
2020-11-27 14:05:37 +01:00
2f0947e1af
Fix typo
2020-11-27 14:05:10 +01:00
0feba1ade4
minor #3442 Typo (OlafvdSpek)
...
This PR was submitted for the 3.x branch but it was merged into the 1.x branch instead.
Discussion
----------
Typo
Commits
-------
43f382ba
2020-11-27 14:04:49 +01:00
43f382ba1b
Typo
2020-11-27 14:04:41 +01:00
e133d1fd8c
minor #3440 Fix include documentation - change filter tag to apply (tkm)
...
This PR was submitted for the 3.x branch but it was merged into the 2.x branch instead.
Discussion
----------
Fix include documentation - change filter tag to apply
Fixes #3438
Commits
-------
752bcc7b
2020-11-09 14:33:24 +01:00
752bcc7be6
Fix include documentation - change filter tag to apply
2020-11-09 15:08:48 +02:00
ff3045289b
minor #3436 Fix: Add missing versionadded directive (OskarStark)
...
This PR was submitted for the 3.x branch but it was merged into the 2.x branch instead.
Discussion
----------
Fix: Add missing versionadded directive
mentioned by @stof in https://github.com/twigphp/Twig/pull/3434/files/5ceda707edeabd9e1462c43f199aa61606a29ff9#diff-cb39a2af448a7ea26e78809ebffa995c051f742afdb1f6d3e68ab85b09b801b8
Commits
-------
965ba57d
2020-11-06 08:07:20 +01:00
965ba57d76
Fix: Add missing versionadded directive
...
mentioned by @stof in https://github.com/twigphp/Twig/pull/3434/files/5ceda707edeabd9e1462c43f199aa61606a29ff9#diff-cb39a2af448a7ea26e78809ebffa995c051f742afdb1f6d3e68ab85b09b801b8
2020-11-05 20:10:12 +01:00
4afea9870d
Merge branch '1.x' into 2.x
...
* 1.x:
Enhancement: Use no_explicit_use_of_code_block_php rule
2020-11-05 18:30:36 +01:00
65189bf9f8
minor #3427 Enhancement: Use GithubActions instead of Travis for tests (OskarStark)
...
This PR was merged into the 2.x branch.
Discussion
----------
Enhancement: Use GithubActions instead of Travis for tests
You can see the first run in https://github.com/OskarStark/Twig/pull/2
Commits
-------
fdafd406
2020-11-05 18:28:39 +01:00
311e8ce4ac
minor #3432 Enhancement: Use no_explicit_use_of_code_block_php rule (OskarStark)
...
This PR was merged into the 1.x branch.
Discussion
----------
Enhancement: Use no_explicit_use_of_code_block_php rule
Commits
-------
87eb1396
2020-11-05 18:27:08 +01:00
5c5d23d229
minor #3435 Fix small typo in docs (apfelbox)
...
This PR was merged into the 2.x branch.
Discussion
----------
Fix small typo in docs
Commits
-------
7139e71c
2020-11-05 18:26:36 +01:00
824759d7c2
minor #3433 Fix: Typo (OskarStark)
...
This PR was merged into the 2.x branch.
Discussion
----------
Fix: Typo
The DOCtor-RST build will be fixed in #3434
Commits
-------
814aa6c6
2020-11-05 18:25:42 +01:00
7139e71c99
Fix small typo
2020-11-05 14:29:41 +01:00
814aa6c6b0
Fix: Typo
2020-11-05 14:19:53 +01:00
fdafd40626
Enhancement: Use GithubActions instead of Travis for tests
2020-11-05 14:17:52 +01:00
7685eb905a
minor #3434 Fix: DOCtor-RST build (OskarStark)
...
This PR was merged into the 2.x branch.
Discussion
----------
Fix: DOCtor-RST build
Commits
-------
5ceda707
2020-11-05 14:12:46 +01:00
5ceda707ed
Fix: DOCtor-RST build
2020-11-05 13:57:55 +01:00
87eb1396ba
Enhancement: Use no_explicit_use_of_code_block_php rule
2020-11-05 13:36:29 +01:00
7a6f3eb534
Merge branch '1.x' into 2.x
...
* 1.x:
Fix: Highlighting
2020-11-05 13:36:28 +01:00
22cdd19189
minor #3431 Fix: Highlighting (OskarStark)
...
This PR was merged into the 1.x branch.
Discussion
----------
Fix: Highlighting
Commits
-------
0df7ddcf
2020-11-05 13:36:13 +01:00
c2a264a91d
Merge branch '1.x' into 2.x
...
* 1.x:
Enhancement: Introduce DOCtor-RST config + Sphinx build + GithubActions
Enhancement: Use GithubActions instead of Travis for tests
Fix `odd` not working for negative numbers
Bump version to 1.44.2-DEV
Prepare the 1.44.1 release
2020-11-05 13:31:01 +01:00
0df7ddcf4f
Fix: Highlighting
2020-11-05 13:18:52 +01:00
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
2020-11-05 13:09:12 +01:00
c9328ad613
Enhancement: Introduce DOCtor-RST config + Sphinx build + GithubActions
2020-11-05 13:09:07 +01:00
da30f5d939
minor #3429 Enhancement: Use GithubActions instead of Travis for tests (OskarStark)
...
This PR was merged into the 1.x branch.
Discussion
----------
Enhancement: Use GithubActions instead of Travis for tests
You can see the first run here: https://github.com/OskarStark/Twig/pull/3
Commits
-------
4438d4c1
2020-11-05 13:06:13 +01:00
4438d4c1bb
Enhancement: Use GithubActions instead of Travis for tests
2020-11-05 13:04:03 +01:00
10ebf0c4d3
bug #3425 Fix odd not working for negative numbers (harrybournis)
...
This PR was submitted for the 3.x branch but it was merged into the 1.x branch instead.
Discussion
----------
Fix `odd` not working for negative numbers
Fixes https://github.com/twigphp/Twig/issues/3424
Commits
-------
53a3ccd2
2020-11-05 11:55:51 +01:00
53a3ccd2d2
Fix odd not working for negative numbers
2020-11-05 11:55:45 +01:00
b163c7f716
Bump version to 2.14.2-DEV
2020-10-27 20:26:34 +01:00
5eb9ac5dfd
Prepare the 2.14.1 release
2020-10-27 20:25:29 +01:00
35d744b851
Update CHANGELOG
2020-10-27 20:24:57 +01:00
Fabien Potencier
abdounikarim
Olaf van der Spek
tkm
Oskar Stark
Jannik
Harry Bournis