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

[stable20] Handle limit offset and sorting in files search #26258

Merged
merged 11 commits into from
Mar 30, 2021
Merged

[stable20] Handle limit offset and sorting in files search #26258

merged 11 commits into from
Mar 30, 2021

Conversation

backportbot-nextcloud[bot]
Copy link

@backportbot-nextcloud backportbot-nextcloud bot commented Mar 23, 2021 •
edited
Loading

⚠️ This backport had conflicts and is incomplete ⚠️

backport of #26198

@backportbot-nextcloud backportbot-nextcloud bot added this to the Nextcloud 20.0.10 milestone Mar 23, 2021
@rullzer rullzer added 3. to review Waiting for reviews 2. developing Work in progress and removed 3. to review Waiting for reviews labels Mar 24, 2021
@rullzer
Copy link
Member

rullzer commented Mar 24, 2021

conflicts

@icewind1991
use "newer" node search api directly in unified search
60551ce 
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991
unify handling of Folder::search methods into "new" query objects
a624243 
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991
only require user to be set in a query that handles tags
4655f6f 
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991
handle limit and offset in folder file search
6a639ec 
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991
format
dbd8b0a 
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991
cleanup fileinfo creation
4e60b9f 
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991
folder filtering in sql
671b992 
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991
handle ordering in folder search
055af29 
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991
pass order from unified search to file search
10bf93a 
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991
use node search api for legacy file search endpoint
4ede9db 
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991 icewind1991 force-pushed the backport/26198/stable20 branch from 0acaec1 to 4ede9db Compare March 24, 2021 15:01
@icewind1991
fix type hints
4b65a1d 
Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991 icewind1991 force-pushed the backport/26198/stable20 branch from a1da556 to 4b65a1d Compare March 24, 2021 15:35
@icewind1991
Copy link
Member

rebased

@MorrisJobke MorrisJobke added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Mar 24, 2021
@rullzer rullzer mentioned this pull request Mar 26, 2021
Merged
2 tasks
@rullzer rullzer merged commit 99e2e5f into stable20 Mar 30, 2021
@rullzer rullzer deleted the backport/26198/stable20 branch March 30, 2021 18:53
This was referenced Apr 1, 2021
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rullzer rullzer rullzer approved these changes

@skjnldsv skjnldsv skjnldsv approved these changes

@ChristophWurst ChristophWurst Awaiting requested review from ChristophWurst

@icewind1991 icewind1991 Awaiting requested review from icewind1991

@MorrisJobke MorrisJobke Awaiting requested review from MorrisJobke

Assignees
No one assigned
Labels
3. to review Waiting for reviews feature: search
Projects
None yet
Milestone
Nextcloud 20.0.9
Development

Successfully merging this pull request may close these issues.
4 participants
@rullzer @icewind1991 @skjnldsv @MorrisJobke