Fix conflict in changelog

resolve conflicts

resolve conflict in changelog

Fix conflict in CHANGELOG.md

Add report to report_view

Reportnotificationcreation

Add to changelog

Make pipeline happy

Add migration for report type

Reuse existing function create_notifications

Code review

Format index.html for easier diffs

Make notifs view work for reports

Code review: remove list of non-pleroma specific commands

There's a file that still got formatted when running `mix format mix.exs…

Apply 1 suggestion(s) to 1 file(s)

Apply 1 suggestion(s) to 1 file(s)

Add usefull command

Code review

Apply 1 suggestion(s) to 1 file(s)

Apply 1 suggestion(s) to 1 file(s)

Add development section

mix format

Various fixes

fix code readability

Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into…

add mix task set_text_search_config

Update docs/configuration/howto_search_cjk.md

Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into…

remove hardcoded text search config from code

Update priv/repo/migrations/20190501125843_add_fts_index_to_objects.exs…

Update 20190510135645_add_fts_index_to_objects_two.exs

Update 20190510135645_add_fts_index_to_objects_two.exs

Merge branch 'rich-media' into oembed-redux

Merge remote-tracking branch 'upstream/develop' into rich-media

OEmbed: allow application/json response

Filter out bogus user objects with a nil ap_id

Merge branch 'youtube-fix' into rich-media

Use oembed library to parse media first

Update terminology in differences_in_mastoapi_responses.md

Add CardSanitizer to handle oembed data better

Always use type "link" for TwitterCard parser

Add a docker-compose.yaml example

Prioritize rich media embeds

Replace deprecated :crypto.hmac with :crypto.mac

After code review

Update panel.html

Make the OPT recomendation clearer

Changes after review

CHANGELOG: update year typos for previous releases

Add filter for transcoding uploaded videos

update nodeinfo.md

List available frontends also when no static/frontends folder is present yet

fix after running `mix credo --strict --only=warnings,todo,fixme,consistency…

Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into…

Merge branch 'develop' into add-nodeinfo-doc

Update nodeinfo.md

Update nodeinfo.md

Add activeHalfyear and activeMonth into nodeinfo.md

move nodeinfo.md

Format migration

add nodeinfo.md

update tests?

it wasn't intended to be for local users only

Add is_discoverable index to users

Force pinned_objects to be empty, not null

fix tests

Profile directory: do not require authentication

Profile directory: add tests

Include discoverable users only

last_status_at

profile directory

wip last_status_at

update docs

Merge remote-tracking branch 'origin/develop' into profile-directory

Add link headers in ChatController.index2

Formatting

Make notice compatibility routes optional

Pull websocket_client from Hex

Formatting for lint

ugg

Migration to fix Oban log param in database set to empty string "" instead of…

ArticleNotePageValidator: Drop replies if not a list

Add blockers_visible to features list when it's enabled

Add tests

Alphabetize BlockNotificationPolicy aliases

Format BlockNotificationPolicy

Allow assigning users to reports

Block notification policy

Fix test

fix after analysis failed

Also use actor_type to determine if an account is a bot in antiFollowbotPolicy

Add pack:pack-name as part of the tags regardless

Also use actor_type to determine if an account is a bot in antiFollowbotPolicy

antifollowbot now allows bots when target has #yesbot in their profile

Also use actor_type to determine if an account is a bot in antiFollowbotPolicy

Correct test "Pleroma:report is hidden for non-superusers"

Add display-name for custom emoji packs from Pleroma MR

Improve display_name_blank?/1 function for trailing spaces

Fix emoji mix task and its tests