Skip to content

[stable22] Fix position of search bar #28670

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
Merged
szaimen merged 1 commit into from
Sep 3, 2021
Merged

[stable22] Fix position of search bar #28670

szaimen merged 1 commit into from
Sep 3, 2021

Conversation

@backportbot-nextcloud
Copy link

@backportbot-nextcloud backportbot-nextcloud bot commented Aug 31, 2021 •
edited by szaimen
Loading

⚠️ This backport had conflicts and is incomplete ⚠️

backport of #28660

@backportbot-nextcloud backportbot-nextcloud bot added this to the Nextcloud 22.1.2 milestone Aug 31, 2021
@CarlSchwan
Copy link
Member

CarlSchwan commented Aug 31, 2021

/compile amend /

@nextcloud nextcloud deleted a comment Aug 31, 2021
@nextcloud nextcloud deleted a comment Aug 31, 2021
@nextcloud nextcloud deleted a comment Aug 31, 2021
@nextcloud nextcloud deleted a comment Aug 31, 2021
@nextcloud nextcloud deleted a comment Aug 31, 2021
szaimen
szaimen approved these changes Sep 1, 2021
View reviewed changes
Copy link
Contributor

@szaimen szaimen left a comment

Choose a reason for hiding this comment

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

Failure unrelated

@MichaIng
Copy link
Member

MichaIng commented Sep 3, 2021

/rebase

@MichaIng
Copy link
Member

MichaIng commented Sep 3, 2021

Hmm,

GitHub doesn't think that the PR is rebaseable!

So compiled unified-search.js conflict with base but rebase is denied as long as those exist. Needs to be resolved manually it seems, removing the two files, rebasing, then compiling.

@szaimen
Copy link
Contributor

szaimen commented Sep 3, 2021

@CarlSchwan please rebase :)

@MichaIng MichaIng force-pushed the backport/28660/stable22 branch from fe2f5eb to ec3cc14 Compare September 3, 2021 14:47
@MichaIng
Copy link
Member

MichaIng commented Sep 3, 2021

/compile amend /

@CarlSchwan @nextcloud-command
Fix position of search bar
3255b22 
Signed-off-by: Carl Schwan <[email protected]>
Signed-off-by: nextcloud-command <[email protected]>
@MichaIng
Copy link
Member

MichaIng commented Sep 3, 2021

Psalm failure related to #28700, which requires hence backport first.

@szaimen
Copy link
Contributor

szaimen commented Sep 3, 2021

Psalm failure unrelated

@szaimen szaimen merged commit 6880498 into stable22 Sep 3, 2021
@szaimen szaimen deleted the backport/28660/stable22 branch September 3, 2021 16:14
@blizzz blizzz mentioned this pull request Sep 23, 2021
Merged
4 tasks
@MichaIng MichaIng modified the milestones: Nextcloud 22.1.2, Nextcloud 22.2.0 Sep 24, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@MichaIng MichaIng MichaIng approved these changes

@szaimen szaimen szaimen approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

Nextcloud 22.2.0

Development

Successfully merging this pull request may close these issues.

4 participants

@CarlSchwan @MichaIng @szaimen