Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

pleroma
- Activity
- Members
- Labels
- Environments
- Incidents

Snippets Groups Projects

980131b4

There was a problem fetching the pipeline summary.

Commit 980131b4 authored 6 years ago by href

Downloads
- Plain Diff

Merge branch 'pleroma-feature/compat/push-subscriptions' into 'develop'

Improve web push

Closes #393, #422, and #452

See merge request pleroma/pleroma!524

parents 91236c60 412df2cd

No related branches found

No related tags found

1 merge request!524Improve web push

Pipeline #

Changes 8
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

config/config.md 8 additions, 0 deletions

config/config.md
lib/pleroma/activity.ex 15 additions, 0 deletions

lib/pleroma/activity.ex
lib/pleroma/plugs/oauth_plug.ex 14 additions, 14 deletions

lib/pleroma/plugs/oauth_plug.ex
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex 29 additions, 40 deletions

lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
lib/pleroma/web/mastodon_api/views/push_subscription_view.ex 6 additions, 1 deletion

lib/pleroma/web/mastodon_api/views/push_subscription_view.ex
lib/pleroma/web/push/push.ex 69 additions, 51 deletions

lib/pleroma/web/push/push.ex
lib/pleroma/web/push/subscription.ex 12 additions, 2 deletions

lib/pleroma/web/push/subscription.ex
lib/pleroma/web/twitter_api/controllers/util_controller.ex 1 addition, 2 deletions

lib/pleroma/web/twitter_api/controllers/util_controller.ex

with 154 additions and 110 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