aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-10-12Merge branch 'fix/mediaproxy-too-brutal' into 'develop'rinpatch
Make MediaProxy failure tracking less brutal See merge request pleroma/pleroma!1836 (cherry picked from commit 930cbd6d05653033e9f6d16960d698f5db4ae624) 9bdbf081 Make MediaProxy failure tracking less brutal
2019-10-11Merge branch 'cherry-pick-44afe4c8' into 'maint/1.1'rinpatch
Backport pleroma-ctl enchancements to maint See merge request pleroma/pleroma!1833
2019-10-11Merge branch 'pleroma-ctl-enchancements' into 'develop'Haelwenn
pleroma_ctl: Make it possible to specify branches/flavours when updating See merge request pleroma/pleroma!1832 (cherry picked from commit 44afe4c8870d14ae2cd22ff5cfa04555cf5907bd) b750135a pleroma_ctl: Make it possible to specify branches/flavours when updating
2019-10-07Merge branch 'backport/exclude-replies' into 'maint/1.1'kaniini
mastodon api: fix exclude_replies (closes #1287) See merge request pleroma/pleroma!1816
2019-10-07mastodon api: fix exclude_replies (closes #1287)Ariadne Conill
2019-10-07Merge branch 'chore/maint-1.1-1.1.0-rc2' into 'maint/1.1'v1.0.91kaniini
update changelog date See merge request pleroma/pleroma!1812
2019-10-07update changelog dateAriadne Conill
2019-10-07Merge branch 'chore/maint-1.1-1.1.0-rc2' into 'maint/1.1'kaniini
Pleroma 1.0.91 (aka 1.1 RC2). See merge request pleroma/pleroma!1811
2019-10-07Pleroma 1.0.91 (aka 1.1 RC2).Ariadne Conill
2019-10-07Merge branch 'backport/remove-direct-messages-from-public-timeline' into ↵kaniini
'maint/1.1' backport: Mastodon API: Fix private and direct statuses not being filtered out from the... See merge request pleroma/pleroma!1807
2019-10-07Merge branch 'backport/chore-context-cleanups' into 'maint/1.1'kaniini
clean up bundled litepub schema (closes #1303) See merge request pleroma/pleroma!1809
2019-10-07clean up bundled litepub schema (closes #1303)Ariadne Conill
2019-10-07Mastodon API: Fix private and direct statuses not being filtered out from ↵eugenijm
the public timeline for an authenticated user (`GET /api/v1/timelines/public`)
2019-10-06Merge branch 'backport/custom-field-update' into 'maint/1.1'kaniini
Backport: custom field update See merge request pleroma/pleroma!1805
2019-10-06Merge branch 'backport/key-moveout-1.1' into 'maint/1.1'rinpatch
Backport moving out keys from user info to 1.1 See merge request pleroma/pleroma!1801
2019-10-06changelogAriadne Conill
2019-10-06Fix muted notification migration only working with a schemarinpatch
Should also improve performance. I tested it on my local DB, but if anyone has a backup of <=1.0 db they can test this on, please do
2019-10-06Extract if block into private functionkPherox
2019-10-06Update test for custom fields when content-type urlencodedkPherox
2019-10-06Update test for custom fields when name empty stringkPherox
2019-10-06Change to delete empty name fieldkPherox
2019-10-06Fix type of fields_attributeskPherox
Convert tuple list to map list when parameters is `:urlencoded` or `:multipart`
2019-10-06Rename fields to fields_attributeskPherox
2019-10-06Merge branch 'backport/feature-poll-refresh' into 'maint/1.1'kaniini
backport: poll refreshing See merge request pleroma/pleroma!1804
2019-10-06Merge branch 'backport/fix-report-email' into 'maint/1.1'kaniini
backport: Use the user.id instead of nickname in report URLs See merge request pleroma/pleroma!1802
2019-10-06add changelogAriadne Conill
2019-10-06Fix credo issuesrinpatch
2019-10-06Do not refetch local objectsrinpatch
2019-10-06Preserve internal fields when reinjectingrinpatch
2019-10-06Move object internal fields to a constantrinpatch
2019-10-06Set updated_at even if the object stayed the samerinpatch
2019-10-06Fix wrong argument order when calling NaiveDateTime.diffrinpatch
2019-10-06Capture log in object refetch testsrinpatch
2019-10-06Initial poll refresh supportrinpatch
Implement refreshing the object with an interval and call the function when getting the poll.
2019-10-06Use the user.id instead of nickname in report URLsfeld
Ensures links to profiles of remote users work.
2019-10-06Fix the use of queries with a schema in a migrationrinpatch
2019-10-06Move local keys out of `user.info`rinpatch
2019-10-05Merge branch 'backport/update-activity-fixes' into 'maint/1.1'kaniini
backport update activity fixes to maint/1.1 See merge request pleroma/pleroma!1797
2019-10-05update changelogAriadne Conill
2019-10-05CommonAPI: Create profile updates as public.lain
This saves us lots of sending out because we can use sharedInbox.
2019-10-05ActivityPub / Transmogrifier: Correctly store incoming Update id.lain
2019-10-04Merge branch 'backport/bugfix-notification-nil-actor' into 'maint/1.1'kaniini
backport MR 1779 to maint/1.1 See merge request pleroma/pleroma!1791
2019-10-04update changelogAriadne Conill
2019-10-04notification_view.ex: Make sure `account` isn’t emptyHaelwenn (lanodan) Monnier
Related: https://git.pleroma.social/pleroma/pleroma/issues/1203
2019-10-04Merge branch 'backport/hex-flake-id' into 'maint/1.1'kaniini
backport: hex `flake_id` support See merge request pleroma/pleroma!1793
2019-10-04Merge branch 'backport/feature-track-reverse-proxy-failures' into 'maint/1.1'kaniini
backport: Track failed proxy urls and don't request them again See merge request pleroma/pleroma!1792
2019-10-04changelogAriadne Conill
2019-10-04Replace `Pleroma.FlakeId` with `flake_id` hex packageEgor Kislitsyn
2019-10-04Track failed proxy urls and don't request them againSergey Suprunenko
2019-10-04Merge branch 'backport/issue-1296' into 'maint/1.1'kaniini
backport 1296 fix to maint/1.1 See merge request pleroma/pleroma!1790