Merge from upstream v14 #74
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
…frappe#18824) Bumps [socket.io-parser](https://github.com/socketio/socket.io-parser) from 4.0.4 to 4.0.5. - [Release notes](https://github.com/socketio/socket.io-parser/releases) - [Changelog](https://github.com/socketio/socket.io-parser/blob/main/CHANGELOG.md) - [Commits](socketio/socket.io-parser@4.0.4...4.0.5) --- updated-dependencies: - dependency-name: socket.io-parser dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit 104942e) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit ab35ec8) Co-authored-by: AMS Fauzi <33210916+AMSFauzi7869@users.noreply.github.com>
(cherry picked from commit faab012)
* Load from db only if doc passed is not of type Document. This was added earlier to load in case of dicts. ref: frappe#11883 * Move blocks to evaluate only if required * Add typing hints (cherry picked from commit a093b7b) Co-authored-by: gavin <gavin18d@gmail.com>
(cherry picked from commit 19bb792)
(cherry picked from commit 31415bb)
…frappe#18809) * fix : correct inbox view route (frappe#18807) Close frappe#18625 and frappe#14832 More details here : https://discuss.erpnext.com/t/mail-inbox-view-does-not-work-no-mailbox-icon/92143/3?u=jodeq (cherry picked from commit cd7bafa) # Conflicts: # frappe/public/js/frappe/list/list_view_select.js * chore: fix conflict Co-authored-by: JodeQ <jodeq@users.noreply.github.com>
…rappe#18820) * fix: raise exception if doc before save is not found * test: ensure error is raised when trying to save new doc using `doc.save()` * chore: add comment explaining condition * test: clearer name and docstring (cherry picked from commit a42ca7d) Co-authored-by: Sagar Vora <sagar@resilient.tech>
) (cherry picked from commit bfab719) Co-authored-by: jll-02 <63648645+jll-02@users.noreply.github.com>
* perf: faster generate_hash (cherry picked from commit fcaa16b) * refactor: remove `txt` param from generate_hash use (cherry picked from commit f34f703) # Conflicts: # frappe/tests/test_modules.py * chore: conflicts Co-authored-by: Ankush Menat <ankush@frappe.io> Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
(cherry picked from commit 838a523) Co-authored-by: Sagar Vora <sagar@resilient.tech>
…g settings (frappe#18867) (frappe#18869) (cherry picked from commit feb9190) Co-authored-by: Ritwik Puri <ritwikpuri5678@gmail.com>
) (cherry picked from commit 990a96e) Co-authored-by: Ankush Menat <ankush@frappe.io>
chore: release v14
# [14.15.0](frappe/frappe@v14.14.3...v14.15.0) (2022-11-15) ### Bug Fixes * avoid patching QB if already patched ([a8ba877](frappe@a8ba877)) * breadcrumbs is broken ([90ca7b1](frappe@90ca7b1)) * check if the doctype exists before adding default logtypes in log settings ([frappe#18867](frappe#18867)) ([frappe#18869](frappe#18869)) ([93fe3e9](frappe@93fe3e9)) * dashboard view from workspace (backport [frappe#18779](frappe#18779)) ([frappe#18813](frappe#18813)) ([42f5e04](frappe@42f5e04)) * decorator ordering ([2245cc0](frappe@2245cc0)) * dont allow reading attributes of unsafe objects (backport [frappe#18706](frappe#18706)) ([frappe#18806](frappe#18806)) ([2b193bd](frappe@2b193bd)), closes [frappe#18784](frappe#18784) * hardcode doctype in google oauth callback ([frappe#18862](frappe#18862)) ([78a337b](frappe@78a337b)) * page has an empty menu button ([b2bbcde](frappe@b2bbcde)) * raise exception if doc before save is not found ([frappe#18796](frappe#18796)) ([frappe#18820](frappe#18820)) ([7505a0d](frappe@7505a0d)) * reportview permlevel bug ([frappe#18822](frappe#18822)) ([frappe#18828](frappe#18828)) ([ec248a9](frappe@ec248a9)) * **security:** prevent xss attack in search ([frappe#18847](frappe#18847)) ([frappe#18850](frappe#18850)) ([8807035](frappe@8807035)) ### Features * Set default SQL statement timeouts ([8ab95f4](frappe@8ab95f4)) * show utilization percent on RQ Worker ([frappe#18868](frappe#18868)) ([frappe#18870](frappe#18870)) ([a7060fa](frappe@a7060fa)) ### Performance Improvements * faster as_list and as_dict ([33d6369](frappe@33d6369)) * faster generate_hash (backport [frappe#18825](frappe#18825)) ([frappe#18851](frappe#18851)) ([bb5c7d5](frappe@bb5c7d5)) * **workflow:** get_transitions ([frappe#18834](frappe#18834)) ([frappe#18839](frappe#18839)) ([3f71181](frappe@3f71181)) ### Reverts * async await in breadcrumbs.js ([6a1e619](frappe@6a1e619))
(cherry picked from commit 425e4bf) Co-authored-by: Sagar Vora <sagar@resilient.tech>
…rappe#18848) (frappe#18883) * refactor: Use safer hashing algorithm for verified_command (frappe#18848) (cherry picked from commit ba27434) * refactor: hmac generation Reduce code duplication Co-authored-by: Ankush Menat <ankush@frappe.io>
(cherry picked from commit 0d5d2cf) Co-authored-by: Ankush Menat <ankush@frappe.io>
[skip ci] (cherry picked from commit 6428930) Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com>
(cherry picked from commit f3c00c2) Co-authored-by: Sagar Vora <sagar@resilient.tech>
…18911) * fix(file): attached_to_name can be an integer incorrect validation introduces via frappe#18880 * test(file): set correct fieldname * fix: check for str, int explicitly (cherry picked from commit edf01ee) Co-authored-by: Faris Ansari <netchampfaris@users.noreply.github.com>
…fix/pr-19407 fix(subscription): Allow remote_login even if subscription.expiry is not set (backport frappe#19407)
(cherry picked from commit 8ea093b)
…fix/pr-19411 fix(minor): dont set autoincrement autoname by default for child table (backport frappe#19411)
…appe#19420) (cherry picked from commit a72fdcb) Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
chore: release v14
# [14.21.0](frappe/frappe@v14.20.0...v14.21.0) (2022-12-27) ### Bug Fixes * Allow emailing disabled user ([frappe#19382](frappe#19382)) ([frappe#19383](frappe#19383)) ([fb7f645](frappe@fb7f645)) * **error snapshot:** fix seen update qeury in error snapshot to work with postgres ([frappe#19373](frappe#19373)) ([frappe#19374](frappe#19374)) ([0ab6a30](frappe@0ab6a30)) * **minor:** dont set autoincrement autoname by default for child table ([8ff3f4c](frappe@8ff3f4c)) * not able to make delivery note from pick list ([frappe#19418](frappe#19418)) ([frappe#19420](frappe#19420)) ([d2d776c](frappe@d2d776c)) * shift-select checkboxes ranges ([frappe#19367](frappe#19367)) ([frappe#19368](frappe#19368)) ([bd79b03](frappe@bd79b03)) * **subscription:** Allow remote_login even if subscription.expiry is not set ([1d777dc](frappe@1d777dc)) ### Features * hook `ignore_links_on_delete` to skip doctypes on delete ([frappe#19347](frappe#19347)) ([frappe#19356](frappe#19356)) ([a457447](frappe@a457447))
…#19422) (frappe#19432) * fix(socketio)!: Event list_update > doctype_subscribe (cherry picked from commit c960382) # Conflicts: # frappe/realtime.py * chore: resolve conflict Co-authored-by: Gavin D'souza <gavin18d@gmail.com>
…frappe#19398) (frappe#19402) Signed-off-by: Sabu Siyad <hello@ssiyad.com> Signed-off-by: Sabu Siyad <hello@ssiyad.com> (cherry picked from commit 5e6ac70) Co-authored-by: Sabu Siyad <hello@ssiyad.com>
…ubject (cherry picked from commit 384c01b)
(cherry picked from commit 7eb31f1)
(cherry picked from commit 0e40dff) Co-authored-by: Sagar Vora <sagar@resilient.tech>
(cherry picked from commit ef82ef9) Co-authored-by: Gavin D'souza <gavin18d@gmail.com>
(cherry picked from commit 7fdcafd)
(cherry picked from commit d072e20)
…fix/pr-19395 chore: remove code for handling old dict-based meta cache (backport frappe#19395)
This is static data present in code, no need to apply permissions. closes frappe#19394 (cherry picked from commit 5ece1d7) Co-authored-by: Ankush Menat <ankush@frappe.io>
…rappe#19454) * fix: prevent emails from being queued multiple times * style: fmt * refactor: optimistic error handling - Combined email queue sending to single call instead of different branches for testing. - If failing to get jobs -> attempt sending anyway. Failure could be form one bad job which shouldn't completely stop everything. * chore: type Co-authored-by: Ankush Menat <ankush@frappe.io> (cherry picked from commit 6b0950e) Co-authored-by: stephen <stephenBDT@users.noreply.github.com>
(cherry picked from commit 048de26)
(cherry picked from commit f1553c4)
(cherry picked from commit e96ce83)
(cherry picked from commit 81066d7)
…fix/pr-19458 fix: only allow system manager to create/edit email templates by default (backport frappe#19458)
* refactor: OAuth * Added typing hints for Oauth APIs and dependant utils * Simplify oauth core flows * Remove long commented code * Use newer, simpler syntax for better readability (cherry picked from commit d13c377) * chore(oauth): Make provider typing optional in redirect_post_login Co-authored-by: Ritwik Puri <ritwikpuri5678@gmail.com> (cherry picked from commit 2571876) * chore: add positional args back to login_oauth_user Co-authored-by: Gavin D'souza <gavin18d@gmail.com>
chore: release v14
## [14.21.1](frappe/frappe@v14.21.0...v14.21.1) (2023-01-04) ### Bug Fixes * Allow everyone to read geo data ([frappe#19451](frappe#19451)) ([frappe#19457](frappe#19457)) ([54eecce](frappe@54eecce)) * build_response for re.Match ([frappe#19442](frappe#19442)) ([c3729c7](frappe@c3729c7)) * don't set default in list view for fields not allowed ([373234d](frappe@373234d)) * **link/js:** handle undefined `link_title_doctypes` in `frappe.boot` ([frappe#19398](frappe#19398)) ([frappe#19402](frappe#19402)) ([f314e58](frappe@f314e58)) * only allow system manager to create email templates ([f46a649](frappe@f46a649)) * prevent emails from being queued multiple times ([frappe#19386](frappe#19386)) ([frappe#19454](frappe#19454)) ([21b84a4](frappe@21b84a4)) * show document title instead of name in like notification email subject ([41af70d](frappe@41af70d)) * **socketio:** Event list_update > doctype_subscribe (backport [frappe#19422](frappe#19422)) ([frappe#19432](frappe#19432)) ([4529e6d](frappe@4529e6d)) * **test:** override fields of test doctype if passed ([8a86a8c](frappe@8a86a8c)) * use title instead of name in message body too ([5878b53](frappe@5878b53))
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: