Alexander Strizhakov authored May 06, 2019 and lain committed May 06, 2019

Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/845-improve-status-deletion

Fix embeded relationships in Mastodon API

See merge request !1118

Search: Add fts index on objects table.

See merge request !1120

Bugfix: emoji size in profile

Closes #269

See merge request !792

Standardize construction of websocket URL

See merge request !1115

feld authored May 03, 2019 and lain committed May 03, 2019

This follows up on the change made in d747bd98

Currently some endpoints render accounts without for user resulting in
embedded relationship being empty. It causes bugs in followers/following
tab in pleroma-fe but I fixed it for other endpoints as well just in
case

Parse access_token from body parameters and URL parameters

See merge request !1103

Refactored Pleroma.Web.Auth.Authenticator

See merge request !1108

Remove redundant ensure_scrubbed_html

See merge request !1114

It is never used as handling for fake and non-fake activities was merged
into one function above it

installation/download-mastofe-build.sh: Add mastofe CI-artifacts download

See merge request !1052

fix the web push notification with special char for status created

See merge request !1092

Harmonize return types in user module

Closes #718

See merge request !1112

[docs/config.md]Fix syntax highlighting + clarify :frontend_configuration

See merge request !1110

Update `auto_linker`

See merge request !1111

Conflicts:
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/user.ex

Do not normalize objects in stream_out unless the activity type is Create

See merge request !1109

Create

Saves quite a bit of time with delete activities because they would
always query the db

Fix MigrateOldBookmarks migration crashing on deleted activities

See merge request !1106

WebPush: Use Object.normalize, rewrite tests so they test reality.

See merge request !1105