Commit Graph

23 Commits

Author SHA1 Message Date
Fabien Potencier 40c097276d Merge branch '2.2' into 2.3
* 2.2:
  updated VERSION for 2.2.11
  update CONTRIBUTORS for 2.2.11
  updated CHANGELOG for 2.2.11
  [HttpKernel] made a small optimization to Bundle initialization
  minor optimalization at bundle initialization
  [EventDispatcher] tweaked README
  removed observer pattern, in favour of mediator
  [DoctrineBridge] normalized class names in the ORM type guesser
  Fix `extract` method to avoid recalculating count() for each iteration.
  use the correct class name to retrieve mapped class' metadata and repository
  [WebProfilerBundle] Fixed js escaping in time.html.twig

Conflicts:
	src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig
	src/Symfony/Component/HttpKernel/Kernel.php
2013-12-03 15:51:26 +01:00
Fabien Potencier 9ff365d734 updated CHANGELOG for 2.2.11 2013-12-02 08:04:36 +01:00
Fabien Potencier 59a4313a52 Merge branch '2.2' into 2.3
* 2.2:
  bumped Symfony version to 2.2.11
  updated VERSION for 2.2.10
  update CONTRIBUTORS for 2.2.10
  updated CHANGELOG for 2.2.10
  fixed version
  Request::overrideGlobals() may call invalid ini value
  Force Luhn Validator to only work with strings
  [Translation] fixed the error in the dumper test as described in #9475
  [Console] fix phpdoc and constructor default value

Conflicts:
	src/Symfony/Component/Console/Helper/ProgressHelper.php
	src/Symfony/Component/HttpKernel/Kernel.php
2013-11-13 22:27:40 +01:00
Fabien Potencier 09da15b24d updated CHANGELOG for 2.2.10 2013-11-13 15:28:18 +01:00
Fabien Potencier e7df974ab8 Merge branch '2.2' into 2.3
* 2.2:
  bumped Symfony version to 2.2.10
  updated VERSION for 2.2.9
  update CONTRIBUTORS for 2.2.9
  updated CHANGELOG for 2.2.9
  [Security] limited the password length passed to encoders
  assets:install command should mirror .dotfiles (.htaccess)
  PoFileDumper - PO headers
  removed whitespaces

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
	src/Symfony/Component/Security/Core/Encoder/BCryptPasswordEncoder.php
2013-10-10 15:12:30 +02:00
Fabien Potencier 9488c489c3 updated CHANGELOG for 2.2.9 2013-10-10 14:07:53 +02:00
Fabien Potencier 9a65ce3886 Merge branch '2.2' into 2.3
* 2.2:
  bumped Symfony version to 2.2.9
  updated VERSION for 2.2.8
  updated CHANGELOG for 2.2.8
  bumped the version
  fixed typo
  updated VERSION for 2.2.7
  update CONTRIBUTORS for 2.2.7
  updated CHANGELOG for 2.2.7
  bugix: CookieJar returns cookies with domain "domain.com" for domain "foodomain.com"

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2013-09-26 14:37:59 +02:00
Fabien Potencier 5c2dec6d72 updated CHANGELOG for 2.2.8 2013-09-26 09:49:39 +02:00
Fabien Potencier e43955ac96 updated CHANGELOG for 2.2.7 2013-09-25 16:49:03 +02:00
Fabien Potencier d75a35ef12 Merge branch '2.2' into 2.3
* 2.2:
  bumped Symfony version to 2.2.7
  updated VERSION for 2.2.6
  update CONTRIBUTORS for 2.2.6
  updated CHANGELOG for 2.2.6
  clearToken exception is thrown at wrong place.

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2013-08-27 10:54:20 +02:00
Fabien Potencier cb883a6975 updated CHANGELOG for 2.2.6 2013-08-26 21:26:38 +02:00
Fabien Potencier b463a70d73 Merge branch '2.2' into 2.3
* 2.2:
  added missing support for the new output API in PHP 5.4+
  Fixed bug introduced in #8675
  made the filesystem loader compatible with Twig 2.0
  bumped Symfony version to 2.2.6
  updated VERSION for 2.2.5
  update CONTRIBUTORS for 2.2.5
  updated CHANGELOG for 2.2.5
  replaced deprecated Twig features

Conflicts:
	src/Symfony/Bridge/Twig/Extension/FormExtension.php
	src/Symfony/Bridge/Twig/Extension/RoutingExtension.php
	src/Symfony/Component/HttpKernel/Kernel.php
2013-08-08 14:02:32 +02:00
Fabien Potencier 318c580ec0 updated CHANGELOG for 2.2.5 2013-08-07 17:56:56 +02:00
Fabien Potencier a3fbf0082d Merge branch '2.2' into 2.3
* 2.2:
  fixed typo
  bumped Symfony version to 2.2.5
  updated VERSION for 2.2.4
  update CONTRIBUTORS for 2.2.4
  updated CHANGELOG for 2.2.4
  Fixed NativeSessionStorage:regenerate when does not exists
  removed extraneous whitespaces

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2013-07-17 07:57:53 +02:00
Fabien Potencier 97e0c4f9e9 updated CHANGELOG for 2.2.4 2013-07-15 14:27:43 +02:00
Fabien Potencier d7999d7108 Merge branch '2.2' into 2.3
* 2.2:
  [Form] fixed INF usage which does not work on Solaris (closes #8246)
  Fix grammar
  bumped Symfony version to 2.2.4
  updated VERSION for 2.2.3
  update CONTRIBUTORS for 2.2.3
  updated CHANGELOG for 2.2.3
  [Process] Disable exception on stream_select timeout
  [HttpFoundation] fixed issue with session_regenerate_id (closes #7380)
  [DomCrawler] added a note about the default charset
  [Console] fixed regression when calling a command foo:bar if there is another one like foo:bar:baz (closes #8245)
  force the Content-Type to html in the web profiler controllers

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2013-06-23 10:16:02 +02:00
Fabien Potencier bf881db902 updated CHANGELOG for 2.2.3 2013-06-19 14:09:01 +02:00
Fabien Potencier 6b25213e23 Merge branch '2.2' into 2.3
* 2.2:
  bumped Symfony version to 2.2.3-DEV
  updated VERSION for 2.2.2
  updated CHANGELOG for 2.2.2
  removed CHANGELOG for 2.1
  updated VERSION for 2.1.11
  update CONTRIBUTORS for 2.1.11
  updated CHANGELOG for 2.1.11

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2013-06-02 18:04:08 +02:00
Fabien Potencier b9ca806048 updated CHANGELOG for 2.2.2 2013-06-02 15:02:48 +02:00
Garanzha Dmitriy bc62d5b56f typo fix 2013-04-21 08:44:01 +03:00
Fabien Potencier 3c5ee556fd updated CHANGELOG for 2.2.1 2013-04-06 12:15:29 +02:00
Fabien Potencier 4734354659 updated CHANGELOG for 2.2.0 2013-03-01 07:52:04 +01:00
Fabien Potencier 42930d4a50 updated CHANGELOG for 2.2.0-RC3 2013-02-24 13:06:42 +01:00