geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-15 11:56:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,813 Commits 10 Branches 273 Tags
abea992e76dd6ff6165db7d3ab4046fb5d0e29cb
Commit Graph

4813 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabien Potencier abea992e76 Merge branch '2.x' into 3.x 
* 2.x:
  [Doc] Minor fixes and removed belittling words
  fixed CHANGELOG
  bumped version to 2.11.4-DEV
  prepared the 2.11.3 release
  bumped version to 1.42.3-DEV
  prepared the 1.42.2 release
 2019-06-20 14:04:29 +02:00
Fabien Potencier fb5a1f43e6 Merge branch '1.x' into 2.x 
* 1.x:
  [Doc] Minor fixes and removed belittling words
  bumped version to 1.42.3-DEV
  prepared the 1.42.2 release
 2019-06-20 13:56:08 +02:00
Fabien Potencier 40f703ab40 minor #3069 [Doc] Minor fixes and removed belittling words (javiereguiluz) 
This PR was merged into the 1.x branch.

Discussion
----------

[Doc] Minor fixes and removed belittling words

Commits
-------

270d4a57 [Doc] Minor fixes and removed belittling words
 2019-06-20 13:51:09 +02:00
Javier Eguiluz 270d4a57a2 [Doc] Minor fixes and removed belittling words 2019-06-20 13:32:09 +02:00
Fabien Potencier 1e67047ae4 fixed CHANGELOG 2019-06-18 17:39:10 +02:00
Fabien Potencier 86dc3ba3bb bumped version to 2.11.4-DEV 2019-06-18 17:37:46 +02:00
Fabien Potencier 699ed23425 prepared the 2.11.3 release v2.11.3 2019-06-18 17:37:11 +02:00
Fabien Potencier 5c9ec4d4a3 bumped version to 1.42.3-DEV 2019-06-18 17:36:05 +02:00
Fabien Potencier 21707d6ebd prepared the 1.42.2 release v1.42.2 2019-06-18 17:35:16 +02:00
Fabien Potencier 967897426a Merge branch '2.x' into 3.x 
* 2.x:
  fixed the filter filter
  Escape __DIR__ in the test suite
 2019-06-18 17:33:35 +02:00
Fabien Potencier 14e2f42bc7 Merge branch '1.x' into 2.x 
* 1.x:
  Escape __DIR__ in the test suite
 2019-06-18 17:33:26 +02:00
Fabien Potencier 1107684bee bug #3065 Fix the filter filter (fabpot) 
This PR was merged into the 2.x branch.

Discussion
----------

Fix the filter filter

closes #3063

Commits
-------

29ad145d fixed the filter filter
 2019-06-14 09:22:44 +02:00
Fabien Potencier 29ad145dd8 fixed the filter filter 2019-06-14 07:36:32 +02:00
Fabien Potencier 8c4b748f23 minor #3062 Escape __DIR__ in the test suite (lyrixx) 
This PR was merged into the 1.x branch.

Discussion
----------

Escape __DIR__ in the test suite

Commits
-------

fa0213a9 Escape __DIR__ in the test suite
 2019-06-11 11:40:08 +02:00
Grégoire Pineau fa0213a9c4 Escape __DIR__ in the test suite 2019-06-11 11:12:51 +02:00
Fabien Potencier 569d84b287 fixed tests 2019-06-10 19:59:27 +02:00
Fabien Potencier 17bf2f0bfc Merge branch '2.x' into 3.x 
* 2.x:
  Don't clear PHP buffer when an error occurs with debug=true
  Remove duplicate phpdoc
 2019-06-10 19:37:42 +02:00
Fabien Potencier b957ff6f29 Merge branch '1.x' into 2.x 
* 1.x:
  Don't clear PHP buffer when an error occurs with debug=true
  Remove duplicate phpdoc
 2019-06-10 19:37:27 +02:00
