[4.1] Upmerges from 3.x 2022-05-01#37704
Merged
bembelimen merged 15 commits intojoomla:4.1-devfrom May 1, 2022
Merged
Conversation
* Upgrade not downgrade appveyor * 0.11.1 is out! * Fixes Co-authored-by: Tobias Zulauf <zero-24@users.noreply.github.com>
Co-authored-by: Tobias Zulauf <zero-24@users.noreply.github.com>
* fix confirm request label * better wording thanks @brianteeman Co-authored-by: Brian Teeman <brian@teeman.net> Co-authored-by: Brian Teeman <brian@teeman.net>
* make sure there is a generic message in non-debug mode. * send an mail for super User resets and add the docs page * Update language/en-GB/en-GB.com_users.ini Co-authored-by: Brian Teeman <brian@teeman.net> * Update language/en-GB/en-GB.com_users.ini Co-authored-by: Brian Teeman <brian@teeman.net> * Update language/en-GB/en-GB.com_users.ini Co-authored-by: Brian Teeman <brian@teeman.net> * Update components/com_users/controllers/remind.php Co-authored-by: Brian Teeman <brian@teeman.net> * Update language/en-GB/en-GB.com_users.ini Co-authored-by: Brian Teeman <brian@teeman.net> * remove strings * update branch * Update reset.php * Update en-GB.com_users.ini * Update reset.php
1. No need to translate Last-Modified header 2. Append " GMT" to date format Co-authored-by: Allon Moritz <allon.moritz@digital-peak.com> Co-authored-by: Tobias Zulauf <zero-24@users.noreply.github.com>
Co-authored-by: zero-24 <zero-24@users.noreply.github.com>
…rges/2022-05-01 # Conflicts: # administrator/manifests/files/joomla.xml # libraries/src/Version.php
…rges/2022-05-01 # Conflicts: # administrator/language/en-GB/en-GB.xml # administrator/language/en-GB/install.xml # administrator/manifests/files/joomla.xml # administrator/manifests/packages/pkg_en-GB.xml # installation/language/en-GB/en-GB.xml # language/en-GB/en-GB.xml # language/en-GB/install.xml # libraries/src/Version.php
…rges/2022-05-01 # Conflicts: # .appveyor.yml
…rges/2022-05-01 # Conflicts: # administrator/language/en-GB/en-GB.plg_system_privacyconsent.ini # administrator/language/en-GB/en-GB.plg_user_profile.ini # plugins/system/privacyconsent/privacyconsent/privacyconsent.xml # plugins/user/profile/profiles/profile.xml
…rges/2022-05-01 # Conflicts: # language/en-GB/en-GB.com_privacy.ini
…rges/2022-05-01 # Conflicts: # components/com_users/controllers/remind.php # components/com_users/controllers/reset.php # components/com_users/models/reset.php # language/en-GB/en-GB.com_users.ini # libraries/src/Application/WebApplication.php
# Conflicts: # libraries/fof/download/adapter/cacert.pem # libraries/src/Http/Transport/cacert.pem
Contributor
|
I have tested this item ✅ successfully on 4e95015 This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/37704. |
Kostelano
added a commit
to JPathRu/localisation
that referenced
this pull request
May 2, 2022
joomla/joomla-cms#37115 + joomla/joomla-cms#37286 + (отдельно в 857dcac) joomla/joomla-cms#37464 + joomla/joomla-cms#36250 + joomla/joomla-cms#37527 + joomla/joomla-cms#37535 - (только для en-GB) joomla/joomla-cms#37559 + joomla/joomla-cms#37594 - (только для en-GB) joomla/joomla-cms#37588 + joomla/joomla-cms#37424 - (только для en-GB, у нас все в одном формате с другими расширениями) joomla/joomla-cms#37475 - (только для en-GB, у нас давно исправлено) joomla/joomla-cms#37564 + joomla/joomla-cms#37641 - (только для en-GB) joomla/joomla-cms#37657 + joomla/joomla-cms#37683 + joomla/joomla-cms#37666 + joomla/joomla-cms#37704 + joomla/joomla-cms#37689 + joomla/joomla-cms#37519 +
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
8 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.
Pull Request for Issue # .
Summary of Changes
Testing Instructions
Actual result BEFORE applying this Pull Request
Expected result AFTER applying this Pull Request
Documentation Changes Required