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

Merge from upstream v14 #88

Merged
merged 780 commits into from
Apr 2, 2024

Conversation

@Alchez Alchez requested a review from vjFaLk November 14, 2023 09:40
Copy link

commit-lint bot commented Nov 14, 2023

Features

Bug Fixes

Code Refactoring

Tests

Contributors

GursheenK, shariquerik, mergify[bot]

Commit-Lint commands

You can trigger Commit-Lint actions by commenting on this PR:

  • @Commit-Lint merge patch will merge dependabot PR on "patch" versions (X.X.Y - Y change)
  • @Commit-Lint merge minor will merge dependabot PR on "minor" versions (X.Y.Y - Y change)
  • @Commit-Lint merge major will merge dependabot PR on "major" versions (Y.Y.Y - Y change)
  • @Commit-Lint merge disable will desactivate merge dependabot PR
  • @Commit-Lint review will approve dependabot PR
  • @Commit-Lint stop review will stop approve dependabot PR

barredterra and others added 28 commits February 5, 2024 11:58
This feature was accidentally removed in frappe#23096
…-v14

fix: show folders in Google Drive Picker (backport frappe#24386)
PS: This will automatically make it mandatory because you can't have multiple default values of `0`.

close frappe#19287

(cherry picked from commit 8f23dfc)

Co-authored-by: Ankush Menat <ankush@frappe.io>
feat: Letterhead Scripts & fix disappearing header in pdf
…rappe#24761) (frappe#24762)

* fix: Use `TEXT` type for Webhook URLs to support large URLs

(cherry picked from commit 063e309)

# Conflicts:
#	frappe/integrations/doctype/webhook/webhook.json
#	frappe/integrations/doctype/webhook/webhook.py

* chore: conflicts

---------

Co-authored-by: Ankush Menat <ankush@frappe.io>
(cherry picked from commit b418dba)
…fix/pr-24765

ci: switch to ruff-format (backport frappe#24765)
GHSA-3ww4-gg4f-jr7f

Signed-off-by: Akhil Narang <me@akhilnarang.dev>
(cherry picked from commit ddcf654)

# Conflicts:
#	pyproject.toml
# [14.65.0](frappe/frappe@v14.64.0...v14.65.0) (2024-02-06)

### Bug Fixes

* Allow int fields to be unique ([frappe#24750](frappe#24750)) ([frappe#24755](frappe#24755)) ([7f19ea2](frappe@7f19ea2))
* Check if header/footer html exists before trying to extract ([c1dc4b9](frappe@c1dc4b9))
* Custom Script runs twice ([a70de37](frappe@a70de37))
* data import table UI fix ([d3d3354](frappe@d3d3354))
* do not allow to set if_owner & report perm together ([40a0065](frappe@40a0065))
* enable syntax highlighting for `PythonExpression` code fields ([frappe#24669](frappe#24669)) ([frappe#24670](frappe#24670)) ([666040c](frappe@666040c))
* Enqueue deletion of dynamic link after comitting ([frappe#24674](frappe#24674)) ([9eb9878](frappe@9eb9878))
* Extract header/footer html into `content` to simplify things ([2d11989](frappe@2d11989))
* **js:** Handle hidden virtual fields ([frappe#24405](frappe#24405)) ([frappe#24691](frappe#24691)) ([50c18ab](frappe@50c18ab))
* Make as_iterator work when there are no child queries ([frappe#24748](frappe#24748)) ([40d5741](frappe@40d5741))
* make rate_limiter respect multitenancy (backport [frappe#24634](frappe#24634)) ([frappe#24635](frappe#24635)) ([e49a5a0](frappe@e49a5a0))
* Missing `footer_html ` declaration ([d75dfef](frappe@d75dfef))
* outgoing email account handlng (backport [frappe#24656](frappe#24656)) ([frappe#24685](frappe#24685)) ([9ba3c9e](frappe@9ba3c9e))
* short circuit private files perm check ([b2d105a](frappe@b2d105a))
* show folders in Google Drive Picker ([e5f1137](frappe@e5f1137)), closes [frappe#23096](frappe#23096)
* Show proper error message for prepared report failure ([frappe#24733](frappe#24733)) ([frappe#24736](frappe#24736)) ([379d893](frappe@379d893))
* Skip fulltext indexes during sync ([frappe#24728](frappe#24728)) ([frappe#24732](frappe#24732)) ([1a8e049](frappe@1a8e049))
* Translate Letterhead information string ([00c4b77](frappe@00c4b77))
* typeerror in onboarding_tours.js ([7cca45f](frappe@7cca45f))
* Use `TEXT` type for Webhook URLs to support large URLs (backport [frappe#24761](frappe#24761)) ([frappe#24762](frappe#24762)) ([e5ff86a](frappe@e5ff86a))
* virtual fields are never writable ([frappe#24693](frappe#24693)) ([frappe#24695](frappe#24695)) ([22e26f6](frappe@22e26f6))

### Features

* Dynamic headers/footers & fix disappearing header ([343ac16](frappe@343ac16))
* Include letterhead scripts in print (html) ([5321e5d](frappe@5321e5d))

### Performance Improvements

* optional faster perm check for files (backport [frappe#24624](frappe#24624)) ([frappe#24630](frappe#24630)) ([6778fe2](frappe@6778fe2))
(cherry picked from commit 679287a)
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
* fix: importer console progress off-by-one

* fix: improve progress message

* chore: typo

---------

Co-authored-by: Robert Duncan <robir@puter.local>
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
(cherry picked from commit d6b126a)

Co-authored-by: Robert Duncan <74115869+robproject@users.noreply.github.com>
…fix/pr-24778

chore(deps): bump cryptography (backport frappe#24778)
…4791)

(cherry picked from commit 7753ed2)

Co-authored-by: Ankush Menat <ankush@frappe.io>
(cherry picked from commit ca3ef81)

Co-authored-by: Ankush Menat <ankush@frappe.io>
…4813)

(cherry picked from commit 64c2213)

# Conflicts:
#	frappe/model/db_query.py

Co-authored-by: Ankush Menat <ankush@frappe.io>
When email queue batch failes >33% with >10 count, frappe will now abort
sending emails.

We already notify users via system notification so this
assumes that user will notice it and fix it in sometime.

With previous commits we also prioritize fresh emails over retries.
…ckport frappe#24818) (frappe#24821)

* fix: Ignore "Invalid Doctype" validation if ignore flag is passed

(cherry picked from commit 803c022)

* fix: Unset contact_name to avoid linking of contact in case of failure

(cherry picked from commit 7991c89)

* test: use known functions for testing

Random functions can have annotations but no annotations on arguments

(cherry picked from commit ef923e4)

# Conflicts:
#	frappe/tests/test_utils.py

* chore: conflicts

---------

Co-authored-by: Suraj Shetty <surajshetty3416@gmail.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
…fix/pr-23075

fix: too many concurrent connections for email sending
(in v15+ the type annotation is enough)
(cherry picked from commit 4ceb5c3)

Co-authored-by: lbrandh <87182868+lbrandh@users.noreply.github.com>
ankush and others added 29 commits March 20, 2024 17:05
form_dict is usually _dict, otherwise some unrelated tests will fail.
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
… (frappe#25556)

* feat: connect to redis sentinel for redis queue

(cherry picked from commit e9ece3b)

# Conflicts:
#	frappe/utils/redis_queue.py

* refactor: resolve conflict

---------

Co-authored-by: Revant Nandgaonkar <revant.one@gmail.com>
…backend

feat: backport export CSV server-side instead of client-side
Got removed in frappe#25463

Signed-off-by: Akhil Narang <me@akhilnarang.dev>
## [14.68.1](frappe/frappe@v14.68.0...v14.68.1) (2024-03-21)

### Bug Fixes

* add missing import ([beb2f22](frappe@beb2f22)), closes [frappe#25463](frappe#25463)
…needed (frappe#25578)

This just prevented us from discovering actual errors

Signed-off-by: Akhil Narang <me@akhilnarang.dev>
(cherry picked from commit 296ef1f)

Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
(cherry picked from commit a9ebf58)

Co-authored-by: Ankush Menat <ankush@frappe.io>
(cherry picked from commit a12fc11)

Co-authored-by: Ankush Menat <ankush@frappe.io>
…rappe#25596)

(cherry picked from commit 4fe0498)

Co-authored-by: Ankush Menat <ankush@frappe.io>
frappe#25522)" (frappe#25604) (frappe#25607)

This reverts commit e446770.

(cherry picked from commit 0bf0cb8)

Co-authored-by: Ankush Menat <ankush@frappe.io>
…ature

Signed-off-by: Akhil Narang <me@akhilnarang.dev>
(cherry picked from commit 766d2ae)
Signed-off-by: Akhil Narang <me@akhilnarang.dev>
…fix/pr-25599

feat: allow setting a custom rate limit for `login via email link` feature (backport frappe#25599)
(cherry picked from commit 457f5bf)

# Conflicts:
#	frappe/www/contact.py
…rappe#25621)

Ideally, this query should be converted to "Top N" variant and just pick
first 20 records, join only them with other table and send data back.

Currently we always group by `name` in list view. This makes "show title
in link field" join queries insanely slow as it first queries entire
table and then applies limit.

(cherry picked from commit bad3b9e)

Co-authored-by: Ankush Menat <ankush@frappe.io>
(cherry picked from commit 8ee2850)

Co-authored-by: Ankush Menat <ankush@frappe.io>
…pe#25635)

(cherry picked from commit 4f205e2)

# Conflicts:
#	frappe/desk/search.py

Co-authored-by: Ankush Menat <ankush@frappe.io>
…fix/pr-25614

fix(Contact form): make email content translatable (backport frappe#25614)
# [14.69.0](frappe/frappe@v14.68.2...v14.69.0) (2024-03-27)

### Bug Fixes

* allow page length 2500 ([frappe#25062](frappe#25062)) ([d40a169](frappe@d40a169))
* **Contact form:** make email translatable ([1a794df](frappe@1a794df))
* **Contact form:** make title and options translatable ([6d731fa](frappe@6d731fa))
* **Contact form:** translate internal notification to system language ([2b2cf83](frappe@2b2cf83))
* DB Query distinct handling with full table name ([frappe#25594](frappe#25594)) ([frappe#25596](frappe#25596)) ([d201326](frappe@d201326))
* diff after converting to html to text ([frappe#25582](frappe#25582)) ([frappe#25583](frappe#25583)) ([68d6947](frappe@68d6947))
* don't parse CSV params for Excel ([87c6fc6](frappe@87c6fc6))
* duplicate translation of field labels ([471ad26](frappe@471ad26))
* fieldname referenced before assignment ([95a0db8](frappe@95a0db8))
* **lint:** v14 doesn't have typed doctype classes, so this was never needed ([frappe#25578](frappe#25578)) ([e343a32](frappe@e343a32))
* Mark totals row correctly for print ([frappe#25629](frappe#25629)) ([frappe#25630](frappe#25630)) ([a902f6d](frappe@a902f6d))
* only add title field in search if it exists ([frappe#25634](frappe#25634)) ([frappe#25635](frappe#25635)) ([446c4d6](frappe@446c4d6))
* pop from form_params ([377b35c](frappe@377b35c))
* ruff fixes ([8ecc7d9](frappe@8ecc7d9))
* test reportview ([bb5c3a1](frappe@bb5c3a1))

### Features

* add csv preview ([d89a126](frappe@d89a126))
* add test for exporting reportview as CSV ([4eb31e0](frappe@4eb31e0))
* add translation context ([88cfe4b](frappe@88cfe4b))
* allow setting a custom rate limit for `login via email link` feature ([b7a1da5](frappe@b7a1da5))
* connect to redis sentinel for redis queue (backport [frappe#25506](frappe#25506)) ([frappe#25556](frappe#25556)) ([a9ee773](frappe@a9ee773))
* CSV params for query report ([7493c4e](frappe@7493c4e))
* CSV params for report view ([9f14d65](frappe@9f14d65))
* german translations for export dialog ([eab535d](frappe@eab535d))
* hide csv settings in collapsible section ([efb70be](frappe@efb70be))
* preview real data ([91b20b8](frappe@91b20b8))

### Performance Improvements

* Faster "show title in link field" on list view ([frappe#25597](frappe#25597)) ([frappe#25621](frappe#25621)) ([7df36f6](frappe@7df36f6))
* remove useless sorting on docstatus ([frappe#25571](frappe#25571)) ([frappe#25590](frappe#25590)) ([5e65cc9](frappe@5e65cc9))

### Reverts

* Revert "fix: escape text types before setting disp area (frappe#25520) (frappe#25522)" (frappe#25604) ([0bf0cb8](frappe@0bf0cb8)), closes [frappe#25520](frappe#25520) [frappe#25522](frappe#25522) [frappe#25604](frappe#25604)
@Alchez Alchez merged commit 07876eb into ParsimonyGit:parsimony-production-v14 Apr 2, 2024
4 of 9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants