aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-07-27Merge remote-tracking branch 'upstream/develop' into by-approvalAlex Gleason
2020-07-27Merge branch 'develop' into 'cleanup/masto_fe-default_settings'lain
# Conflicts: # lib/pleroma/web/views/masto_fe_view.ex
2020-07-27masto_fe_view: Remove @default_settingsHaelwenn (lanodan) Monnier
2020-07-27Pipeline: Unify embedded_object / object_data, move to validator.lain
2020-07-27Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
embedded-object-federation
2020-07-27Merge branch 'issue/1934-welcome-email' into 'develop'lain
[#1934] welcome email See merge request pleroma/pleroma!2786
2020-07-27Apply 1 suggestion(s) to 1 file(s)lain
2020-07-27Merge branch 'fix/reverse-proxy-no-body-connection-leak' into 'develop'Haelwenn
ReverseProxy: Fix a gun connection leak when there is an error with no body See merge request pleroma/pleroma!2798
2020-07-27Merge branch 'fix/update-types-in-link-formatter' into 'develop'Haelwenn
Update types in Pleroma.Formatter group in description.exs See merge request pleroma/pleroma!2796
2020-07-26Merge remote-tracking branch 'upstream/develop' into by-approvalAlex Gleason
2020-07-26ReverseProxy tesla client: remove handling of old_connrinpatch
This is no longer relevant because we use a custom FollowRedirects middleware now
2020-07-26Merge branch 'patch-3' into 'develop'rinpatch
OpenAPI: Replace actor_id by account_id to follow ChatMessage schema See merge request pleroma/pleroma!2797
2020-07-26ReverseProxy: Fix a gun connection leak when there is an error with norinpatch
body - Modify `close/1` function to do the same thing it does for hackney, which is - close the client rather than the whole connection - Release the connection when there is no body to chunk
2020-07-26OpenAPI: remove accidentally pasted buffer dataAlibek Omarov
2020-07-26OpenAPI: Replace actor_id by account_id to follow ChatMessage schemaAlibek Omarov
2020-07-26Merge branch 'fix/mix-tasks' into 'develop'lain
Fix/mix tasks Closes #1972 and #1970 See merge request pleroma/pleroma!2795
2020-07-26Update types in Pleroma.Formatter groupAngelina Filippova
2020-07-25added migrate old settings to newMaksim Pechnikov
2020-07-24Ensure Oban is available during mix tasks.Mark Felder
Fixes: mix pleroma.user rm username
2020-07-24Fix mix tasks that make HTTP calls by starting the Gun connection poolMark Felder
2020-07-24CommonAPI Tests: Check that undoing objects federates them as embeds.Lain Soykaf
2020-07-24Side Effects: On undoing, put information about the undone object.Lain Soykaf
2020-07-24Pipeline: Add embedded object federation.Lain Soykaf
2020-07-24remove duplicate moduleMaksim Pechnikov
2020-07-23Merge branch 'unblock-domain-via-query' into 'develop'feld
Allow unblocking a domain via query params Closes #1971 See merge request pleroma/pleroma!2783
2020-07-23Support blocking via query parameters as well and document the change.Mark Felder
2020-07-23Merge branch 'feature/add-mrf-related-policies' into 'develop'feld
Add MRF related policies field to description.exs See merge request pleroma/pleroma!2790
2020-07-23Merge branch '1976-status-view-fixes' into 'develop'Haelwenn
StatusView: Handle badly formatted emoji reactions. Closes #1976 See merge request pleroma/pleroma!2788
2020-07-23Merge branch 'develop' into issue/1934-welcome-emailMaksim Pechnikov
2020-07-23Merge branch '1973-chats-fix-with-restrict-unauthenticated' into 'develop'lain
[#1973] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish :restrict_unauthenticated setting Closes #1973 See merge request pleroma/pleroma!2791
2020-07-23[#2791] AccountView: renamed `:force` option to `:skip_visibility_check`.Ivan Tashkinov
2020-07-23Merge branch 'bugfix/mrf-reject-logging' into 'develop'lain
Fix #783: Make MRF reject log as info level instead of error Closes #783 See merge request pleroma/pleroma!2758
2020-07-23Merge branch 'issue/1878' into 'develop'lain
[#1878] fix reset confirmation email in admin section See merge request pleroma/pleroma!2751
2020-07-23Merge branch 'linkify' into 'develop'lain
Fix Linkify See merge request pleroma/pleroma!2792
2020-07-23added warning to use old keysMaksim Pechnikov
2020-07-22Update linkify migration tests to use config from ConfigDBAlex Gleason
2020-07-22Migration to fix malformed Pleroma.Formatter configAlex Gleason
2020-07-22Refactor require_migration/1 into a test helper functionAlex Gleason
2020-07-22Add AutolinkerToLinkify migration testAlex Gleason
2020-07-22Fix linkify ConfigDB migrationAlex Gleason
2020-07-22[#1973] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish ↵Ivan Tashkinov
:restrict_unauthenticated. Made `Pleroma.Web.MastodonAPI.AccountView.render("show.json", _)` demand :for or :force option in order to prevent incorrect rendering of empty map instead of expected user representation with truish :restrict_unauthenticated setting.
2020-07-22Add related_policy fieldAngelina Filippova
2020-07-22Merge branch 'fix/pleroma-api-emoji-packs' into 'develop'lain
Fix /api/pleroma/emoji/packs index endpoint. See merge request pleroma/pleroma!2777
2020-07-22added check user email for welcome emailMaksim Pechnikov
2020-07-22StatusView: Handle badly formatted emoji reactions.Lain Soykaf
2020-07-22fix sender for welcome emailMaksim Pechnikov
2020-07-22Merge branch 'bugfix/limiter_git_url' into 'develop'lain
mix.exs: Append .git to git repo URLs Closes #1980 See merge request pleroma/pleroma!2787
2020-07-22mix.exs: Append .git to git repo URLsHaelwenn (lanodan) Monnier
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/1980
2020-07-22Merge branch 'develop' into issue/1023Maksim Pechnikov
2020-07-22update descriptionMaksim Pechnikov
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-22 03:56:39 +0000