aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-07-28SimpleMRF: Let instances be silencedAlex Gleason
2020-07-28Merge branch 'fix/gun-pool-missing-cast' into 'develop'rinpatch
gun ConnectionPool: Re-add a missing cast for remove_client See merge request pleroma/pleroma!2805
2020-07-28gun ConnectionPool: Re-add a missing cast for remove_clientrinpatch
2020-07-28Let favourites and emoji reactions optionally be hiddenAlex Gleason
2020-07-28Merge branch 'gun-replace-cast-with-call' into 'develop'rinpatch
gun ConnectionPool: replace casts with calls See merge request pleroma/pleroma!2803
2020-07-28gun ConnectionPool: replace casts with callsrinpatch
The slowdown from this is most likely immesurable, however it eliminates possible false positives when tracking dead clients.
2020-07-28Merge branch 'chore/frontends-config-clarification' into 'develop'lain
Clarify location of frontends directory See merge request pleroma/pleroma!2802
2020-07-28Clarify location of frontends directoryMark Felder
2020-07-28Merge branch 'frontend-bundles-redux' into 'develop'lain
Changeable frontends MVP See merge request pleroma/pleroma!2801
2020-07-28Cheatsheet: Add even more info.lain
2020-07-28Cheatsheet: Add more info.lain
2020-07-28Docs: Add frontend info to cheat sheet.lain
2020-07-28Add description for configuration.Roman Chvanikov
2020-07-28FrontendStatic: Add plug to serve frontends based on configuration.lain
2020-07-28InstanceStatic: Refactor.lain
2020-07-28Merge branch 'issue/1986-earmark' into 'develop'lain
[#1986] locked the earmark version See merge request pleroma/pleroma!2800
2020-07-28Merge branch 'cleanup/masto_fe-default_settings' into 'develop'lain
masto_fe_view: Remove @default_settings See merge request pleroma/pleroma!2799
2020-07-28locked earmark versionMaksim Pechnikov
2020-07-27Fix User.registration_reason HTML sanitizing issuesAlex Gleason
2020-07-27Lint, fix testAlex Gleason
2020-07-27Merge branch 'embedded-object-federation' into 'develop'Haelwenn
Embedded object federation Closes #1959 See merge request pleroma/pleroma!2794
2020-07-27Add :registration_reason_length to description.exsAlex Gleason
2020-07-27Add configurable registration_reason limitAlex Gleason
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
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-22 23:13:03 +0000