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.

Sign up for GitHub

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

Jump to bottom

fix: redirect after login, todo filters (backport #25521) #25561

Merged
merged 3 commits into from Mar 21, 2024
Merged

fix: redirect after login, todo filters (backport #25521) #25561

merged 3 commits into from Mar 21, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 20, 2024

@ankush @mergify
fix: redirect after login, todo filters (#25521)
d3b24f4 
* Revert "fix: default filter setup on todo list (#25455)"

This reverts commit 396bc41.

* Revert "Revert "fix: default filter setup on todo list (#25455)""

This reverts commit 5e6b699.

* test: wait longer for filters to apply

* fix: route redirects after login

* test: use clear_filters

* fix: don't set default filters on ToDo

This messes with previous filters logic.

(cherry picked from commit 571ca34)

# Conflicts:
#	cypress/integration/awesome_bar.js
#	cypress/support/commands.js
@mergify mergify bot requested a review from a team as a code owner March 20, 2024 11:33
@mergify mergify bot added the conflicts label Mar 20, 2024
@mergify mergify bot requested review from akhilnarang and removed request for a team March 20, 2024 11:33
@mergify Mergify
Copy link
Contributor Author

mergify bot commented Mar 20, 2024

Cherry-pick of 571ca34 has failed:

On branch mergify/bp/version-15-hotfix/pr-25521
Your branch is up to date with 'origin/version-15-hotfix'.

You are currently cherry-picking commit 571ca34eca.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   cypress/integration/list_paging.js
	modified:   frappe/desk/doctype/todo/todo_list.js
	modified:   frappe/www/message.html

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   cypress/integration/awesome_bar.js
	both modified:   cypress/support/commands.js

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot assigned ankush Mar 20, 2024
@ankush ankush added the Skip CI Doesn't run Ci for this PR. label Mar 21, 2024
@ankush ankush enabled auto-merge (squash) March 21, 2024 11:23
@ankush ankush merged commit d9f9aa4 into version-15-hotfix Mar 21, 2024
17 of 18 checks passed
@ankush ankush deleted the mergify/bp/version-15-hotfix/pr-25521 branch March 21, 2024 11:23
frappe-pr-bot pushed a commit that referenced this pull request Mar 27, 2024
@frappe-bot
chore(release): Bumped to Version 15.19.0
4e28a20 
# [15.19.0](v15.18.2...v15.19.0) (2024-03-27)

### Bug Fixes

* add missing arg while invoking _download_multi_pdf ([f82ed9f](f82ed9f))
* allow page length 2500 ([#25062](#25062)) ([75b1f6c](75b1f6c))
* **Contact form:** make email translatable ([800cfee](800cfee))
* **Contact form:** make title and options translatable ([b1dbd79](b1dbd79))
* **Contact form:** translate internal notification to system language ([f67e5f1](f67e5f1))
* DB Query distinct handling with full table name ([#25594](#25594)) ([4fe0498](4fe0498))
* diff after converting to html to text ([#25582](#25582)) ([#25584](#25584)) ([bd7372d](bd7372d))
* Mark totals row correctly for print ([#25629](#25629)) ([#25631](#25631)) ([725018f](725018f))
* only add title field in search if it exists ([#25634](#25634)) ([#25636](#25636)) ([b2260c1](b2260c1))
* redirect after login, todo filters (backport [#25521](#25521)) ([#25561](#25561)) ([d9f9aa4](d9f9aa4)), closes [#25455](#25455) [#25455](#25455)
* respect `null` as number value ([#25639](#25639)) ([5b64ac9](5b64ac9))
* set list row height to 40px ([#25619](#25619)) ([#25625](#25625)) ([af406f9](af406f9))
* **test:** update RQ serialization test ([c764282](c764282))
* Translate form and workflow builder (backport [#25482](#25482)) ([#25547](#25547)) ([01f469f](01f469f))
* **webhook:** `r` is referenced here before its initialized ([a60bb4e](a60bb4e)), closes [#21064](#21064)
* **workspace:** Don't allow Welcome as default workspace ([819a24c](819a24c))

### Features

* allow setting a custom rate limit for `login via email link` feature ([c7af627](c7af627))
* connect to redis sentinel for redis queue ([#25557](#25557)) ([82a33c3](82a33c3))
* drop sentry's RQ integration ([1eab176](1eab176))
* **workspace:** Allow user to choose a default workspace ([bfa1a83](bfa1a83))

### Performance Improvements

* Faster "show title in link field" on list view ([#25597](#25597)) ([#25622](#25622)) ([f62a30c](f62a30c))
* remove useless sorting on docstatus ([#25571](#25571)) ([#25591](#25591)) ([5e5853e](5e5853e))

### Reverts

* Revert "fix: escape text types before setting disp area (#25520) (#25523)" (#25603) ([bbf55df](bbf55df)), closes [#25520](#25520) [#25523](#25523) [#25603](#25603)
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 15.19.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@barredterra barredterra mentioned this pull request Apr 7, 2024
Closed
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Apr 11, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@akhilnarang akhilnarang Awaiting requested review from akhilnarang akhilnarang is a code owner automatically assigned from frappe/frappe-review-team

Assignees

@ankush ankush

Labels
conflicts released Skip CI Doesn't run Ci for this PR.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@frappe-pr-bot @ankush