Skip to content

Commit

Permalink
Prepared the 1.2 release
Browse files Browse the repository at this point in the history
  • Loading branch information
stof committed Apr 11, 2012
1 parent b706553 commit b3dc5fa
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 7 deletions.
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@ php:
- 5.4

env:
- SYMFONY_VERSION=v2.0.9
- SYMFONY_VERSION=v2.0.12
- SYMFONY_VERSION=origin/2.0
- SYMFONY_VERSION=origin/master

before_script: php vendor/vendors.php

Expand Down
10 changes: 9 additions & 1 deletion Changelog.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
Changelog
=========

### 1.2.0
### 1.2.0 (2012-04-12)

* Prefixed fos table names in propel schema with "fos_" to avoid using reserved sql words
* Added a fluent interface for the entities
* Added a mailer able to use twig blocks for the each part of the message
* Fixed the authentication in case of locked or disabled users. Github issue #464
* Add CSRF protection to the login form
* Added translations: bg, hr
* Updated translations
* Added translations for the validation errors and the login error
* Removed the user-level algorithm. Use FOSAdvancedEncoderBundle instead if you need such feature.
* Fixed resetting password clearing the token but not the token expiration. Github issue #501
* Renamed UsernameToUsernameTransformer to UserToUsernameTransformer and changed its service ID to `fos_user.user_to_username_transformer`.
Expand Down
1 change: 1 addition & 0 deletions Resources/doc/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ Add the following lines in your `deps` file:
[FOSUserBundle]
git=git://github.com/FriendsOfSymfony/FOSUserBundle.git
target=bundles/FOS/UserBundle
version=1.2.0
```

Now, run the vendors script to download the bundle:
Expand Down
8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@
],
"require": {
"php": ">=5.3.2",
"symfony/framework-bundle": "2.*",
"symfony/security-bundle": "2.*"
"symfony/framework-bundle": "2.0.*",
"symfony/security-bundle": "2.0.*"
},
"suggest": {
"symfony/doctrine-bundle": "*",
"symfony/mongodb-odm-bundle": "*",
"symfony/doctrine-bundle": "2.0.*",
"doctrine/mongodb-odm-bundle": "2.0.*",
"doctrine/couchdb-odm-bundle": "*"
},
"autoload": {
Expand Down

0 comments on commit b3dc5fa

Please sign in to comment.