Merge from upstream v13 #52
Merged
Conversation
This file contains 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
(cherry picked from commit bf68f76)
(cherry picked from commit 93ae700)
(cherry picked from commit 5e2bfbd)
# Conflicts: # frappe/core/doctype/file/test_file.py
…#15614) (frappe#15812) * fix(ux): show report button on too many writes error (frappe#15614) * feat: log errors on too many writes to ease debugging * fix(ux): extract and show which app/file/function caused too many writes * fix: postgres error checking assumes exception is postgres exception * fix: better default for skipping frames Typically stack is like: some_app -> your_function -> this function. So last 2 frames need to be skipped. * fix: postgres error checking assumes exception is postgres exception * fix: better default for skipping frames Typically stack is like: some_app -> your_function -> this function. So last 2 frames need to be skipped. * refactor: show Report button instead of logging * revert: unnecessary new functionality * test: assert exact exception Co-authored-by: Ankush Menat <ankush@frappe.io> (cherry picked from commit bd8ac90) * chore: space -> tabs * test: skip on postgres this doesn't work on v13 branch because writes check is completely ignored right now Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com> Co-authored-by: Ankush Menat <ankush@frappe.io>
…racters (cherry picked from commit af5e909) # Conflicts: # frappe/core/doctype/doctype/doctype.py
(cherry picked from commit 85680cc)
(cherry picked from commit 749ace6)
- Empty values for link field is invalid and causes issue mentioned here frappe#15320
(cherry picked from commit 21b997b)
(cherry picked from commit 12c7f2a)
(cherry picked from commit d5f5b07)
(cherry picked from commit 962a373)
fix(render): Check if valid file instead of path [v13]
(cherry picked from commit ddd45a7)
(cherry picked from commit f0a10ef)
(cherry picked from commit a49a07e)
(cherry picked from commit d8fc396)
(cherry picked from commit f777700)
(cherry picked from commit a18703a)
(cherry picked from commit e21275f)
(cherry picked from commit 976c3be)
…fix/pr-15918 feat: Allow all users to customize reports of type Report Builder (backport frappe#15918)
(cherry picked from commit dce336f)
Co-authored-by: Wolfram Schmidt <wolfram.schmidt@phamos.eu>
…rappe#15832) (frappe#15942) Co-authored-by: Pruthvi Patel <pruthvipatel145@gmail.com> Co-authored-by: Sagar Vora <sagar@resilient.tech>
…rappe#15969) (frappe#15974) Co-authored-by: Shariq Ansari <sharique.rik@gmail.com> Co-authored-by: Shariq Ansari <30859809+shariquerik@users.noreply.github.com>
…fix-to-pre-release-for-13-21 chore: Merge branch 'version-13-hotfix' into 'version-13-pre-release'
(cherry picked from commit cdf092b)
…-release/pr-15982 fix: libsass issue with `min()` (backport frappe#15982)
(cherry picked from commit 1e4b397)
…-release/pr-16035 chore: bump jinja (backport frappe#16035)
…13-21 chore: change log for v13.21.0
Bug Fixes
Tests
FeaturesChore
Code RefactoringContributorsruthra-kumar, hrwX, surajshetty3416, gavindsouza, mergify[bot], shariquerik, nabinhait Commit-Lint commandsYou can trigger Commit-Lint actions by commenting on this PR:
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Changelogs: