summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
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
slightly changes definition so that autovacuum works parallel safe too Closes #540 See merge request pleroma/pleroma!697
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
Add get_by_id to activity.ex See merge request pleroma/pleroma!695
2019-01-22Merge branch '502_stats_fix_for_nil_info_deactivated' into 'develop'lambda
[#502] Stats fix (users with nil or missing `info.deactivated` should be treated active) Closes #502 See merge request pleroma/pleroma!696
2019-01-22[#502] Fixed User.active_local_user_query to return users with nil or ↵Ivan Tashkinov
missing `info.deactivated`. Adjusted test.
2019-01-22Merge branch 'uploader-controller' into 'develop'kaniini
Uploader callback controller See merge request pleroma/pleroma!694
2019-01-22Add get_by_id to activity.exrinpatch
2019-01-21Uploader callback controllerhref
2019-01-21Merge branch 'fix-buggy-test' into 'develop'rinpatch
Fix buggy test. See merge request pleroma/pleroma!693
2019-01-21Fix buggy test.lain
2019-01-21Merge branch 'proxy-no-default-plug-cache' into 'develop'lambda
Always override plug's default cache-control in reverse proxy See merge request pleroma/pleroma!692
2019-01-21reverse_proxy - always override plug's cache-controlhref
2019-01-21S3 Namespacehref
2019-01-21Merge branch '530_federator_user_info_overwrite_fix' into 'develop'lambda
[#530] Prevents user `info` from being overwritten because of race conditions Closes #530 See merge request pleroma/pleroma!691
2019-01-21Merge branch 'feature/dm-sanity' into 'develop'lambda
DM sanitization See merge request pleroma/pleroma!458
2019-01-21[#502] Code comments update.Ivan Tashkinov
2019-01-21[#530] Fixed test.Ivan Tashkinov
2019-01-21[#530] Prevents user `info` from being overwritten because of race conditionsIvan Tashkinov
and non-partial update of embed (in WebFinger.ensure_keys_present and other places).
2019-01-21Activity: mix format (2 empty lines)Haelwenn (lanodan) Monnier
2019-01-21Activity: get_create_activity_by_object_ap_id/1 → get_create_by_object_ap_id/1Haelwenn (lanodan) Monnier
2019-01-21Activity: create_activity_by_object_id_query/1 → create_by_object_ap_id/1 ↵Haelwenn (lanodan) Monnier
when is_list
2019-01-21Activity: get_all_by_object_ap_id/1 → get_all_create_by_object_ap_id/1Haelwenn (lanodan) Monnier
2019-01-21Activity: all_by_object_ap_id_q/1 → create_by_object_ap_id/1Haelwenn (lanodan) Monnier
2019-01-21Activity: all_non_create_by_object_ap_id_q → by_object_ap_idHaelwenn (lanodan) Monnier
2019-01-21Activity: all_by_object_ap_id/1 → get_all_by_object_ap_id/1Haelwenn (lanodan) Monnier
2019-01-21Merge branch 'bugfix/gen_signing_salt' into 'develop'rinpatch
Mix.Tasks.Pleroma.Instance: Generate signing_salt Closes #533 See merge request pleroma/pleroma!689
2019-01-21Mix.Tasks.Pleroma.Instance: Generate signing_saltHaelwenn (lanodan) Monnier
Closes: https://git.pleroma.social/pleroma/pleroma/issues/533