aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
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
2019-01-26README: Mastalab officially supports Pleroma.William Pitcock
2019-01-26Merge branch 'bugfix/content_nil_lenght_check' into 'develop'kaniini
2019-01-26Web.ActivityPub.ActivityPubTest: test against inserting activities with conte...Haelwenn (lanodan) Monnier
2019-01-26Web.ActivityPub.ActivityPub: Fix check_remote_limit/1 against activities with...Haelwenn (lanodan) Monnier
2019-01-25Merge branch 'oembed_provider' into 'develop'kaniini
2019-01-25Merge branch 'update/pleroma-fe-20190125-hotfix' into 'develop'lambda
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
2019-01-25Merge branch 'develop' into 'oembed_provider'kaniini
2019-01-25Merge branch 'classic-flakeids' into 'develop'kaniini
2019-01-25Merge branch 'update/pleroma-fe-20190125' into 'develop'kaniini
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
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
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
2019-01-23Send "hide_network" in user_viewMaxim Filippov
2019-01-23Merge branch 's3-namespace' into 'develop'kaniini
2019-01-23Merge branch 'fix-info-id' into 'develop'href
2019-01-23Fix info ids.lain
2019-01-23Merge branch 'rename/pleroma_activity_consistency' into 'develop'lambda
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
2019-01-23Test FlakeID old id compat & Ecto typehref
2019-01-23Flake Ids for Users and Activitieshref
2019-01-22Merge branch 'mr/20190122-activity-visibility-update' into 'develop'href
2019-01-22slightly changes definition so that autovacuum works paralell safe tooMichael Loftis
2019-01-22Merge branch 'fix/activity_get_by_id' into 'develop'Haelwenn
2019-01-22Merge branch '502_stats_fix_for_nil_info_deactivated' into 'develop'lambda
2019-01-22[#502] Fixed User.active_local_user_query to return users with nil or missing...Ivan Tashkinov
2019-01-22Merge branch 'uploader-controller' into 'develop'kaniini
2019-01-22Add get_by_id to activity.exrinpatch
2019-01-21Uploader callback controllerhref
2019-01-21Merge branch 'fix-buggy-test' into 'develop'rinpatch