This PR was merged into the master branch.

Discussion
----------

Reorder wording

Quick reordering of the words in a docblock (not sure an interface can implement a service provider 😃).

Commits
-------

861de4ea Reorder wording

This PR was merged into the master branch.

Discussion
----------

Fixed typo

Commits
-------

6e374c0e Fixed typo

This PR was merged into the master branch.

Discussion
----------

remove travis status

Commits
-------

dcc5a0b5 remove travis status

This PR was merged into the master branch.

Discussion
----------

added a cookbook about managing assets

This was not documented before and as we get many PRs on adding more abstraction in Silex about assets (see #697 or #733), I wanted to demonstrate that everything is as easy as it can get without any further helper functions in Silex itself.

Commits
-------

b045442c added a cookbook about managing assets

This PR was squashed before being merged into the master branch (closes #834).

Discussion
----------

[doc] Create doc for RememberMeServiceProvider

Refs #689

Commits
-------

f79177eb [doc] Create doc for RememberMeServiceProvider

This PR was merged into the master branch.

Discussion
----------

restricted the HTTP fragment service provider to Symfony 2.4+

The HTTP fragment service provider cannot work on Symfony 2.3+ (see #819)

Commits
-------

c2fa4cba restricted the HTTP fragment service provider to Symfony 2.4+

* 1.1:
  fixed translator locale management
  bumped version to 1.1.3-DEV
  prepared the 1.1.2 release
  updated CHANGELOG
  prepared the 1.0.2 release
  updated CHANGELOG

Conflicts:
	doc/changelog.rst
	src/Silex/Application.php
	src/Silex/Provider/TranslationServiceProvider.php

This PR was merged into the 1.1 branch.

Discussion
----------

fixed translator locale management

The locale used by the translator was set the first time the translator was instantiated. That's a problem for several reasons:

 * changing the locale via `$app['locale']` would not change the locale used by the translator;

 * when using fragments, the locale was not updated correctly;

 * also, when using the web profiler, the translator is created early on (before the handling of a request), and so the locale was always `en` (see silexphp/Silex-WebProfiler#23).

Commits
-------

902c2c8c fixed translator locale management

This PR was merged into the master branch.

Discussion
----------

Converters

This PR reverts #769 (which tried to fix #768) as this is a breaks BC for the most usual use case of converters (#806).

The decision has been taken (#814) that a converter always run, independently of the available request attribute names or controller argument names.

Because of the above, running the converters as a controller event is not needed anymore, and moving the converters earlier in the process gives more power to the developer (#825 and #826).

Commits
-------

a0644877 Convert request attributes in the KernelEvents::REQUEST event instead of KernelEvents::CONTROLLER event (closes #825)
3b207399 added a note about global  converters being applied to all controllers
76776926 Revert "merged branch igorw/convert-only-existing-attribute (PR #769)"

This PR was merged into the master branch.

Discussion
----------

fixed the form example to not use deprecated methods

see #822

Commits
-------

fa45d9a1 fixed the form example to not use deprecated methods

Convert request attributes in the KernelEvents::REQUEST event instead of KernelEvents::CONTROLLER event (closes #825)

This reverts commit e7d4a2fd, reversing
changes made to d6fe48ea.

Conflicts:
	doc/changelog.rst
	src/Silex/EventListener/ConverterListener.php

This PR was squashed before being merged into the master branch (closes #823).

Discussion
----------

[RFR] various clean ups

- [x] fixing typos and typehinting checkroute method
- [x] remove unused use statements
- [x] make consistent test use statement without line break separation

Commits
-------

727f5b7a [RFR] various clean ups

This PR was merged into the master branch.

Discussion
----------

Default HttpCache debug option to that of the main container

Commits
-------

9cd048c7 Default HttpCache debug option to that of

* 1.0:
  prepared the 1.0.2 release
  updated CHANGELOG

Conflicts:
	doc/changelog.rst
	src/Silex/Application.php

* 1.1:
  Event helpers add listeners directly after boot
  fix docblock
  Update intro.rst - Included links to Symfony2, Pimple and Sinatra
  typo fixed in doc/providers.rst

* 1.0:
  fix docblock
  Update intro.rst - Included links to Symfony2, Pimple and Sinatra
  typo fixed in doc/providers.rst