Skip to content

[stable21] Improve search results when only phonebook-matches can we autocompleted#26177

Merged
MorrisJobke merged 5 commits into
stable21from
backport/26161/stable21
Mar 22, 2021
Merged

[stable21] Improve search results when only phonebook-matches can we autocompleted#26177
MorrisJobke merged 5 commits into
stable21from
backport/26161/stable21

Conversation

@backportbot-nextcloud

@backportbot-nextcloud backportbot-nextcloud Bot commented Mar 17, 2021

Copy link
Copy Markdown

⚠️ This backport had conflicts and is incomplete ⚠️

backport of #26161

@nickvergessen

Copy link
Copy Markdown
Member

Conflict was in autoloader because the part below the new migration with version 22000 does not exist of course.

@nickvergessen nickvergessen added the 3. to review Waiting for reviews label Mar 17, 2021

@MorrisJobke MorrisJobke left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🐘

@PVince81 PVince81 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@PVince81

Copy link
Copy Markdown
Member

some psalm issues I haven't seen before.

@rullzer

rullzer commented Mar 22, 2021

Copy link
Copy Markdown
Member

some psalm issues I haven't seen before.

It is because we only fixed those doctypes in 22.
Let me backport one so psalm is happy

Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Joas Schilling <coding@schilljs.com>
Signed-off-by: Joas Schilling <coding@schilljs.com>
…d phonenumbers

Signed-off-by: Joas Schilling <coding@schilljs.com>
@rullzer rullzer force-pushed the backport/26161/stable21 branch 2 times, most recently from e20c652 to e12e2ae Compare March 22, 2021 19:20
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
@MorrisJobke MorrisJobke merged commit a07e171 into stable21 Mar 22, 2021
@MorrisJobke MorrisJobke deleted the backport/26161/stable21 branch March 22, 2021 20:02
@rullzer rullzer mentioned this pull request Mar 26, 2021
2 tasks
@rullzer rullzer mentioned this pull request Apr 8, 2021
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants