fix(login): Escape translated strings (backport #24431) #24700
Merged
Conversation
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
* Use `tojson` instead of `json` Jinja filter (cherry picked from commit 11baf6e) # Conflicts: # frappe/templates/includes/login/login.js
6db369e to
60301b7
Compare
frappe-pr-bot
pushed a commit
that referenced
this pull request
Feb 14, 2024
# [14.66.0](v14.65.0...v14.66.0) (2024-02-14) ### Bug Fixes * Abort flushing email queue if >50% fail. ([c825035](c825035)) * add default timezone for Tanzania ([c1599f3](c1599f3)) * Added Mongolian language ([#24803](#24803)) ([#24848](#24848)) ([7e02dd8](7e02dd8)) * Avoid sending password back ([#24794](#24794)) ([#24795](#24795)) ([3335bf3](3335bf3)) * check param type in mark_as_seen(note) ([52ebde3](52ebde3)) * console import progress off-by-one ([#24777](#24777)) ([#24786](#24786)) ([12234ab](12234ab)) * **DX:** show user who modified in diff view ([#24790](#24790)) ([#24791](#24791)) ([3859f42](3859f42)) * flush emails from single background jobs ([e833346](e833346)) * Ignore "Invalid Doctype" validation if ignore flag is passed (backport [#24818](#24818)) ([#24821](#24821)) ([87c2600](87c2600)) * **login:** Escape translated strings (backport [#24431](#24431)) ([#24700](#24700)) ([9f4b39c](9f4b39c)) * preferred_language cookie ([#24819](#24819)) ([#24826](#24826)) ([6369301](6369301)) * remove _ from frappe.model.std_fields (Backport [#24662](#24662)) ([#24881](#24881)) ([0c74d2f](0c74d2f)) ### Features * add style & onEachFeature function for geojson in geolocation controller ([#21322](#21322)) ([8e9b4be](8e9b4be)) * frapp.model.can_submit (JS) ([2a28d04](2a28d04)) * Jinja syntax highlighting (backport [#23760](#23760)) ([#24834](#24834)) ([fbf7b1c](fbf7b1c)) ### Performance Improvements * faster workflow action processing (backport [#24862](#24862)) ([#24865](#24865)) ([e01c11d](e01c11d)) * skip ifnull checks on `modified` field ([#24042](#24042)) ([#24813](#24813)) ([56a9579](56a9579)) * use unique file url ([#24830](#24830)) ([#24835](#24835)) ([34e2022](34e2022))
|
🎉 This PR is included in version 14.66.0 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
This is an automatic backport of pull request #24431 done by Mergify.
Cherry-pick of 11baf6e has failed:
To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally
Mergify commands and options
More conditions and actions can be found in the documentation.
You can also trigger Mergify actions by commenting on this pull request:
@Mergifyio refreshwill re-evaluate the rules@Mergifyio rebasewill rebase this PR on its base branch@Mergifyio updatewill merge the base branch into this PR@Mergifyio backport <destination>will backport this PR on<destination>branchAdditionally, on Mergify dashboard you can:
Finally, you can contact us on https://mergify.com