aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-07Line is too long!Maxim Filippov
2019-10-07mastodon api: fix exclude_replies (closes #1287)Ariadne Conill
2019-10-07Merge branch 'bugfix/exclude-replies' into 'develop'kaniini
mastodon api: fix exclude_replies (closes #1287) Closes #1287 See merge request pleroma/pleroma!1813
2019-10-07Merge branch 'develop' into feature/reports-groups-and-multiple-state-updateMaxim Filippov
2019-10-07Admin API: Reports, grouped by statusMaxim Filippov
2019-10-07Merge branch 'develop' into 'reactions'lain
# Conflicts: # CHANGELOG.md
2019-10-07mastodon api: fix exclude_replies (closes #1287)Ariadne Conill
2019-10-07Merge branch 'feature/move-rss-out-of-ostatus' into 'develop'kaniini
Extract RSS Feed functionality from OStatus Closes #1243 See merge request pleroma/pleroma!1644
2019-10-07Extract RSS Feed functionality from OStatusSergey Suprunenko
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 'develop' into 'reactions'lain
# Conflicts: # priv/static/schemas/litepub-0.1.jsonld
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-07Merge branch 'chore/context-cleanups' into 'develop'kaniini
clean up bundled litepub schema (closes #1303) Closes #1303 See merge request pleroma/pleroma!1808
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-07Linting.lain
2019-10-07Merge remote-tracking branch 'origin/develop' into reactionslain
2019-10-07Merge branch 'mrf/simple_policy/check_actor' into 'develop'kaniini
mrf/simple_policy: check actor against accept/reject See merge request pleroma/pleroma!1806
2019-10-07Merge branch '1260-rate-limited-auth-actions' into 'develop'Haelwenn
[#1260] Rate-limiting for create authentication and related requests Closes #1260 See merge request pleroma/pleroma!1681
2019-10-07Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1260-rate-limited-auth-actions # Conflicts: # CHANGELOG.md
2019-10-07Merge branch 'misskey-compat' into 'reactions'lain
Transmogrifier: Handle misskey likes with reactions like EmojiReactions. See merge request pleroma/pleroma!1783
2019-10-07Merge branch '1234-mastodon-2-4-3-oauth-scopes' into 'develop'Haelwenn
[#1234] Mastodon 2.4.3 hierarchical OAuth scopes Closes #1234 See merge request pleroma/pleroma!1643
2019-10-07mrf/simple_policy: check actor against accept/rejectHaelwenn (lanodan) Monnier
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-06Merge branch 'fix/bad-migration' into 'develop'kaniini
Fix muted notification migration only working with a schema See merge request pleroma/pleroma!1803
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-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-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
generated by cgit v1.2.3 (git 2.26.2) at 2025-05-12 15:44:08 +0000