summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2019-10-07Bump pleroma-fe bundle to https://git.pleroma.social/pleroma/pleroma-fe/commi...rinpatch
2019-10-07Merge branch 'backport/exclude-replies' into 'maint/1.1'kaniini
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
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
2019-10-07mastodon api: fix exclude_replies (closes #1287)Ariadne Conill
2019-10-07Merge branch 'feature/move-rss-out-of-ostatus' into 'develop'kaniini
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'kaniini
2019-10-07update changelog dateAriadne Conill
2019-10-07Merge branch 'chore/maint-1.1-1.1.0-rc2' into 'maint/1.1'kaniini
2019-10-07Pleroma 1.0.91 (aka 1.1 RC2).Ariadne Conill
2019-10-07Merge branch 'develop' into 'reactions'lain
2019-10-07Merge branch 'backport/remove-direct-messages-from-public-timeline' into 'mai...kaniini
2019-10-07Merge branch 'backport/chore-context-cleanups' into 'maint/1.1'kaniini
2019-10-07clean up bundled litepub schema (closes #1303)Ariadne Conill
2019-10-07Merge branch 'chore/context-cleanups' into 'develop'kaniini
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 the...eugenijm
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
2019-10-07Merge branch '1260-rate-limited-auth-actions' into 'develop'Haelwenn
2019-10-07Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limite...Ivan Tashkinov
2019-10-07Merge branch 'misskey-compat' into 'reactions'lain
2019-10-07Merge branch '1234-mastodon-2-4-3-oauth-scopes' into 'develop'Haelwenn
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
2019-10-06Merge branch 'backport/key-moveout-1.1' into 'maint/1.1'rinpatch
2019-10-06changelogAriadne Conill
2019-10-06Fix muted notification migration only working with a schemarinpatch
2019-10-06Merge branch 'fix/bad-migration' into 'develop'kaniini
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
2019-10-06Rename fields to fields_attributeskPherox
2019-10-06Merge branch 'backport/feature-poll-refresh' into 'maint/1.1'kaniini
2019-10-06Fix muted notification migration only working with a schemarinpatch
2019-10-06Merge branch 'backport/fix-report-email' into 'maint/1.1'kaniini
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