Fabien Potencier 0390a9d846 bug #3059 Don't clear PHP buffer when an error occurs with debug=true (lyrixx) 
This PR was squashed before being merged into the 1.x branch (closes #3059).

Discussion
----------

Don't clear PHP buffer when an error occurs with debug=true

fixes #3058

Commits
-------

c910e71f Don't clear PHP buffer when an error occurs with debug=true
 2019-06-10 19:37:02 +02:00
Grégoire Pineau c910e71f5a Don't clear PHP buffer when an error occurs with debug=true 2019-06-10 19:36:53 +02:00
Fabien Potencier aa564b24ba minor #3061 Remove duplicate phpdoc (tvdijen) 
This PR was merged into the 1.x branch.

Discussion
----------

Remove duplicate phpdoc

Commits
-------

2c1c00ba Remove duplicate phpdoc
 2019-06-10 19:26:46 +02:00
Tim van Dijen 2c1c00ba0e Remove duplicate phpdoc 2019-06-10 12:15:10 +02:00
Fabien Potencier db41300124 Merge branch '2.x' into 3.x 
* 2.x:
  fixed macro auto-import when a template contains only macros
  fixed end of constructor node logic
  bumped version to 2.11.3-DEV
  prepared the 2.11.2 release
  fixed macro auto-import
  fix CS
  fix CS
  bumped version to 2.12
 2019-06-08 09:01:50 +02:00
Fabien Potencier d18cba7d84 bug #3057 Fix macro auto-import when a template contains only macros (fabpot) 
This PR was merged into the 2.x branch.

Discussion
----------

Fix macro auto-import when a template contains only macros

closes #3055

Commits
-------

197528f4 fixed macro auto-import when a template contains only macros
 2019-06-06 10:28:59 +02:00
Fabien Potencier 197528f45c fixed macro auto-import when a template contains only macros 2019-06-06 10:15:08 +02:00
Fabien Potencier 1a3dc0aab0 Merge branch '1.x' into 2.x 
* 1.x:
  fixed end of constructor node logic
 2019-06-06 10:08:52 +02:00
Fabien Potencier 2a293b6827 bug #3056 Fix end of constructor node logic (fabpot) 
This PR was merged into the 1.x branch.

Discussion
----------

Fix end of constructor node logic

Commits
-------

8a29b42d fixed end of constructor node logic
 2019-06-06 10:08:39 +02:00
Fabien Potencier 8a29b42df9 fixed end of constructor node logic 2019-06-06 10:03:25 +02:00
Fabien Potencier 5f517f0b80 bumped version to 2.11.3-DEV 2019-06-05 13:17:48 +02:00
Fabien Potencier 84a463403d prepared the 2.11.2 release v2.11.2 2019-06-05 13:17:07 +02:00
Fabien Potencier 95212c93e8 bug #3054 Fix typo (fabpot) 
This PR was merged into the 2.x branch.

Discussion
----------

Fix typo

closes #3051

Commits
-------

57c51301 fixed macro auto-import
 2019-06-05 13:12:51 +02:00
Fabien Potencier 57c51301c9 fixed macro auto-import 2019-06-05 13:11:42 +02:00
Fabien Potencier 5a1e33d72f fix CS 2019-06-05 05:43:05 +02:00
Fabien Potencier 32525abad1 Merge branch '1.x' into 2.x 
* 1.x:
  fix CS
 2019-06-05 05:43:01 +02:00
Fabien Potencier f4c2b1a885 fix CS 2019-06-05 05:38:38 +02:00
Fabien Potencier 09c6116938 bumped version to 2.12 2019-06-05 05:13:06 +02:00
Fabien Potencier 7d35e02596 Merge branch '2.x' into 3.x 
* 2.x:
  removed docs about overloading
  bumped version to 2.11.2-DEV
  prepared the 2.11.1 release
  bumped version to 1.42.2-DEV
  prepared the 1.42.1 release
  added a doc note
  updated CHANGELOG
 2019-06-04 18:39:41 +02:00
Fabien Potencier 0ae533dfe3 Merge branch '1.x' into 2.x 
* 1.x:
  removed docs about overloading
  bumped version to 1.42.2-DEV
  prepared the 1.42.1 release
 2019-06-04 18:39:18 +02:00
Fabien Potencier d4424dd4b4 minor #3052 Remove docs about overloading (fabpot) 
This PR was merged into the 1.x branch.

Discussion
----------

Remove docs about overloading

Commits
-------

18e37286 removed docs about overloading
 2019-06-04 18:38:02 +02:00
Fabien Potencier 18e3728682 removed docs about overloading 2019-06-04 17:49:11 +02:00
Fabien Potencier 3cd635bf91 bumped version to 2.11.2-DEV 2019-06-04 13:33:20 +02:00
Fabien Potencier 0418e17113 prepared the 2.11.1 release v2.11.1 2019-06-04 13:32:47 +02:00
Fabien Potencier e0ee3b5e44 bumped version to 1.42.2-DEV 2019-06-04 13:31:48 +02:00
Fabien Potencier 6713476037 prepared the 1.42.1 release v1.42.1 2019-06-04 13:31:08 +02:00
Fabien Potencier 26a0e265bf minor #3050 Add a doc note (fabpot) 
This PR was merged into the 2.x branch.

Discussion
----------

Add a doc note

closes #3045

Commits
-------

ee7be2e1 added a doc note
 2019-06-04 10:53:43 +02:00
Fabien Potencier ee7be2e187 added a doc note 2019-06-04 10:53:04 +02:00
Fabien Potencier eb9a3e245e updated CHANGELOG 2019-06-03 18:44:27 +02:00
Fabien Potencier f9429dab35 Merge branch '2.x' into 3.x 
* 2.x:
  added support for "Twig\Markup" instances in the "in" test (again)
 2019-06-03 18:38:17 +02:00
Fabien Potencier 43bc74a7d0 Merge branch '1.x' into 2.x 
* 1.x:
  added support for "Twig\Markup" instances in the "in" test (again)
 2019-06-03 18:38:09 +02:00
Fabien Potencier ec55f5716e bug #3049 Add support for "Twig\Markup" instances in the "in" test (again) (fabpot) 
This PR was merged into the 1.x branch.

Discussion
----------

Add support for "Twig\Markup" instances in the "in" test (again)

Commits
-------

2218cfe2 added support for "Twig\Markup" instances in the "in" test (again)
 2019-06-03 18:37:40 +02:00