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.

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

Add domain block notes #11515

Merged
merged 9 commits into from Aug 7, 2019

Conversation

@ThibG
Copy link
Collaborator

commented Aug 7, 2019

This PR adds a way to write comments regarding the reasons of instance blocks.
It also improves handling of upgrading an instance block, and allows editing (even downgrading) an instance block as long as it is triggered from the new “edit domain block” button.

It does not add anything to the admin API, as that API doesn't seem to cover domain blocks.

It does not actually add a way to display reasons publicly, as that would be dependent on #11298

Creating a new domain block

image

Displaying a domain block

image

Editing an existing domain block

image

@ThibG ThibG force-pushed the ThibG:features/domain-notes branch from dd84cb5 to af096b7 Aug 7, 2019

@ThibG ThibG force-pushed the ThibG:features/domain-notes branch 3 times, most recently from 5693430 to ae9acae Aug 7, 2019

@ThibG ThibG closed this Aug 7, 2019

@ThibG ThibG force-pushed the ThibG:features/domain-notes branch from ae9acae to 3fb9ef9 Aug 7, 2019

@Gargron

This comment has been minimized.

Copy link
Member

commented Aug 7, 2019

Closed by accident?

@ThibG ThibG reopened this Aug 7, 2019

@ThibG

This comment has been minimized.

Copy link
Collaborator Author

commented Aug 7, 2019

Yeah, I didn't even notice I closed it :|

@ThibG ThibG force-pushed the ThibG:features/domain-notes branch 3 times, most recently from 98af7b1 to 2fa4202 Aug 7, 2019

@ThibG ThibG force-pushed the ThibG:features/domain-notes branch 2 times, most recently from 60ad62d to e69a793 Aug 7, 2019

@ThibG ThibG marked this pull request as ready for review Aug 7, 2019

@ThibG ThibG force-pushed the ThibG:features/domain-notes branch from e69a793 to 7d7b037 Aug 7, 2019

@Gargron

Gargron approved these changes Aug 7, 2019

@Gargron Gargron merged commit bced704 into tootsuite:master Aug 7, 2019

2 checks passed

build-and-test Workflow: build-and-test
Details
codeclimate All good!
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.