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

e47d0f21

Commit e47d0f21 authored 4 years ago by HJ

Downloads
- Plain Diff

Merge branch 'fix-reprooted-muted-posts' into 'develop'

Fixed some issues with muting

See merge request pleroma/pleroma-fe!1120

parents 0a3069ae 7d695fc8

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 3 additions, 0 deletions

CHANGELOG.md
src/components/notification/notification.js 4 additions, 2 deletions

src/components/notification/notification.js
src/components/notification/notification.vue 2 additions, 4 deletions

src/components/notification/notification.vue
src/components/notifications/notifications.scss 2 additions, 4 deletions

src/components/notifications/notifications.scss
src/components/status/status.js 42 additions, 13 deletions

src/components/status/status.js
src/components/status/status.vue 61 additions, 11 deletions

src/components/status/status.vue
src/i18n/en.json 3 additions, 1 deletion

src/i18n/en.json
src/modules/statuses.js 13 additions, 2 deletions

src/modules/statuses.js
src/services/status_parser/status_parser.js 11 additions, 0 deletions

src/services/status_parser/status_parser.js

with 141 additions and 37 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