summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-08-10ObjectAgePolicy: Fix pattern matching on publishedHaelwenn (lanodan) Monnier
2021-08-09Merge branch 'poll-notification' into 'develop'Haelwenn
MastodonAPI: Support poll notification See merge request pleroma/pleroma!3484
2021-08-09Merge branch 'simple_policy_reasons_for_instance_specific_policies' into ↵Haelwenn
'develop' Simple policy reasons for instance specific policies See merge request pleroma/pleroma!3314
2021-08-08Merge branch 'chores/2.4.0-develop' into 'develop'Haelwenn
Mergeback: 2.4.0 See merge request pleroma/pleroma!3494
2021-08-08mix.exs: 2.4.50Haelwenn (lanodan) Monnier
2021-08-08Update PleromaFE Bundle (2.4.0)Haelwenn (lanodan) Monnier
based on 51d3d8d255de221f7ac99e41f2f8e56c7d6a21a9
2021-08-06CHANGELOG.md: Fix instances of 2020 being actually 2021matildepark
2021-08-06Improve readabilityEgor Kislitsyn
2021-08-06Quarantine placeholdersIlja
* kePlaceholder and valuePlaceholder of quarantined_instances where in wrong case, should be snake_case * The mrf simple and transparency exclusion were already OK
2021-08-06improve changelog entryIlja
2021-08-06Make transparency_exclusions use tuples in admin-feIlja
* Make it use tuples * I also changed the keys for key_placeholder and value_placeholder to use snake_case instead of camelCase
2021-08-06Add key- and valuePlaceholders for quarantined_instances and mrf_simpleIlja
* I also added for keywordpolicy as well now. It was done in the admin-fe, but is better to be done here * I also added comments to explain why we did the _info keys (backwards compatibility)
2021-08-06Add transparency_exclusions also to the breaking changesIlja
2021-08-06Change docsIlja
* ./configuration/mrf.md * Change example * ./configuration/cheatsheet.md * Change descriptions to include that a reason is given * CHANGELOG.md * Add as breaking change
2021-08-06quarantine instances infoIlja
Added a new field in the nodeinfo called quarantined_instances_info This holds an object like `"quarantined_instances_info":{"quarantined_instances":{"quar.inst":{"reason":"whatever reason"}}}}`
2021-08-06Change what nodeinfo returns without breaking backwards compatibilityIlja
* Only for SimplePolicy for now * I added an extra mrf_simple_info key that has an object as value. The object contains only relevant extra info
2021-08-06Return maps in node_infoIlja
It's easiest (and imo most proper) to use tuples {"instance, "reason"} in BE, but for FE maps like %{"instance": "instance", "reason", "reason"} are better. I changed it so that node_info returns maps now for simple_policy and quarantined instances.
2021-08-06Add database migrationsIlja
* SimplePolicy * quarentine * transparency_exclusions
2021-08-06Fixed deprecation warning checksIlja
When a setting was deprecated, the code would stop checking for the rest of the possible deprications. This also meant that the settings weren't rewritten to the new settings for deprecated settings besides the first one.
2021-08-06config/description.exs: Update quarantine settings to tuplesIlja
2021-08-06make linter happyIlja
2021-08-06Deprecate transparency_exclusionsIlja
* Give deprecation message * Rewrite configs
2021-08-06config :mrf, :transparency_exclusions works with tumples nowIlja
2021-08-06Deprecate and rewrite settings for quarentine settingsIlja
* This is for the settings, not yet a DB migration
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-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-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