From 4c9f2a337cb8d3e34fab65126ff963342c9ad8f8 Mon Sep 17 00:00:00 2001
From: Sullivan SENECHAL <soullivaneuh@gmail.com>
Date: Fri, 14 Oct 2016 11:43:35 +0200
Subject: [PATCH] 3.1.0

---
 CHANGELOG.md   | 21 +++++++++++++++++++++
 UPGRADE-3.x.md |  3 +++
 2 files changed, 24 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 38614544a..eb053d2a5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,27 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [3.1.0](https://github.com/sonata-project/SonataUserBundle/compare/3.0.1...3.1.0) - 2016-10-14
+### Changed
+- The `friendsofsymfony/rest-bundle` dependency is optional again
+- The `jms/serializer-bundle` dependency is optional again
+- The `nelmio/api-doc-bundle` dependency is optional again
+- Changed implementation of `SecurityFOSUser1Controller::loginAction`
+- Changed implementation of `AdminSecurityController::loginAction`
+- Changed how the error message is translated in `login.html.twig`
+- Changed how the error message is translated in `base_login.html.twig`
+
+### Fixed
+- Fixed a potential null error in `SecurityFOSUser1Controller::loginAction`
+- Fixed a potential empty route after calling `RegistrationFOSUser1Controller::registerAction`
+- Fixed wrong route name "sonata_user_admin_resetting_request", replaced with "sonata_user_resetting_request"
+- Symfony 3 security classes use in `AdminSecurityController`
+- Fixed a possible security risk as noticed in this [line](https://github.com/sonata-project/SonataUserBundle/blob/88a962818dd6218379ff1439183a15647837bda0/Controller/AdminSecurityController.php#L40)
+
+### Removed
+- Internal test classes are now excluded from the autoloader
+- Removed translation for 'Bad credentials' message in `SonataUserBundle.de.xliff`
+
 ## [3.0.1](https://github.com/sonata-project/SonataUserBundle/compare/3.0.0...3.0.1) - 2016-05-20
 ### Changed
 - Admin classes extend `Sonata\AdminBundle\Admin\AbstractAdmin`
diff --git a/UPGRADE-3.x.md b/UPGRADE-3.x.md
index 0ee874bb2..fac2634f8 100644
--- a/UPGRADE-3.x.md
+++ b/UPGRADE-3.x.md
@@ -1,6 +1,9 @@
 UPGRADE 3.x
 ===========
 
+UPGRADE FROM 3.0 to 3.1
+=======================
+
 ### Tests
 
 All files under the ``Tests`` directory are now correctly handled as internal test classes.