summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-01-26Merge branch 'flake-from-int' into 'develop'kaniini
Flake: support integers in from_string/1 See merge request pleroma/pleroma!715
2019-01-26Flake: support integers in from_string/1href
Some previously issued stateless tokens have integer ids in them.
2019-01-26Merge branch 'join-in-preloads' into 'develop'kaniini
Join on preloads to avoid N+1 queries See merge request pleroma/pleroma!714
2019-01-26Merge branch 'features/mastoapi-cards' into 'develop'kaniini
MastoAPI: Add Rich-Media support See merge request pleroma/pleroma!664
2019-01-26mastodon api: use OGP uri instead of page_url for deducing domain name, fix testWilliam Pitcock
2019-01-26mastodon api: use HTML.extract_first_external_url()William Pitcock
2019-01-26Join on preloads to avoid N+1 querieshref
2019-01-26html: add utility function to extract first URL from an object and cache the ↵William Pitcock
result
2019-01-26mastodon api: provider_name setting is required too on the cardWilliam Pitcock
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.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-25Merge branch 'oembed_provider' into 'develop'kaniini
Opengraph/TwitterCard::summary for statuses and user profiles See merge request pleroma/pleroma!533
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-24Fix clippy with one/five lineshref
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-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-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-23FlakeId: chain alter statementshref
2019-01-23Flake: migrate pinned_activities in jsonbhref
2019-01-23Clippy!href
2019-01-23Lock activities/users table during flake migration.href
2019-01-23Treat User.Info pinned ids as stringshref
2019-01-23FlakeId.from_string/1: remove old, un-needed conversionhref
2019-01-232019href
2019-01-23ActivityPub: restrict_since/restrict_max: ignore empty paramhref
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-25 06:31:21 +0000