Commit Graph

6744 Commits (762c9ea5641ad67f0e664ad584f5cc1a5ed84857)

Author SHA1 Message Date
lain 762c9ea564 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into embedded-object-federation
4 years ago
lain 2a3abfd326 Merge branch 'issue/1934-welcome-email' into 'develop'
4 years ago
lain 0d5d1c62ef Apply 1 suggestion(s) to 1 file(s)
4 years ago
Haelwenn 64b21cee14 Merge branch 'fix/reverse-proxy-no-body-connection-leak' into 'develop'
4 years ago
rinpatch 6bf8eee5f9 ReverseProxy tesla client: remove handling of old_conn
4 years ago
rinpatch d4fbec62a3 ReverseProxy: Fix a gun connection leak when there is an error with no
4 years ago
Alibek Omarov 6107440ea0 OpenAPI: remove accidentally pasted buffer data
4 years ago
Alibek Omarov b31844d6e0 OpenAPI: Replace actor_id by account_id to follow ChatMessage schema
4 years ago
Mark Felder 65a1b048a8 Ensure Oban is available during mix tasks.
4 years ago
Mark Felder 9be6668236 Fix mix tasks that make HTTP calls by starting the Gun connection pool
4 years ago
Lain Soykaf 3d13fb05f8 Side Effects: On undoing, put information about the undone object.
4 years ago
Lain Soykaf 91f3cf9bc6 Pipeline: Add embedded object federation.
4 years ago
Maksim Pechnikov 61ef1fca4b remove duplicate module
4 years ago
feld 51627a10e5 Merge branch 'unblock-domain-via-query' into 'develop'
4 years ago
Mark Felder 4bfad0b483 Support blocking via query parameters as well and document the change.
4 years ago
Haelwenn 6100b90209 Merge branch '1976-status-view-fixes' into 'develop'
4 years ago
Maksim Pechnikov 67ab9a7928 Merge branch 'develop' into issue/1934-welcome-email
4 years ago
lain 76aa49a0c5 Merge branch '1973-chats-fix-with-restrict-unauthenticated' into 'develop'
4 years ago
Ivan Tashkinov 9ea51a6de5 [#2791] AccountView: renamed `:force` option to `:skip_visibility_check`.
4 years ago
lain b2ba70eec4 Merge branch 'bugfix/mrf-reject-logging' into 'develop'
4 years ago
lain 250e0369c7 Merge branch 'issue/1878' into 'develop'
4 years ago
lain a81581472f Merge branch 'linkify' into 'develop'
4 years ago
Maksim Pechnikov 7991ddad58 added warning to use old keys
4 years ago
Ivan Tashkinov 6f5f7af607 [#1973] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish :restrict_unauthenticated.
4 years ago
lain 1c9752cff4 Merge branch 'fix/pleroma-api-emoji-packs' into 'develop'
4 years ago
Maksim Pechnikov db0224d174 added check user email for welcome email
4 years ago
Lain Soykaf 0cb9e1da74 StatusView: Handle badly formatted emoji reactions.
4 years ago
Maksim Pechnikov 5879d36854 fix sender for welcome email
4 years ago
Mark Felder 341a8f3500 Skip the correct plug
4 years ago
lain 5b1eeb06d8 Revert "Merge branch 'revert-2b5d9eb1' into 'develop'"
4 years ago
lain 696c13ce54 Revert "Merge branch 'linkify' into 'develop'"
4 years ago
Mark Felder 97c60b6a43 Merge branch 'develop' into fix/pleroma-api-emoji-packs
4 years ago
lain 2b5d9eb105 Merge branch 'linkify' into 'develop'
4 years ago
lain fa2421dd7e Merge branch 'gopher-fix' into 'develop'
4 years ago
Egor Kislitsyn bdb3375933
Allow unblocking a domain via query params
4 years ago
Maksim Pechnikov 3edaecae96 added welcome email
4 years ago
Alex Gleason 204dddcfaa
Pleroma.Formatter can have partial updates
4 years ago
href 4bac25e6f5 Don't enable Pleroma.HTTP.Middleware.FollowRedirects unless Gun is used
4 years ago
KokaKiwi 7ce722ce3e
Fix /api/pleroma/emoji/packs index endpoint.
4 years ago
Haelwenn 10d46235cf Merge branch 'fix-1958' into 'develop'
4 years ago
Alex Gleason 48f8b26c92
OpenAPI: Add :id to follower/following endpoints, fixes #1958
4 years ago
Mark Felder 20a496d2cb Expose the post formats in /api/v1/instance
4 years ago
Alexander Strizhakov af376cbffb
using atom keys in search params
4 years ago
Mark Felder 62438530e2 TOTP length is configurable, so we can't hardcode this here.
4 years ago
Alex Gleason 38425ebdbf
Merge remote-tracking branch 'upstream/develop' into linkify
4 years ago
Mark Felder 3be64556db Improve TOTP token and recovery input fields in OAuth login
4 years ago
Mark Felder b2d398b1d0 Merge branch 'develop' into refactor/gun-pool-registry
4 years ago
Mark Felder 9d30bacace Merge branch 'develop' into refactor/notification_settings
4 years ago
rinpatch 0fe36b311c Merge branch 'features/mrf-reasons' into 'develop'
4 years ago
Haelwenn (lanodan) Monnier d29b8997f4
MastoAPI: fix & test giving MRF reject reasons
4 years ago