Haelwenn 28f8fcf8b0 Merge branch 'fix/follow-and-blocks-import' into 'develop' ...

Fix follower/blocks import when nicknames starts with @

Closes #1698

See merge request pleroma/pleroma!2416

2020-04-22 15:46:04 +00:00

..

activity_pub

Polls: Persist and show voters' count

2020-04-22 14:06:39 +02:00

admin_api

Merge branch 'feature/1584-client-captcha-options' into 'develop'

2020-04-17 09:19:35 +00:00

api_spec

Merge branch 'openapi/custom-emojis' into 'develop'

2020-04-21 10:13:50 +00:00

auth

…

channels

…

common_api

Merge branch 'develop' into features/remove-user-source_data

2020-04-16 21:28:52 +03:00

federator

Federator: Return proper values for jobs

2020-04-22 13:28:52 +02:00

feed

fix for use of published from different entities

2020-04-16 18:05:36 +03:00

mailer

…

mastodon_api

Merge branch 'bugfix/following-fix-status-code' into 'develop'

2020-04-22 15:33:04 +00:00

media_proxy

…

metadata

…

mongooseim

…

nodeinfo

…

oauth

Merge branch 'feature/1584-client-captcha-options' into 'develop'

2020-04-17 09:19:35 +00:00

ostatus

…

pleroma_api/controllers

Merge branch 'authenticated-api-oauth-check-enforcement' into 'develop'

2020-04-16 21:58:57 +00:00

push

WebPush: Return proper values for jobs.

2020-04-22 13:28:34 +02:00

rich_media

Fix Oban not receiving :ok from RichMediaHelper job

2020-04-14 11:43:53 -05:00

static_fe

profile emojis in User.emoji instead of source_data

2020-04-10 06:20:02 +02:00

streamer

Streamer: Stream boosts to the boosting user.

2020-04-22 17:21:13 +02:00

templates

static_fe: Add microformats2 classes

2020-04-22 16:02:40 +02:00

twitter_api

Fix blocks import

2020-04-22 19:27:28 +04:00

views

…

web_finger

…

xml

…

api_spec.ex

Add OpenAPI spec for DomainBlockController

2020-04-13 22:44:52 +04:00

chat_channel.ex

…

controller_helper.ex

…

endpoint.ex

…

fallback_redirect_controller.ex

…

gettext.ex

…

masto_fe_controller.ex

…

metadata.ex

…

oauth.ex

…

rel_me.ex

…

router.ex

Cleanup and DRY the Router

2020-04-20 16:39:20 +04:00

translation_helpers.ex

…

uploader_controller.ex

…

web.ex

[#1682] Fixed Basic Auth permissions issue by disabling OAuth scopes checks when password is provided. Refactored plugs skipping functionality.

2020-04-17 21:21:10 +03:00