aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-08-06Make quarentine work with list of tuples instead of stringsIlja
2021-08-06Add tests for setting `:instance, :quarantined_instances`Ilja
No test was done for quarantined instances yet. I added a factory for followers_only notes and checked * That no followers only post is send when the target server is quarantined * That a followers only post is send when the target server is not quarantined
2021-08-06Make mrfSimple work with tuplesIlja
* Changed SimplePolicy * I also grepped in test/ for ':mrf_simple' to see what other things could be affected
2021-08-06Deprectate strings for SimplePolicyIlja
When strings are detected in the simplepolicy, a warning will be given and the config will be changed to use tuples instead
2021-08-05Merge branch 'staff-plug' into 'develop'Haelwenn
Moderators: add UserIsStaffPlug See merge request pleroma/pleroma!3495
2021-08-04Merge remote-tracking branch 'pleroma/develop' into staff-plugAlex Gleason
2021-08-01Release 2.4.0Haelwenn (lanodan) Monnier
2021-08-01Update AdminFE bundleHaelwenn (lanodan) Monnier
2021-07-27use puts instead warnDaniel
2021-07-27Update dev.exs error message to write to stderr. Currently it dumps this ↵Daniel
message at the beginnig of the file when using vim-autoformat with mix format
2021-07-27Merge branch 'object-tombstone-visibility' into 'develop'feld
Visibility: check Tombstone objects in visible_for_user?/2 See merge request pleroma/pleroma!3490
2021-07-27Merge branch 'errorview-json-fix' into 'develop'feld
Fix errors in ErrorView See merge request pleroma/pleroma!3489
2021-07-27Merge remote-tracking branch 'pleroma/develop' into object-tombstone-visibilityAlex Gleason
2021-07-27Visibility: check Tombstone objects in visible_for_user?/2Alex Gleason
2021-07-27CHANGELOG: fixed JSON error renderingAlex Gleason
2021-07-27Merge remote-tracking branch 'pleroma/develop' into errorview-json-fixAlex Gleason
2021-07-27Add activity+json to Phoenix :format_encodersAlex Gleason
Fixes ErrorView rendering
2021-07-22Merge branch 'mkljczk-develop-patch-60115' into 'develop'Haelwenn
MastodonAPI: Fix list timelines Closes mastofe#89 and #2693 See merge request pleroma/pleroma!3477
2021-07-18CHANGELOG: Support `poll` notification typeAlex Gleason
2021-07-18Merge remote-tracking branch 'pleroma/develop' into poll-notification-fixesAlex Gleason
2021-07-18Poll notification: only notify local usersAlex Gleason
2021-07-18Poll notification: trigger PollWorker through common_pipelineAlex Gleason
2021-07-18PollWorker defensive checksAlex Gleason
2021-07-18Poll notification: notify for polls even when block_from_strangers is setAlex Gleason
2021-07-17MastodonAPI: Support poll notificationAlex Gleason
2021-07-17CHANGELOG: instance deletionAlex Gleason
2021-07-17Merge remote-tracking branch 'pleroma/develop' into instance-deletionAlex Gleason
2021-07-17AdminAPI.InstanceController: clean up tests, rename actionsAlex Gleason
2021-07-17AdminAPI: add DELETE /instances/:instance to delete all content from a ↵Alex Gleason
remote instance
2021-07-17Add Instance.delete_users_and_activities/1 to delete all content from a ↵Alex Gleason
remote instance
2021-07-17Upgrade Ecto to v3.6.2, remove deprecated ecto_explainAlex Gleason
2021-07-17Create AdminAPI.InstanceControllerAlex Gleason
2021-07-14Merge branch 'admin-api-users-sort' into 'develop'feld
AdminAPI: sort new users at the top Closes #2709 See merge request pleroma/pleroma!3481
2021-07-14Merge branch 'admin-api-users-date' into 'develop'feld
AdminAPI: add created_at date to users See merge request pleroma/pleroma!3482
2021-07-14CHANGELOG: AdminAPI return date with usersAlex Gleason
2021-07-14Merge remote-tracking branch 'pleroma/develop' into admin-api-users-dateAlex Gleason
2021-07-14AdminAPI: add date to usersAlex Gleason
2021-07-13CHANGELOG: AdminAPI users sortAlex Gleason
2021-07-13Merge remote-tracking branch 'pleroma/develop' into admin-api-users-sortAlex Gleason
2021-07-13AdminAPI: sort user results by ID descendingAlex Gleason
2021-07-12Moderators: reorganize :admin_api pipeline in RouterAlex Gleason
2021-07-12Moderators: add UserIsStaffPlugAlex Gleason
2021-07-12CHANGELOG: fixed user deletion database timeoutAlex Gleason
2021-07-12Merge remote-tracking branch 'pleroma/develop' into fix-object-deletion-timeoutAlex Gleason
2021-07-12Fix Activity.delete_all_by_object_ap_id/1 timeout so users can be deletedAlex Gleason
2021-07-12Merge branch 'features/ingestion-page' into 'develop'Haelwenn
Pipeline Ingestion: Page See merge request pleroma/pleroma!3097
2021-07-12Merge branch 'features/validators-apc2s' into 'develop'Haelwenn
AP C2S: Remove restrictions and make it go through pipeline See merge request pleroma/pleroma!3203
2021-07-12AP C2S: Remove restrictions and make it go through pipelineHaelwenn (lanodan) Monnier
2021-07-10Delete MastoFE Controller TestSean King
2021-07-10Merge develop branch upstreamSean King