From b884a67da37a494ddd85227ddc2a8fd94a47595d Mon Sep 17 00:00:00 2001 From: Lorenzo Milesi Date: Wed, 7 Feb 2018 17:15:05 +0100 Subject: [PATCH 1/2] Add conflict configuration to composer.json --- composer.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/composer.json b/composer.json index 8280b34..ad582b5 100644 --- a/composer.json +++ b/composer.json @@ -89,6 +89,10 @@ "pattern-skip-version": "(-build|-patch)" } }, + "conflict": { + "dektrium/yii2-rbac": "*", + "dektrium/yii2-user": "*" + }, "extra": { "bootstrap": "Da\\User\\Bootstrap" } From 9acc5d47d98c236f10f04b20340a54d950765f8d Mon Sep 17 00:00:00 2001 From: Lorenzo Milesi Date: Thu, 8 Feb 2018 07:12:59 +0100 Subject: [PATCH 2/2] Added changelog for composer and + --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 39497a0..770507a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ - Bug #125: Fix validation in non-ajax requests (faenir) - Bug #122: Fix wrong email message for email address change (liviuk2) - Bug #102: Implemented password expiration feature (maxxer) +- Introduced "conflict" configuration in composer.json (maxxer) +- Allowed the `+` sign in username (maxxer) ## 1.1.1 - November 27, 2017 - Bug #115: Convert client_id to string because pgsql fail with type convertion (Dezinger)