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

17b6d8dd

Commit 17b6d8dd authored 5 years ago by Shpuld Shpludson

Downloads
- Plain Diff

Merge branch 'move-type-notification' into 'develop'

Add setting for allow following move

Closes #732

See merge request pleroma/pleroma-fe!1054

parents 6be62417 ce68ef01

Branches

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

src/components/interactions/interactions.js 1 addition, 0 deletions

src/components/interactions/interactions.js
src/components/interactions/interactions.vue 1 addition, 0 deletions

src/components/interactions/interactions.vue
src/components/user_settings/user_settings.js 2 additions, 0 deletions

src/components/user_settings/user_settings.js
src/components/user_settings/user_settings.vue 6 additions, 3 deletions

src/components/user_settings/user_settings.vue
src/i18n/en.json 1 addition, 0 deletions

src/i18n/en.json
src/services/api/api.service.js 5 additions, 1 deletion

src/services/api/api.service.js
src/services/entity_normalizer/entity_normalizer.service.js 2 additions, 0 deletions

src/services/entity_normalizer/entity_normalizer.service.js
src/services/notifications_fetcher/notifications_fetcher.service.js 3 additions, 0 deletions

...es/notifications_fetcher/notifications_fetcher.service.js

with 21 additions and 4 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