Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

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

Snippets Groups Projects

6bd6ec66

Commit 6bd6ec66 authored 5 years ago by Shpuld Shpludson

Downloads
- Plain Diff

Merge branch 'tae/pleroma-fe-663' into 'develop'

Implement domain mutes v2

See merge request pleroma/pleroma-fe!1045

parents e3de2964 7a013ac3

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

src/components/domain_mute_card/domain_mute_card.js 15 additions, 0 deletions

src/components/domain_mute_card/domain_mute_card.js
src/components/domain_mute_card/domain_mute_card.vue 38 additions, 0 deletions

src/components/domain_mute_card/domain_mute_card.vue
src/components/user_settings/user_settings.js 18 additions, 1 deletion

src/components/user_settings/user_settings.js
src/components/user_settings/user_settings.vue 112 additions, 45 deletions

src/components/user_settings/user_settings.vue
src/i18n/en.json 9 additions, 0 deletions

src/i18n/en.json
src/modules/users.js 44 additions, 0 deletions

src/modules/users.js
src/services/api/api.service.js 27 additions, 1 deletion

src/services/api/api.service.js

with 263 additions and 47 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