Skip to content
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

feat: Translate PWA (backport #1856) #2330

Merged
merged 11 commits into from
Oct 23, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 23, 2024

Please close if this would represent too much of a burden. I open this prototype PR to maybe interest the team into translating the PWA, as it is now used/useable in production.

Depends on frappe/frappe#24435

no-docs


This is an automatic backport of pull request #1856 done by Mergify.

cogk and others added 9 commits October 23, 2024 10:19
(cherry picked from commit 3712878)

# Conflicts:
#	hrms/www/hrms.py
(cherry picked from commit 95a0dee)
(cherry picked from commit 5465aa0)
@mergify mergify bot requested a review from ruchamahabal as a code owner October 23, 2024 10:20
@mergify mergify bot added the conflicts label Oct 23, 2024
Copy link
Contributor Author

mergify bot commented Oct 23, 2024

Cherry-pick of 3712878 has failed:

On branch mergify/bp/version-15-hotfix/pr-1856
Your branch is ahead of 'origin/version-15-hotfix' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 371287843.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   hrms/www/hrms.py

no changes added to commit (use "git add" and/or "git commit -a")

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

@krantheman krantheman merged commit a16a2f5 into version-15-hotfix Oct 23, 2024
7 checks passed
@krantheman krantheman deleted the mergify/bp/version-15-hotfix/pr-1856 branch October 23, 2024 10:59
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 15.34.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants