summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2019-10-18Merge branch 'release/1.1.2' into 'stable'v1.1.2rinpatch
2019-10-19pleroma_ctl: Fix attempting to use RPC for config generationrinpatch
2019-10-19Bump version to 1.1.2 in mix.exsrinpatch
2019-10-18Merge branch 'release/1.1.1' into 'stable'v1.1.1rinpatch
2019-10-18Add a changelog entry for user search refactoringrinpatch
2019-10-18Remove a failing search test due to it being unrealisticrinpatch
2019-10-18Order fts results by trigramrinpatch
2019-10-18User search: Remove trigram and refactor the modulerinpatch
2019-10-18Bump the version in mix.exsrinpatch
2019-10-18Merge branch 'bugfix/jsonb-set-fuckup' into 'release/1.1.1'rinpatch
2019-10-18Add a changelog entry for yet another jsonb_set data lossrinpatch
2019-10-18Add a test for safe_jsonb_setrinpatch
2019-10-18Fix a migration wiping user info of users that don't have any mutesrinpatch
2019-10-14Merge branch 'fix/version-branch-skip' into 'stable'rinpatch
2019-10-14Fix hiding branch name logicrinpatch
2019-10-14Merge branch 'stable-fix-docs' into 'stable'rinpatch
2019-10-14Fix documentation deploy for stablerinpatch
2019-10-14Fix pleroma_ctl linkv1.1.0rinpatch
2019-10-14Merge branch 'final-release-prep' into 'maint/1.1'rinpatch
2019-10-14Final 1.1 release preparationsrinpatch
2019-10-14Merge branch 'backport/1.1-branch-name-change' into 'maint/1.1'rinpatch
2019-10-14Correct version parser branch name detectionrinpatch
2019-10-14Add a changelog entry for branch-movingrinpatch
2019-10-14Prepare pleroma_ctl for moving master to stable and relax the errorrinpatch
2019-10-14Preparations for renaming `master` to `stable`rinpatch
2019-10-12Merge branch 'cherry-pick-930cbd6d' into 'maint/1.1'rinpatch
2019-10-12Merge branch 'fix/mediaproxy-too-brutal' into 'develop'rinpatch
2019-10-11Merge branch 'cherry-pick-44afe4c8' into 'maint/1.1'rinpatch
2019-10-11Merge branch 'pleroma-ctl-enchancements' into 'develop'Haelwenn
2019-10-07Merge branch 'backport/exclude-replies' into 'maint/1.1'kaniini
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
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 '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-07Mastodon API: Fix private and direct statuses not being filtered out from the...eugenijm
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-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