added support for propel enum types in PropelTypeGuesser
Merge branch 'master' of github:MaksSlesarenko/symfony into added-support-for-propel-enum-types-forms
[Translation] Added some tests to QtFileLoader.

Added one test for testing exception is thrown if resource is not local.
Added one test for testing exception is thrown if xml resource is invalid.
Fixed coding standards issues.
Fixed coding standards issues in invalid-xml-resources.xlf file.
[Security] Added Danish translation
Fix regression in WDT path/pattern naming
Added Serbian Latin tanslation for security component
merged branch umpirsky/security-sr-latn (PR #6767)

This PR was merged into the master branch.

Commits
-------

ed2d542 Added Serbian Latin tanslation for security component

Discussion
----------

[Security] Added Serbian Latin tanslation for security component
merged branch toin0u/SecurityTranslation (PR #6761)

This PR was merged into the master branch.

Commits
-------

68ac23f [Security] Added Danish translation

Discussion
----------

[Security] Added Danish translation

Bug fix: no
Feature addition: no
Backwards compatibility break: no
Deprecations: no
Symfony2 tests pass: yes
Fixes the following tickets: -
Todo: -
License of the code: MIT
Documentation PR: -
merged branch vicentgodella/master (PR #6755)

This PR was merged into the master branch.

Commits
-------

1c5d74c Fixed coding standards issues in invalid-xml-resources.xlf file.
552a806 Fixed coding standards issues.
293991d [Translation] Added some tests to QtFileLoader.

Discussion
----------

[Translation] Added some tests to QtFileLoader.

Added one test for testing exception is thrown if resource is not local.
Added one test for testing exception is thrown if xml resource is invalid.

QtFileLoader has now 100% code coverage.

Bug fix: no
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
License of the code: MIT
merged branch dlsniper/wdt-route-change (PR #6764)

This PR was merged into the master branch.

Commits
-------

41d3953 Fix regression in WDT path/pattern naming

Discussion
----------

[WDT] Fix regression in WDT path/pattern naming

Bug fix: yes (master only)
Feature addition: no
Backwards compatibility break: no
Fixes the following tickets: ~
Todo: see below
License of the code: MIT
Documentation PR: ~

This fixes a regression in WDT where clicking routing panel triggers an error.

Let me know if this should be fixed in collector as well as it could be considered a regression.

---------------------------------------------------------------------------

by fabpot at 2013-01-16T16:12:27Z

It should be also fixed in the collector as the profiler data are not compatible between versions anyway.

---------------------------------------------------------------------------

by dlsniper at 2013-01-16T18:21:42Z

@fabpot everything needed seems to be done. Either that or I'm missing something, if you can point me in the right direction, let me know. Thank you!
replaced usage of Route::getPattern() by Route::getPath()
updated CHANGELOG for 3.0
Make last toolbar info box right-aligned
Fix lack of padding in some WDT boxes (e.g. You are not authenticated.)
merged branch lmcd/wdt-right-align (PR #6768)

This PR was merged into the master branch.

Commits
-------

2d53698 Make last toolbar info box right-aligned

Discussion
----------

[WebProfilerBundle] Make last toolbar info box right-aligned

Content is less likely to go off the edge of the screen if the last box is aligned right instead of left:

![toolbar-right-align](https://f.cloud.github.com/assets/363540/73392/a88ec334-6041-11e2-8dcc-e9274c69e1d2.png)
merged branch lmcd/wdt-padding-fix (PR #6769)

This PR was merged into the master branch.

Commits
-------

4b54156 Fix lack of padding in some WDT boxes (e.g. You are not authenticated.)

Discussion
----------

[WebProfilerBundle] Fix lack of padding in some WDT boxes (e.g. You are not authenticated.)

Fixes bug introduced by https://github.com/symfony/symfony/pull/6615

Before:
![wdt-padding-before](https://f.cloud.github.com/assets/363540/73453/c6779f30-6044-11e2-9df5-682c822ac13c.png)

After:
![wdt-padding-after](https://f.cloud.github.com/assets/363540/73455/cbeaa44e-6044-11e2-9d9b-9184b1351554.png)
merged branch MaksSlesarenko/added-support-for-propel-enum-types-forms (PR #6715)

This PR was merged into the master branch.

Commits
-------

2a7ecf7 Merge branch 'master' of github:MaksSlesarenko/symfony into added-support-for-propel-enum-types-forms
3ae5b55 added support for propel enum types in PropelTypeGuesser

Discussion
----------

added support for propel enum types in PropelTypeGuesser

added support for propel enum and mysql enum field types

---------------------------------------------------------------------------

by willdurand at 2013-01-14T19:06:06Z

The build status is a Travis-CI issue. Should be green.

---------------------------------------------------------------------------

by MaksSlesarenko at 2013-01-16T23:11:52Z

"The build status is a Travis-CI issue. Should be green."
It definitely should...

PHPUnit 3.7.10 by Sebastian Bergmann.

Configuration read from ../symfony/symfony/src/Symfony/Bridge/Propel1/phpunit.xml.dist

.......................................

Time: 0 seconds, Memory: 8.50Mb

OK (39 tests, 96 assertions)
[HttpKernel] fixed circular reference detected for service "templating"