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

Phoenix update #651

Merged
merged 13 commits into from
Oct 6, 2020
Merged

Phoenix update #651

merged 13 commits into from
Oct 6, 2020

Conversation

kulmann
Copy link
Member

@kulmann kulmann commented Oct 6, 2020 •
edited
Loading

This PR updates phoenix to v0.18.0 and adjusts accounts and settings accordingly.

@kulmann kulmann requested a review from LukasHirt October 6, 2020 08:19
@kulmann
Copy link
Member Author

kulmann commented Oct 6, 2020

Updated the phoenix commit id for tests to solve failing webUI CI.

LukasHirt
LukasHirt approved these changes Oct 6, 2020
View reviewed changes
Copy link
Collaborator

@LukasHirt LukasHirt left a comment

Choose a reason for hiding this comment

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

One super minor thing. Otherwise all good 👍

accounts/ui/components/accounts/AccountsList.vue
hide-label
@change="toggleSelectionAll"
class="uk-margin-small-left"
class="oc-ml-s"
Copy link
Collaborator

Choose a reason for hiding this comment

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

Some odd change of indentation?

Copy link
Member Author

Choose a reason for hiding this comment

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

True, that is incorrect indentation. We should setup prettier in accounts and settings UI....

I merged the PR with this. I have another PR touching the accounts and settings UI anyway (moving the navItems to the user menu). I will fix the indentation in that PR then. Thanks for spotting it!

@kulmann kulmann merged commit 6a19773 into master Oct 6, 2020
@delete-merged-branch delete-merged-branch bot deleted the phoenix-update branch October 6, 2020 10:54
ownclouders pushed a commit that referenced this pull request Oct 6, 2020
@kulmann
commit 6a19773
71c3a82 
Merge: af3b8a7 cbad8d2
Author: Benedikt Kulmann <[email protected]>
Date:   Tue Oct 6 12:54:31 2020 +0200

    Merge pull request #651 from owncloud/phoenix-update

    Phoenix update
@micbar micbar mentioned this pull request Dec 16, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@LukasHirt LukasHirt LukasHirt approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@kulmann @LukasHirt