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

6383fa3a

Commit 6383fa3a authored 6 years ago by kaniini

Downloads
- Plain Diff

Merge branch 'oembed_provider' into 'develop'

Opengraph/TwitterCard::summary for statuses and user profiles

See merge request pleroma/pleroma!533

parents b9cd5117 a45a9034

Branches

No related tags found

No related merge requests found

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

config/config.exs 2 additions, 0 deletions

config/config.exs
docs/config.md 6 additions, 0 deletions

docs/config.md
lib/pleroma/formatter.ex 26 additions, 4 deletions

lib/pleroma/formatter.ex
lib/pleroma/user.ex 26 additions, 0 deletions

lib/pleroma/user.ex
lib/pleroma/web/metadata.ex 40 additions, 0 deletions

lib/pleroma/web/metadata.ex
lib/pleroma/web/metadata/opengraph.ex 154 additions, 0 deletions

lib/pleroma/web/metadata/opengraph.ex
lib/pleroma/web/metadata/provider.ex 7 additions, 0 deletions

lib/pleroma/web/metadata/provider.ex
lib/pleroma/web/metadata/twitter_card.ex 46 additions, 0 deletions

lib/pleroma/web/metadata/twitter_card.ex
lib/pleroma/web/ostatus/ostatus_controller.ex 22 additions, 6 deletions

lib/pleroma/web/ostatus/ostatus_controller.ex
lib/pleroma/web/router.ex 38 additions, 2 deletions

lib/pleroma/web/router.ex
mix.exs 1 addition, 0 deletions

mix.exs
test/web/metadata/opengraph_test.exs 94 additions, 0 deletions

test/web/metadata/opengraph_test.exs
test/web/ostatus/ostatus_controller_test.exs 14 additions, 10 deletions

test/web/ostatus/ostatus_controller_test.exs

with 476 additions and 22 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