Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

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

Snippets Groups Projects

b4bd5e40

Commit b4bd5e40 authored 6 years ago by lain

Downloads
- Plain Diff

Merge branch 'bugfix/no-cc-mentions' into 'develop'

align to/cc addressing pattern with friendica, hubzilla instead of mastodon

Closes #341

See merge request pleroma/pleroma!436

parents a44d87f0 e4971553

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

lib/pleroma/notification.ex 62 additions, 2 deletions

lib/pleroma/notification.ex
lib/pleroma/user.ex 11 additions, 22 deletions

lib/pleroma/user.ex
lib/pleroma/web/activity_pub/transmogrifier.ex 2 additions, 5 deletions

lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/web/activity_pub/utils.ex 19 additions, 2 deletions

lib/pleroma/web/activity_pub/utils.ex
lib/pleroma/web/common_api/utils.ex 14 additions, 6 deletions

lib/pleroma/web/common_api/utils.ex
test/notification_test.exs 95 additions, 0 deletions

test/notification_test.exs
test/web/twitter_api/twitter_api_test.exs 1 addition, 1 deletion

test/web/twitter_api/twitter_api_test.exs

with 204 additions and 38 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