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

fix: Backport missing commits from version-13 to develop #12845

Merged
merged 419 commits into from
Apr 14, 2021

Conversation

nabinhait
Copy link
Member

No description provided.

gavindsouza and others added 30 commits August 3, 2020 05:59
(cherry picked from commit f04ce5d)
…a-pre-release/pr-11026

fix: frappe.logger site validation (bp frappe#11026)
…1170) (frappe#11179)

Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
(cherry picked from commit 4b93f75)
…a-pre-release/pr-11182

fix: Log site only if exists (bp frappe#11182)
… (frappe#11187)

(cherry picked from commit 6453317)

Co-authored-by: Prssanna Desai <prssud@gmail.com>
…pe#11120) (frappe#11188)

(cherry picked from commit 9b26702)

Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
)

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
…appe#11150)

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
frappe#11204)

* feat: Add validate_and_sanitize_search_inputs decorator

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

* refactor: Move validate_and_sanitize_search_inputs to init

* refactor: Move validate_and_sanitize_search_inputs to search.py

* test: validate_and_sanitize_search_inputs decorator

* chore: Add wrapt module

* refactor: Use @wrapt to define validate_and_sanitize_search_inputs decorator

* test: Add a case to make sure frappe.call works as well

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
(cherry picked from commit cd1ab8e)

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
…frappe#11197) (frappe#11205)

* fix: Validate and sanitize whitelisted search methods using decorator

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

* refactor: Replace decorator name

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
(cherry picked from commit 21a0caf)

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Co-authored-by: Shivam Mishra <scm.mymail@gmail.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
(cherry picked from commit 64f913f)
Co-authored-by: Afshan <afshan13k@gmail.com>
…11471)

(cherry picked from commit 40748d7)

Co-authored-by: Shivam Mishra <scm.mymail@gmail.com>
…rappe#11782)

(cherry picked from commit 00310ea)

Co-authored-by: Sumit Bhanushali <sumit.bhanushali63@gmail.com>
surajshetty3416 and others added 24 commits April 1, 2021 18:36
- Used correct df where get_route_options_for_new_doc
function is attached

It stopped working after frappe#12744

(cherry picked from commit e25fae3)
…-release/pr-12770

fix: get_route_options_for_new_doc in link field (bp frappe#12770)
Make get_count work with join queries

(cherry picked from commit 566f8ba)
…-release/pr-12774

fix: get_count API endpoint (bp frappe#12774)
(cherry picked from commit 86ddc1b)
…-release/pr-12779

fix: use reload_doc instead of reload_doctype (bp frappe#12779)
…-release/pr-12783

fix: Reload website_theme_ignore_app before Website Theme (bp frappe#12783)
…-release/pr-12794

fix: Check if df.options exists before setting docfields (bp frappe#12794)
frappe#12802)

(cherry picked from commit 13e7f45)

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
@nabinhait nabinhait changed the title fix: Backport missing commits fix: Backport missing commits from version-13 to develop Apr 14, 2021
@nabinhait nabinhait merged commit 10b8e9e into frappe:develop Apr 14, 2021
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Dec 1, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet