Skip to content

fix conflicts and merge latest improvements from 14 #1105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ajibarra merged 2 commits into from
Jan 24, 2025
+12 −9
Merged

fix conflicts and merge latest improvements from 14 #1105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d391d1
fix conflicts
steinkel Nov 25, 2024
5f687d8
Merge branch '15.next-cake5' into feature/14-to-15
ajibarra Jan 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .semver
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
:major: 14
:minor: 3
:patch: 4
:major: 15
:minor: 0
:patch: 0
:special: ''
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'.
Expand Down
3 changes: 2 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down
10 changes: 5 additions & 5 deletions resources/locales/cake_d_c_users.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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 ""

Expand Down
Loading