[FrameworkBundle] Look for translations in %kernel.root_dir%/Resources/%bundle%/translations (fix #4018)
ignore composer.phar

for running unit tests the external dependencies are now managed using composer, so it's necessary to download compmoser.phar to install them.
[Propel1] Added security layer
add resource links for the console component
merged branch willdurand/propel-security (PR #4038)

Commits
-------

01ca0ad [Propel1] Added security layer

Discussion
----------

[Propel1] Added security layer

Fixed the security layer for Propel 1.6, and Symfony2 2.1.

The PropelBundle is ready to go: https://github.com/propelorm/PropelBundle/pull/139
Unit tests are part of the PropelBundle at the moment, as it requires to setup a quick builder.
merged branch tonypiper/ignore-composer-phar (PR #4034)

Commits
-------

a72d7ef ignore composer.phar
ddca4bb Update CHANGELOG-2.1.md

Discussion
----------

[Global] ignore composer.phar

for running unit tests the external dependencies are managed using composer (since aa055dfd983ccfca6e09a375dd7111c874452dab), so it's necessary to download composer.phar to install them. We don't want composer.phar to be comitted to the codebase so it's necessary to ignore it.

Bug fix: no
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: -
Todo: -

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

by Seldaek at 2012-04-20T13:19:29Z

I agree it should be ignored, but you also probably should install it somewhere globally on your machine and put that in the PATH so you have it everywhere and don't need 300 copies of it. Incidentally it would also not require you to gitignore it since it would be outside of the git dirs.

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

by tonypiper at 2012-04-20T13:24:56Z

I was going to revise the documentation for running tests and your approach would, of course, be best but I thought a belt-and-braces approach wouldn't hurt...
[Propel1] Fixed typo
merged branch vicb/translation/override (PR #4030)

Commits
-------

3937561 [FrameworkBundle] Look for translations in %kernel.root_dir%/Resources/%bundle%/translations (fix #4018)

Discussion
----------

[FrameworkBundle] Look for translations in %kernel.root_dir%/Resources/%...

...bundle%/translations (fix #4018)

I will submit a PR to the docs.
merged branch willdurand/propel-security-typo (PR #4041)

Commits
-------

dbe980b [Propel1] Fixed typo

Discussion
----------

[Propel1] Fixed typo

Sorry for that..
merged branch gimler/patch-1 (PR #4040)

Commits
-------

1137670 add resource links for the console component

Discussion
----------

add resource links for the console component
fixed typo
[Profiler] Fixed IE7 JavaScript errors
merged branch ruimarinho/profiler_ie7 (PR #4032)

Commits
-------

ffc074b [Profiler] Fixed IE7 JavaScript errors

Discussion
----------

[Profiler] Fixed IE7 JavaScript errors

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes

Requires merge of another [PR](https://github.com/doctrine/DoctrineBundle/pull/61) available on the `doctrine/DoctrineBundle` repository (compatibility changes to `db.html.twig`).

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

by fabpot at 2012-04-20T14:15:22Z

That does not work for me.
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  [Profiler] Fixed IE7 JavaScript errors
  fixed typo
  [Propel1] Fixed typo
  add resource links for the console component
  [Propel1] Added security layer
  ignore composer.phar
  [FrameworkBundle] Look for translations in %kernel.root_dir%/Resources/%bundle%/translations (fix #4018)