[4.2] unification YubiKey vs Yubikey#38036
Merged
roland-d merged 8 commits intojoomla:4.2-devfrom Jun 13, 2022
Merged
Conversation
Member
|
@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? |
Contributor
|
@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. |
Member
|
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
Contributor
|
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. |
Contributor
|
RTC This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/38036. |
Contributor
|
Thanks everybody |
Kostelano
added a commit
to JPathRu/localisation
that referenced
this pull request
Jul 6, 2022
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 +
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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
.