Skip to content

Commit

Permalink
Merge branch '2.0' into 2.1
Browse files Browse the repository at this point in the history
* 2.0:
  bumped Symfony version to 2.0.19-DEV
  updated VERSION for 2.0.18
  update CONTRIBUTORS for 2.0.18
  updated CHANGELOG for 2.0.18
  updated vendors for 2.0.18
  Add to DateFormats 'D M d H:i:s Y T' (closes #5830)

Conflicts:
	CONTRIBUTORS.md
	src/Symfony/Component/HttpKernel/Kernel.php
	tests/Symfony/Tests/Bridge/Monolog/Processor/WebProcessorTest.php
	vendors.php
  • Loading branch information
fabpot committed Oct 25, 2012
2 parents f31c6f9 + 8872074 commit 1277e67
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 0 deletions.
15 changes: 15 additions & 0 deletions CHANGELOG-2.0.md
Expand Up @@ -7,6 +7,21 @@ in 2.0 minor versions.
To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v2.0.0...v2.0.1

* 2.0.18 (2012-10-25)

* 20898e5: Add to DateFormats 'D M d H:i:s Y T' (closes #5830)
* bf3e358: [Form] Fixed creation of multiple money fields with different currencies
* 959c1df: Fixed IPv6 Check in RequestMatcher
* b439d13: fixed DomCrwaler/Form to handle <button> when submitted
* 22c7a91: [HttpKernel][Translator] Fixed type-hints
* a6ae6f6: [Translation] forced the catalogue to be regenerated when a resource is added (closes symfony/Translation#1)
* 6c59fbd: [HttpFoundation] Fixed #5611 - Request::splitHttpAcceptHeader incorrect result order.
* 1a53b12: [2.0][http-foundation] Fix Response::getDate method
* 7444cb9: Support the new Microsoft URL Rewrite Module for IIS 7.0. @see http://framework.zend.com/issues/browse/ZF-4491 @see http://framework.zend.com/code/revision.php?repname=Zend+Framework&rev=24842
* ad95364: hasColorSupport does not take an argument
* 2ceebdc: fixed stringification of array objects in RequestDataCollector (closes #5295)
* de6658b: [Profiler]Use the abstract method to get client IP

* 2.0.17 (2012-08-28)

* 5bf4f92: fixed XML decoding attack vector through external entities
Expand Down
1 change: 1 addition & 0 deletions src/Symfony/Component/BrowserKit/Cookie.php
Expand Up @@ -31,6 +31,7 @@ class Cookie
'D, d-M-y H:i:s T',
'D, d-M-Y H:i:s T',
'D M j G:i:s Y',
'D M d H:i:s Y T',
);

protected $name;
Expand Down

0 comments on commit 1277e67

Please sign in to comment.