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

add embed to block list details + allow blocked videos in embed #2926

Merged
merged 2 commits into from
Aug 6, 2020
Merged

add embed to block list details + allow blocked videos in embed #2926

merged 2 commits into from
Aug 6, 2020

Conversation

rigelk
Copy link
Collaborator

@rigelk rigelk commented Jul 2, 2020

No description provided.

@rigelk rigelk added UI non-trivial UI changes, that might need discussion Component: Moderation :godmode: labels Jul 2, 2020
@rigelk rigelk requested a review from Chocobozzz July 2, 2020 14:53
@Chocobozzz
Copy link
Owner

Chocobozzz commented Jul 10, 2020 •
edited
Loading

Please split this PR in 2: one for the embed and another one for abuses. I think you should also use #2947 for the abuse part since I changed the components name and layout

Please rebase from #2947

Chocobozzz
Chocobozzz requested changes Jul 10, 2020
View reviewed changes
client/src/standalone/videos/embed.ts Outdated Show resolved Hide resolved
client/src/standalone/videos/embed.ts Outdated Show resolved Hide resolved
@rigelk rigelk changed the title decouple video abuse details from embed, add embed to block list details add embed to block list details + allow blocked videos in embed Aug 3, 2020
@rigelk rigelk requested a review from Chocobozzz August 3, 2020 16:11
Chocobozzz
Chocobozzz requested changes Aug 4, 2020
View reviewed changes
client/src/app/+admin/moderation/video-block-list/video-block-list.component.ts Outdated Show resolved Hide resolved
client/src/standalone/videos/embed.ts Outdated Show resolved Hide resolved
client/src/standalone/videos/embed.ts Outdated Show resolved Hide resolved
client/src/standalone/videos/embed.ts Outdated Show resolved Hide resolved
@rigelk rigelk requested a review from Chocobozzz August 4, 2020 09:21
Chocobozzz
Chocobozzz requested changes Aug 4, 2020
View reviewed changes
client/src/app/core/auth/pure-auth-user.model.ts Outdated Show resolved Hide resolved
client/src/app/helpers/index.ts Outdated Show resolved Hide resolved
client/src/app/core/rest/rest-table.ts Outdated Show resolved Hide resolved
client/src/standalone/videos/embed.ts Outdated Show resolved Hide resolved
client/webpack/webpack.video-embed.js Outdated Show resolved Hide resolved
client/src/standalone/videos/embed.ts Outdated Show resolved Hide resolved
@rigelk rigelk requested a review from Chocobozzz August 4, 2020 11:17
Chocobozzz
Chocobozzz reviewed Aug 5, 2020
View reviewed changes
client/src/root-helpers/pure-auth-user.model.ts
canSeeVideosLink = true

static load () {
const usernameLocalStorage = peertubeLocalStorage.getItem(UserKeys.USERNAME)
Copy link
Owner

Choose a reason for hiding this comment

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

Please don't duplicate code

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I'm not sure how to do that

@Chocobozzz Chocobozzz merged commit 4504f09 into Chocobozzz:develop Aug 6, 2020
@Chocobozzz Chocobozzz mentioned this pull request Aug 11, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Chocobozzz Chocobozzz Chocobozzz requested changes

Assignees
No one assigned
Labels
Component: Moderation :godmode: UI non-trivial UI changes, that might need discussion
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@rigelk @Chocobozzz