This repository has been archived on 2023-08-20. You can view files and clone it, but cannot push or open issues or pull requests.
symfony/src/Symfony/Bundle/TwigBundle
Fabien Potencier b07eca5453 Merge branch '2.6' into 2.7
* 2.6: (21 commits)
  Revert "bug #14262 [TwigBundle] Refresh twig paths when resources change. (aitboudad)"
  InvalidResourceException file name
  [Validators] Remove forgotten space in a translation key [nl]
  [Validators] Correct translation key and content [nl]
  bumped Symfony version to 2.6.9
  updated VERSION for 2.6.8
  updated CHANGELOG for 2.6.8
  added missing CVE number
  bumped Symfony version to 2.3.30
  updated VERSION for 2.3.29
  update CONTRIBUTORS for 2.3.29
  updated CHANGELOG for 2.3.29
  [Validators] Missing translations for arabic language.
  Code style
  fixed C
  [HttpKernel][Bundle] Check extension implements ExtensionInterface
  [DebugBundle] Fix config XSD
  [CS] [Console] StreamOuput : fix loose comparison
  [Framework][router commands] fixed failing test.
  [HttpKernel] Do not call the FragmentListener if _controller is already defined
  ...

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
	src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php
2015-05-29 16:44:44 +02:00
..
CacheWarmer Docblock fixes 2014-11-30 13:33:44 +00:00
Command minor #14121 CS: Pre incrementation/decrementation should be used if possible (gharlan) 2015-05-15 15:28:34 +02:00
Controller [TwigBundle] Fix deprecated use of FlattenException 2015-04-27 14:57:27 +02:00
Debug integrated the Twig profiler 2015-01-25 19:10:07 +01:00
DependencyInjection Merge branch '2.6' into 2.7 2015-05-29 16:44:44 +02:00
Extension Merge branch '2.6' into 2.7 2015-04-03 17:24:01 +02:00
Loader Merge branch '2.3' into 2.5 2014-11-28 11:00:29 +01:00
Node [TwigBundle] added missing @deprecated tags 2015-01-03 14:39:19 +01:00
Resources Merge branch '2.6' into 2.7 2015-05-02 17:21:08 +02:00
Tests Merge branch '2.6' into 2.7 2015-05-02 17:21:08 +02:00
TokenParser [TwigBundle] added missing @deprecated tags 2015-01-03 14:39:19 +01:00
.gitignore Added missing files .gitignore 2013-07-21 14:12:18 +02:00
CHANGELOG.md make date formats and number formats configurable 2015-04-03 10:30:44 +02:00
composer.json Merge branch '2.6' into 2.7 2015-05-02 17:21:08 +02:00
phpunit.xml.dist [2.3] require-dev PHPUnit bridge 2015-02-24 11:24:26 +01:00
TwigBundle.php [TwigBundle] Adds service check for extension loading 2013-03-14 12:28:51 +01:00
TwigDefaultEscapingStrategy.php [TwigBundle] use the new Twig autoescaping strategy 2015-01-14 06:59:05 +01:00
TwigEngine.php [TwigBundle] use the new Twig autoescaping strategy 2015-01-14 06:59:05 +01:00