Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

add support for redacting with reason #5186

Closed
wants to merge 1 commit into from
Closed

add support for redacting with reason #5186

wants to merge 1 commit into from

Conversation

orangecms
Copy link
Contributor

This is the counterpart for matrix-org/matrix-js-sdk#1462 :)

@orangecms orangecms closed this Sep 9, 2020
@orangecms orangecms reopened this Sep 9, 2020
@orangecms orangecms changed the title Add support for redactEventWithReason add support for redacting with reason Sep 9, 2020
@orangecms
Copy link
Contributor Author

This will not start to work before the API in the JS SDK offers the option. Tests will need adjustments.

@turt2live
Copy link
Member

@orangecms is it possible to get a screenshot of this for a quick review from our design team? Thanks!

@orangecms orangecms force-pushed the develop branch 2 times, most recently from ec5f6e4 to 85e9adf Compare September 21, 2020 21:02
@fridtjof
Copy link
Contributor

fridtjof commented Sep 21, 2020 •
edited
Loading

Screenshot:

grafik

fridtjof
fridtjof suggested changes Sep 21, 2020
View reviewed changes
Copy link
Contributor

@fridtjof fridtjof left a comment

Choose a reason for hiding this comment

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

Some minor nitpicks :)

@orangecms orangecms force-pushed the develop branch 3 times, most recently from 41b6565 to 9348451 Compare September 21, 2020 21:45
turt2live
turt2live suggested changes Sep 28, 2020
View reviewed changes
Copy link
Member

@turt2live turt2live left a comment

Choose a reason for hiding this comment

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

otherwise this is looking good. If the screenshots in the comments aren't up to date, please update them so the design/product team can review.

@turt2live
Copy link
Member

looks like the CI is also angry, but that may be a case of outdated branches - try merging upstream develop back in. If possible, please avoid a rebase as it makes future review harder.

@turt2live turt2live requested review from a team September 28, 2020 21:11
@orangecms
Add support for giving reason when redacting
43ff97c 
Signed-off-by: Daniel Maslowski <info@orangecms.org>
@orangecms
Copy link
Contributor Author

looks like the CI is also angry, but that may be a case of outdated branches - try merging upstream develop back in. If possible, please avoid a rebase as it makes future review harder.

yarn install is failing, getting 404 on libolm 2.1.0 and then cpx cannot be found presumably because install couldn't complete. I rebased onto latest develop. Any other ideas? Other PRs would have the same issue, right?

error An unexpected error occurred: "https://matrix.org/packages/npm/olm/olm-2.1.0.tgz: Request failed \"404 Not Found\"".
info If you think this is a bug, please open a bug report with the information provided in "/workdir/riot-web/yarn-error.log".
info Visit https://yarnpkg.com/en/docs/cli/install for documentation about this command.
yarn run v1.13.0
$ cpx "{src/skins/vector/fonts,src/skins/vector/img}/**" webapp/ && cpx "{res/media,res/vector-icons}/**" webapp/
/bin/sh: 1: cpx: not found
error Command failed with exit code 127.

@turt2live
Copy link
Member

I don't think you're doing something right if you're trying to use an ancient version of Olm. Visit #element-dev:matrix.org for troubleshooting.

@orangecms
Copy link
Contributor Author

Weird, this PR is exactly 1 commit ahead of develop. My other PR just happily passed. I'll try reopening to see if it's cache oddities or something, hoping that'll reset whatever may be going on with buildkite.

@orangecms orangecms closed this Sep 29, 2020
@orangecms orangecms reopened this Sep 29, 2020
@orangecms orangecms closed this Sep 29, 2020
@turt2live
Copy link
Member

Closing and reopening does nothing. I've restarted the build manually.

@turt2live turt2live reopened this Sep 29, 2020
@orangecms orangecms mentioned this pull request Sep 29, 2020
Merged
@turt2live turt2live removed request for a team September 29, 2020 03:04
@turt2live turt2live closed this Sep 29, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
2 more reviewers

@turt2live turt2live turt2live requested changes

@fridtjof fridtjof fridtjof requested changes

Reviewers whose approvals may not affect merge requirements
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@orangecms @turt2live @fridtjof