aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web
AgeCommit message (Collapse)Author
2021-08-14Merge branch 'builder-note' into 'develop'Haelwenn
CommonAPI.Utils.make_note_data/1 --> ActivityPub.Builder.note/1 See merge request pleroma/pleroma!3511
2021-08-14Builder.note/1: return {:ok, map(), keyword()} like other Builder functionsAlex Gleason
2021-08-14Add Admin-FE menu for StealEmojiPolicySam Therapy
2021-08-14CommonAPI.Utils.make_note_data/1 --> ActivityPub.Builder.note/1Alex Gleason
2021-08-14Selecting MRF policies didn't work as intended any moreIlja
* Policies were put under a new module (Pleroma.Web.ActivityPub.MRF.Policy instead of Pleroma.Web.ActivityPub.MRF), but this wasn't changed in the Pleroma.Web.ActivityPub.MRF @mrf_config_descriptions * I don't have a unit test to prevent similar problems in the future because I don't find a proper way to do it * The descriptions in the unit tests are defined in the unit tests, so if someone changes module names in the code, the tests wont see it * The list is generated in Pleroma.Docs.Generator.list_behaviour_implementations, but I can't do a check in the when clause of the function to see if the provided module is a behaviour or not.
2021-08-13Streamer: fix crash in MastodonAPI.StatusViewAlex Gleason
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3508
2021-08-13AdminAPI: hotfix for nil report objectsAlex Gleason
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3504
2021-08-13maybe_notify_subscribers: Don't create notifications from ingested repliesHaelwenn (lanodan) Monnier
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3505
2021-08-13TwitterAPI: Make change_email require body params instead of queryHaelwenn (lanodan) Monnier
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3503
2021-08-13TwitterAPI: Make change_password require body params instead of queryHaelwenn (lanodan) Monnier
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3503
2021-08-13ObjectAgePolicy: Fix pattern matching on publishedHaelwenn (lanodan) Monnier
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3500
2021-08-13fix: stream out Create ActivitykPherox
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3499
2021-08-13Merge branch 'streamer-crash-fix' into 'develop'Haelwenn
Streamer crash fix See merge request pleroma/pleroma!3508
2021-08-13Streamer: fix crash in MastodonAPI.StatusViewAlex Gleason
2021-08-11Merge branch 'nil-report-object-hotfix' into 'develop'Haelwenn
AdminAPI: hotfix for nil report objects See merge request pleroma/pleroma!3504
2021-08-11ObjectValidator.stringify_keys: filter out nil valuesHaelwenn (lanodan) Monnier
2021-08-11Merge branch 'bugfix/subscriptions-replies' into 'develop'Haelwenn
maybe_notify_subscribers: Normalize Object to check inReplyTo presence Closes #2732 See merge request pleroma/pleroma!3505
2021-08-11maybe_notify_subscribers: Don't create notifications from ingested messagesHaelwenn (lanodan) Monnier
2021-08-11AdminAPI: hotfix for nil report objectsAlex Gleason
2021-08-10Merge branch 'bugfix/change_password' into 'develop'Haelwenn
TwitterAPI: Make change_password require body params instead of query Closes #2740 See merge request pleroma/pleroma!3503
2021-08-10TwitterAPI: Make change_email require body params instead of queryHaelwenn (lanodan) Monnier
2021-08-10Merge branch 'bugfix/object-age-create' into 'develop'Haelwenn
ObjectAgePolicy: Fix pattern matching on published See merge request pleroma/pleroma!3500
2021-08-10TwitterAPI: Make change_password require body params instead of queryHaelwenn (lanodan) Monnier
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2740
2021-08-10ObjectAgePolicy: Fix pattern matching on publishedHaelwenn (lanodan) Monnier
2021-08-09Merge branch 'fix/streaming-api-for-create-activity' into 'develop'Haelwenn
fix: stream out Create Activity Closes #2691 See merge request pleroma/pleroma!3499
2021-08-09Merge branch 'poll-notification' into 'develop'Haelwenn
MastodonAPI: Support poll notification See merge request pleroma/pleroma!3484
2021-08-09fix: stream out Create ActivitykPherox
2021-08-06Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remove/mastofeSean King
2021-08-06Improve readabilityEgor Kislitsyn
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-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-06config :mrf, :transparency_exclusions works with tumples nowIlja
2021-08-06Make quarentine work with list of tuples instead of stringsIlja
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-05Merge remote-tracking branch 'pleroma/develop' into moderatorsAlex Gleason
2021-08-04Merge remote-tracking branch 'pleroma/develop' into staff-plugAlex Gleason
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-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-18Merge remote-tracking branch 'pleroma/develop' into poll-notification-fixesAlex Gleason
2021-07-18Poll notification: trigger PollWorker through common_pipelineAlex Gleason
2021-07-17MastodonAPI: Support poll notificationAlex 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-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