8000 Comparing v14.66.1...v14.66.2 · frappe/frappe · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: frappe/frappe
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v14.66.1
Choose a base ref
...
head repository: frappe/frappe
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v14.66.2
Choose a head ref
  • 20 commits
  • 29 files changed
  • 8 contributors

Commits on Dec 20, 2023

  1. fix: ignore and gracefully handle img optimization failure 

    PIL doesn't handle ALL image types. E.g. HEIC fails with bad error.

(cherry picked from commit 3524cae)

# Conflicts:
#	frappe/utils/image.py
    @ankush @mergify
    ankush authored and mergify[bot] committed Dec 20, 2023
    Configuration menu
    Copy the full SHA
    b112333 View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2024

  1. chore: resolve conflicts 

    Signed-off-by: Akhil Narang <me@akhilnarang.dev>
    @akhilnarang
    akhilnarang committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    b8c9eb6 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #23875 from frappe/mergify/bp/version-14-hotfix/pr… 

    …-23873

fix: ignore and gracefully handle img optimization failure (backport #23873)
    @akhilnarang
    akhilnarang authored Feb 14, 2024
    Configuration menu
    Copy the full SHA
    a721c8f View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2024

  1. fix: invite contact as user 

    (cherry picked from commit bbd4283)
    @barredterra @mergify
    barredterra authored and mergify[bot] committed Feb 17, 2024
    Configuration menu
    Copy the full SHA
    136ac70 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #24909 from frappe/mergify/bp/version-14-hotfix/pr… 

    …-24905

fix: invite contact as user (backport #24905)
    @barredterra
    barredterra authored Feb 17, 2024
    Configuration menu
    Copy the full SHA
    ffbaa39 View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2024

  1. fix: lower socket timeout for validating email domain (#24915) (#24917) 

    (cherry picked from commit 59f8e36)

# Conflicts:
#	frappe/email/doctype/email_domain/email_domain.py

Co-authored-by: Ankush Menat <ankush@frappe.io>
    @mergify @ankush
    mergify[bot] and ankush authored Feb 19, 2024
    Configuration menu
    Copy the full SHA
    427e681 View commit details
    Browse the repository at this point in the history

  2. fix(weblist): Fix "More" button not working (#24893) (#24925) 

    (cherry picked from commit 02051fc)

Co-authored-by: Corentin Flr <10946971+cogk@users.noreply.github.com>
    @mergify @cogk
    mergify[bot] and cogk authored Feb 19, 2024
    Configuration menu
    Copy the full SHA
    1715638 View commit details
    Browse the repository at this point in the history

  3. fix(calendar): Replace route in load_last_view (#24894) (#24927) 

    (cherry picked from commit 8a27e76)

Co-authored-by: Corentin Flr <10946971+cogk@users.noreply.github.com>
    @mergify @cogk
    mergify[bot] and cogk authored Feb 19, 2024
    Configuration menu
    Copy the full SHA
    fa184d6 View commit details
    Browse the repository at this point in the history

  4. fix: keep order in get_values_from_single (#24907) (#24923) 

    * fix: keep order in `get_values_from_single`

* fix: add test for destructuring

---------

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

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
    @mergify @barredterra
    mergify[bot] and barredterra authored Feb 19, 2024
    Configuration menu
    Copy the full SHA
    3347144 View commit details
    Browse the repository at this point in the history

  5. fix: ensure has_value_changed works for Datetime, Date and Time field… 

    …s (backport #24919) (#24921)

* fix: ensure has_value_changed works for datetime, date and timedelta fields

(cherry picked from commit a1cb19c)

# Conflicts:
#	frappe/model/document.py
#	frappe/utils/data.py

* test: add more tests for has_value_changed

(cherry picked from commit 0d84743)

# Conflicts:
#	frappe/model/document.py

* chore: conflicts

---------

Co-authored-by: scdanieli <23150094+scdanieli@users.noreply.github.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
    @mergify @scdanieli @ankush
    3 people authored Feb 19, 2024
    Configuration menu
    Copy the full SHA
    8087a7a View commit details
    Browse the repository at this point in the history

  6. fix(page): Catch LocalStorage quota exception (#24885) (#24930) 

    (cherry picked from commit fe80169)

Co-authored-by: Corentin Flr <10946971+cogk@users.noreply.github.com>
    @mergify @cogk
    mergify[bot] and cogk authored Feb 19, 2024
    Configuration menu
    Copy the full SHA
    3a36f7d View commit details
    Browse the repository at this point in the history

  7. fix: send_workflow_action_email (#24929) (#24933) 

    * fix: send_workflow_action_email

* fix: send_workflow_action_email

(cherry picked from commit 15eb1bf)

Co-authored-by: Nihantra C. Patel <141945075+Nihantra-Patel@users.noreply.github.com>
    @mergify @Nihantra-Patel
    mergify[bot] and Nihantra-Patel authored Feb 19, 2024
    Configuration menu
    Copy the full SHA
    5f29c83 View commit details
    Browse the repository at this point in the history

  8. fix: use communication date in timeline 

    Before, we used the database creation date, which coincidentally corresponds to the real communication date in many cases.

(cherry picked from commit 10bd9a7)

# Conflicts:
#	frappe/desk/form/load.py
    @barredterra @mergify
    barredterra authored and mergify[bot] committed Feb 19, 2024
    8 Configuration menu
    Copy the full SHA
    0632cb3 View commit details
    Browse the repository at this point in the history

  9. fix: handle bad cron expressions (backport #24938) (#24941) 

    * fix: delete cron jobs when switching server script type

(cherry picked from commit 68d1a9e)

* fix: validate cron format

(cherry picked from commit e88c078)

# Conflicts:
#	frappe/core/doctype/scheduled_job_type/scheduled_job_type.py

---------

Co-authored-by: Ankush Menat <ankush@frappe.io>
    @mergify @ankush
    mergify[bot] and ankush authored Feb 19, 2024
    Configuration menu
    Copy the full SHA
    4efcdb5 View commit details
    Browse the repository at this point in the history

  10. chore: resolve conflicts

    @barredterra
    barredterra authored Feb 19, 2024
    Configuration menu
    Copy the full SHA
    f0352ce View commit details
    Browse the repository at this point in the history

  11. Merge pull request #24943 from frappe/mergify/bp/version-14-hotfix/pr… 

    …-24884

fix: use communication date in timeline (backport #24884)
    @akhilnarang
    akhilnarang authored Feb 19, 2024
    Configuration menu
    Copy the full SHA
    52ebc4f View commit details
    Browse the repository at this point in the history

  12. refactor: Reset password flow (backport #24857) (#24860) 

    * chore: remove default UI tours

Experiment 🤷
(cherry picked from commit 74071c1)

* refactor: Reset password flow

- Hash one time reset tokens instead of storing them as is
- Up the perm level
- Use better source of randomness for generating token
- minor code cleanup here and there

(cherry picked from commit 4c925e0)

# Conflicts:
#	frappe/core/doctype/user/user.json
#	frappe/core/doctype/user/user.py
#	frappe/patches.txt
#	frappe/tests/test_utils.py

* test: redo reset password tests

(cherry picked from commit 38565a8)

# Conflicts:
#	frappe/core/doctype/user/test_user.py
#	frappe/tests/utils.py

* fix(UX): usability of reset password page

- password managers use paste, added that event to trigger our code
- if no password policy then skip. Way too much needless business logic in HTML here.

(cherry picked from commit 78264a7)

* chore: conflicts

---------

Co-authored-by: Ankush Menat <ankush@frappe.io>
    @mergify @ankush
    mergify[bot] and ankush authored Feb 19, 2024
    Configuration menu
    Copy the full SHA
    64ac07a View commit details
    Browse the repository at this point in the history

  13. fix: set same cookie expiry on client side (backport #24560) (#24567) 

    * fix: set same cookie expiry as client side (#24560)

(cherry picked from commit 70a6a83)

# Conflicts:
#	frappe/auth.py
#	frappe/sessions.py

* chore: conflicts

---------

Co-authored-by: Ankush Menat <ankush@frappe.io>
    @mergify @ankush
    mergify[bot] and ankush authored Feb 19, 2024
    Configuration menu
    Copy the full SHA
    744b363 View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2024

  1. Merge pull request #24962 from frappe/version-14-hotfix 

    chore: release v14
    @ankush
    ankush authored Feb 20, 2024
    Configuration menu
    Copy the full SHA
    33dede5 View commit details
    Browse the repository at this point in the history

  2. chore(release): Bumped to Version 14.66.2 

    ## [14.66.2](v14.66.1...v14.66.2) (2024-02-20)

### Bug Fixes

* **calendar:** Replace route in load_last_view ([#24894](#24894)) ([#24927](#24927)) ([fa184d6](fa184d6))
* ensure has_value_changed works for Datetime, Date and Time fields (backport [#24919](#24919)) ([#24921](#24921)) ([8087a7a](8087a7a))
* handle bad cron expressions (backport [#24938](#24938)) ([#24941](#24941)) ([4efcdb5](
95EB
4efcdb5))
* ignore and gracefully handle img optimization failure ([b112333](b112333))
* invite contact as user ([136ac70](136ac70))
* keep order in `get_values_from_single` ([#24907](#24907)) ([#24923](#24923)) ([3347144](3347144))
* lower socket timeout for validating email domain ([#24915](#24915)) ([#24917](#24917)) ([427e681](427e681))
* **page:** Catch LocalStorage quota exception ([#24885](#24885)) ([#24930](#24930)) ([3a36f7d](3a36f7d))
* send_workflow_action_email ([#24929](#24929)) ([#24933](#24933)) ([5f29c83](5f29c83))
* set same cookie expiry on client side (backport [#24560](#24560)) ([#24567](#24567)) ([744b363](744b363))
* use communication date in timeline ([0632cb3](0632cb3))
* **weblist:** Fix "More" button not working ([#24893](#24893)) ([#24925](#24925)) ([1715638](1715638))
    @frappe-bot
    frappe-bot committed Feb 20, 2024
    Configuration menu
    Copy the full SHA
    b26f55c View commit details
    Browse the repository at this point in the history
Loading
0