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.
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
[4.2] unification YubiKey vs Yubikey #38036
Conversation
@roland-d Should @tecpromotion revert the changes in the 2 "plg_twofactorauth_yubikey*.ini" files because those will be merged up later from 4.1-dev when his PR #38037 has bee merged into the 4.1-dev branch, and having the same changes here will cause a merge conflict? Or are you ok with that? |
@richard67 That should be OK, because the same lines are changed Git will know what to do with it. If not, I can fix the merge conflict, should be easy. |
I have tested this item ✅ successfully on 9438f51 This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/38036. |
1 similar comment
I have tested this item ✅ successfully on 9438f51 This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/38036. |
RTC This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/38036. |
Thanks everybody |
joomla/joomla-cms#36591 + joomla/joomla-cms#37362 + joomla/joomla-cms#37404 - (позже был Revert PR) joomla/joomla-cms#37453 + joomla/joomla-cms#37583 + joomla/joomla-cms#37459 + joomla/joomla-cms#36751 + joomla/joomla-cms#36752 + joomla/joomla-cms#37912 + joomla/joomla-cms#37838 + joomla/joomla-cms#38002 + joomla/joomla-cms#38036 - (только для en-GB, у нас давно исправлено) joomla/joomla-cms#38009 + joomla/joomla-cms#38064 + joomla/joomla-cms#37911 + joomla/joomla-cms#38065 + joomla/joomla-cms#38075 + joomla/joomla-cms#38071 + joomla/joomla-cms#38080 + joomla/joomla-cms#38082 + joomla/joomla-cms#38092 + joomla/joomla-cms#38113 + joomla/joomla-cms#38121 + joomla/joomla-cms#37910 + joomla/joomla-cms#38165 + joomla/joomla-cms#37747 +
Summary of Changes
Unified spelling of the word YubiKey.
Testing Instructions
.
Actual result BEFORE applying this Pull Request
Mix of YubiKey and Yubikey
Expected result AFTER applying this Pull Request
YubiKey
Documentation Changes Required
.