aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-01-26Web.MastodonAPI.MastodonAPIController: generic get_status_card/1 function ↵Haelwenn (lanodan) Monnier
for MastoAPI 2.6.x Mastodon API 2.6.x added a card key to the Status object so the Card can be shown in the timeline without an extra request at each status.
2019-01-26Web.MastodonAPI.MastodonAPIController: Add Rich-Media supportHaelwenn (lanodan) Monnier
2019-01-26Move definitions of RichMedia fixtures to test/support/http_request_mock.exHaelwenn (lanodan) Monnier
2019-01-26Merge branch 'documentation/mastalab' into 'develop'kaniini
README: Mastalab officially supports Pleroma. See merge request pleroma/pleroma!713
2019-01-26README: Mastalab officially supports Pleroma.William Pitcock
2019-01-26Merge branch 'bugfix/content_nil_lenght_check' into 'develop'kaniini
Web.ActivityPub.ActivityPub: Fix check_remote_limit/1 against activities with content: nil See merge request pleroma/pleroma!711
2019-01-26Web.MastodonAPI.MastodonAPIControllerTest: Update for difference between all ↵Haelwenn (lanodan) Monnier
and any parameters
2019-01-26Fix the logic in multi-hashtag TLsHaelwenn (lanodan) Monnier
2019-01-26Web.ActivityPub.ActivityPub: Simplify multi-hashtag, add testsHaelwenn (lanodan) Monnier
2019-01-26Web.MastodonAPI.MastodonAPIControllerTest: Add test against multi-hashtag ↵Haelwenn (lanodan) Monnier
timeline
2019-01-26[Web.ActivityPub.ActivityPub]: Fix restrict_tag()Haelwenn (lanodan) Monnier
Thanks to Senko-san <kurisu@iscute.moe> for the help on array-matching
2019-01-26[WIP,MastoAPI] Multi-tag timelinesHaelwenn (lanodan) Monnier
2019-01-26Web.ActivityPub.ActivityPubTest: test against inserting activities with ↵Haelwenn (lanodan) Monnier
content: null
2019-01-26Web.ActivityPub.ActivityPub: Fix check_remote_limit/1 against activities ↵Haelwenn (lanodan) Monnier
with content: nil
2019-01-25[#534] Federation reachability filtering tests.Ivan Tashkinov
2019-01-25[#534] Made Salmon.send_to_user calls be handled through Federator.enqueue.Ivan Tashkinov
2019-01-25SPC fixes: Fix activities.lain
2019-01-25[#534] Websub fix: made SQL use UTC time zone when comparing with ↵Ivan Tashkinov
`valid_until` (instead of postgresql-server default time zone).
2019-01-25Merge branch 'oembed_provider' into 'develop'kaniini
Opengraph/TwitterCard::summary for statuses and user profiles See merge request pleroma/pleroma!533
2019-01-25[#534] Configurable outgoing federation reachability timeout.Ivan Tashkinov
2019-01-25Merge branch 'update/pleroma-fe-20190125-hotfix' into 'develop'lambda
update pleroma frontend (summary_html hotfix) See merge request pleroma/pleroma!710
2019-01-25update pleroma frontend (summary_html hotfix)William Pitcock
2019-01-25Fix OGP provider testsrinpatch
2019-01-25Merge remote-tracking branch 'pl/develop' into oembed_providerrinpatch
2019-01-25Merge branch 'fix/tusky-dm' into 'develop'kaniini
Add actor to recipients list Closes #390 See merge request pleroma/pleroma!683
2019-01-25Merge branch 'develop' into 'oembed_provider'kaniini
# Conflicts: # lib/pleroma/activity.ex
2019-01-25Merge branch 'classic-flakeids' into 'develop'kaniini
Flake Ids for Users and Activities Closes #450 See merge request pleroma/pleroma!645
2019-01-25Merge branch 'update/pleroma-fe-20190125' into 'develop'kaniini
update pleroma frontend See merge request pleroma/pleroma!709
2019-01-25update pleroma frontendWilliam Pitcock
2019-01-24Use correct logic to determine "attentions" listMaxim Filippov
2019-01-24[#534] Optimized bulk publish ops to filter on reachability early. ↵Ivan Tashkinov
`Instance` refactoring.
2019-01-24Fix clippy with one/five lineshref
2019-01-24[#534] Updating external instances reachability on incoming federation.Ivan Tashkinov
2019-01-24Merge branch 'fix-activity_visibility-autovacuum' into 'develop'kaniini
Fix postgres activity_visibility when running in autovacuum See merge request pleroma/pleroma!708
2019-01-24Fix postgres activity_visibility when running in autovacuumhref
2019-01-24FlakeId: ignore null mac for workerid, use first machref
2019-01-24Merge branch 'feature/mrf-anti-followbot' into 'develop'href
mrf: add anti-followbot policy See merge request pleroma/pleroma!706
2019-01-24test: add anti-followbot policy testsWilliam Pitcock
2019-01-24mrf: add anti-followbot policyWilliam Pitcock
2019-01-24[#534] Federation publish requests status control (enforced 2xx response ↵Ivan Tashkinov
code check).
2019-01-23Merge branch 'fix/hide-network-setting' into 'develop'kaniini
Send "hide_network" in user_view See merge request pleroma/pleroma!704
2019-01-23Send "hide_network" in user_viewMaxim Filippov
2019-01-23[#534] Initial implementation of unreachable federation targets retirement.Ivan Tashkinov
2019-01-23Merge branch 's3-namespace' into 'develop'kaniini
S3 uploader: support for namespaced bucket Closes #532 See merge request pleroma/pleroma!699
2019-01-23Merge branch 'fix-info-id' into 'develop'href
Fix info ids. Closes #511 See merge request pleroma/pleroma!702
2019-01-23Fix info ids.lain
The previous migration actually created values for the key "id", including the quotes. This one should fill out all missing ids. Closes #511
2019-01-23Merge branch 'rename/pleroma_activity_consistency' into 'develop'lambda
Consistent fonction names in Pleroma.Activity See merge request pleroma/pleroma!690
2019-01-23Merge branch 'develop' into rename/pleroma_activity_consistencylain
2019-01-23New frontend configuration mechanism.lain
2019-01-23FlakeId: chain alter statementshref