Merge pull request #1105 from CakeDC/feature/14-to-15

fix conflicts and merge latest improvements from 14

Author: ajibarra

.semver

@@ -1,5 +1,5 @@
 ---
-:major: 14
-:minor: 3
-:patch: 4
+:major: 15
+:minor: 0
+:patch: 0
 :special: ''

CHANGELOG.md

@@ -2,6 +2,8 @@ Changelog
 =========
 Releases for CakePHP 5
 -------------
+* 15.0.0
+  * ...
 * 14.3.4
   * Replace usage of 'admin' by UsersTable::ROLE_ADMIN constant across the plugin.
   * Fix role in UsersAddSuperuserCommand to be 'admin' instead of 'superadmin'.

README.md

@@ -12,7 +12,8 @@ Versions and branches
 
 |    CakePHP     |                    CakeDC Users Plugin                     |  Tag   | Notes    |
 |:--------------:|:----------------------------------------------------------:|:------:|:---------|
-|      ^5.0      | [14.3](https://github.com/cakedc/users/tree/14.next-cake5) | 14.3.2 | stable   |
+|      ^5.0      | [15.0](https://github.com/cakedc/users/tree/15.next-cake5) | 15.0.0 | unstable |
+|      ^5.0      | [14.4](https://github.com/cakedc/users/tree/14.next-cake5) | 14.3.4 | stable   |
 |      ^4.5      | [13.0](https://github.com/cakedc/users/tree/13.next-cake4) | 13.0.1 | stable   |
 |      ^5.0      | [12.0](https://github.com/cakedc/users/tree/12.next-cake5) |  12.0  | beta     |
 |      ^4.3      | [11.0](https://github.com/cakedc/users/tree/11.next-cake4) | 11.1.0 | stable   |

resources/locales/cake_d_c_users.pot

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
-"POT-Creation-Date: 2025-01-09 06:42-0600\n"
+"POT-Creation-Date: 2025-01-24 08:05+0000\n"
 "PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n"
 "Last-Translator: NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <EMAIL@ADDRESS>\n"
@@ -494,13 +494,13 @@ msgstr ""
 msgid "This field is required"
 msgstr ""
 
-#: ./vendor/cakedc/users/src/Model/Behavior/SocialAccountBehavior.php:104
-#: ./vendor/cakedc/users/src/Model/Behavior/SocialAccountBehavior.php:134
+#: ./vendor/cakedc/users/src/Model/Behavior/SocialAccountBehavior.php:106
+#: ./vendor/cakedc/users/src/Model/Behavior/SocialAccountBehavior.php:136
 msgid "Account already validated"
 msgstr ""
 
-#: ./vendor/cakedc/users/src/Model/Behavior/SocialAccountBehavior.php:108
-#: ./vendor/cakedc/users/src/Model/Behavior/SocialAccountBehavior.php:139
+#: ./vendor/cakedc/users/src/Model/Behavior/SocialAccountBehavior.php:110
+#: ./vendor/cakedc/users/src/Model/Behavior/SocialAccountBehavior.php:141
 msgid "Account not found for the given token and email."
 msgstr ""