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

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

Merged
merged 5 commits into from
Mar 22, 2021
Merged

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

merged 5 commits into from
Mar 22, 2021

Conversation

backportbot-nextcloud[bot]
Copy link

@backportbot-nextcloud backportbot-nextcloud bot commented Mar 17, 2021 •
edited by nickvergessen
Loading

⚠️ This backport had conflicts and is incomplete ⚠️

backport of #26161

@backportbot-nextcloud backportbot-nextcloud bot added this to the Nextcloud 21.0.1 milestone Mar 17, 2021
@nickvergessen nickvergessen force-pushed the backport/26161/stable21 branch from 00838d5 to 952e93b Compare March 17, 2021 14:32
@nickvergessen
Copy link
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 approved these changes Mar 17, 2021
View reviewed changes
Copy link
Member

@MorrisJobke MorrisJobke left a comment

Choose a reason for hiding this comment

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

🐘

PVince81
PVince81 approved these changes Mar 19, 2021
View reviewed changes
Copy link
Member

@PVince81 PVince81 left a comment

Choose a reason for hiding this comment

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

👍

@PVince81
Copy link
Member

some psalm issues I haven't seen before.

@rullzer
Copy link
Member

rullzer commented Mar 22, 2021

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

@nickvergessen @rullzer
Improve search results when only phonebook-matches can we autocompleted
553a25e 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen @rullzer
Add missing index on the user column
f2acf49 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen @rullzer
Fix parameter types in docs
e9ea4a0 
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen @rullzer
Also limit to user group in case enumeration is enabled for groups an…
3fd9d0d 
…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
@rullzer
Make psalm happy
e12e2ae 
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
Merged
2 tasks
@rullzer rullzer mentioned this pull request Apr 8, 2021
Merged
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MorrisJobke MorrisJobke MorrisJobke approved these changes

@PVince81 PVince81 PVince81 approved these changes

@blizzz blizzz Awaiting requested review from blizzz

@ChristophWurst ChristophWurst Awaiting requested review from ChristophWurst

@nickvergessen nickvergessen Awaiting requested review from nickvergessen

@rullzer rullzer Awaiting requested review from rullzer

Assignees
No one assigned
Labels
3. to review Waiting for reviews bug feature: users and groups
Projects
None yet
Milestone
Nextcloud 21.0.1
Development

Successfully merging this pull request may close these issues.
4 participants
@nickvergessen @PVince81 @rullzer @MorrisJobke