Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

pleroma-fe
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

f52bca04

Commit f52bca04 authored 4 years ago by Shpuld Shpludson

Downloads
- Plain Diff

Merge branch 'feat/allow-reporting-status-directly' into 'develop'

Add report button to status ellipsis menu

See merge request pleroma/pleroma-fe!1324

parents 728726cf 0ee0551a

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 3 additions, 0 deletions

CHANGELOG.md
src/components/account_actions/account_actions.js 1 addition, 1 deletion

src/components/account_actions/account_actions.js
src/components/extra_buttons/extra_buttons.js 7 additions, 2 deletions

src/components/extra_buttons/extra_buttons.js
src/components/extra_buttons/extra_buttons.vue 10 additions, 0 deletions

src/components/extra_buttons/extra_buttons.vue
src/components/user_reporting_modal/user_reporting_modal.js 8 additions, 2 deletions

src/components/user_reporting_modal/user_reporting_modal.js
src/modules/reports.js 12 additions, 4 deletions

src/modules/reports.js
src/services/entity_normalizer/entity_normalizer.service.js 0 additions, 1 deletion

src/services/entity_normalizer/entity_normalizer.service.js

with 41 additions and 10 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment