leonardo/yii2-usuario
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #143 from maxxer/fix-composer

Browse Source 
Add conflict configuration to composer.json
This commit is contained in:
Antonio Ramirez
2018-02-08 08:21:11 +01:00
committed by GitHub
parent 106019f30f 605dd4e013
commit 46b8b0ab0d
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -7,6 +7,8 @@
- Bug #125: Fix validation in non-ajax requests (faenir) - Bug #125: Fix validation in non-ajax requests (faenir)
- Bug #122: Fix wrong email message for email address change (liviuk2) - Bug #122: Fix wrong email message for email address change (liviuk2)
- Bug #102: Implemented password expiration feature (maxxer) - Bug #102: Implemented password expiration feature (maxxer)
- Enh #143: Introduced "conflict" configuration in composer.json (maxxer)
- Enh #145: Allowed the `+` sign in username (maxxer)
- Bug #9: Documentation about migration from Dektrium tools (maxxer) - Bug #9: Documentation about migration from Dektrium tools (maxxer)
## 1.1.1 - November 27, 2017 ## 1.1.1 - November 27, 2017

4
composer.json
View File

@ -89,6 +89,10 @@
"pattern-skip-version": "(-build|-patch)" "pattern-skip-version": "(-build|-patch)"
} }
}, },
"conflict": {
"dektrium/yii2-rbac": "*",
"dektrium/yii2-user": "*"
},
"extra": { "extra": {
"bootstrap": "Da\\User\\Bootstrap" "bootstrap": "Da\\User\\Bootstrap"
} }