aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma
AgeCommit message (Collapse)Author
2020-07-29Merge branch 'by-approval' into 'develop'lain
Registrations "by approval" mode Closes #1931 See merge request pleroma/pleroma!2757
2020-07-29Endpoint: Serve a dynamically configured admin interfacelain
2020-07-29FrontendStatic: Work correctly for other frontend types.lain
2020-07-29AccountController: Don't explicitly ask to keep users unconfirmed.lain
Confirmation is set in User.register_changeset based on the config settings.
2020-07-29EnsureRePrepended: Don't break on chat messages.lain
2020-07-28SimpleMRF silence: optimize, work okay with nil values in addressingAlex Gleason
2020-07-28SimpleMRF: Let instances be silencedAlex Gleason
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-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-28FrontendStatic: Add plug to serve frontends based on configuration.lain
2020-07-28InstanceStatic: Refactor.lain
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-27Fix User.registration_reason HTML sanitizing issuesAlex Gleason
2020-07-27Lint, fix testAlex 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-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-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-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 '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-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-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-21Skip the correct plugMark Felder
2020-07-21Revert "Merge branch 'revert-2b5d9eb1' into 'develop'"lain
This reverts merge request !2784
2020-07-21Revert "Merge branch 'linkify' into 'develop'"lain
This reverts merge request !2677
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-22 16:14:32 +0000