aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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
1.1.1 Release See merge request pleroma/pleroma!1857
2019-10-18Add a changelog entry for user search refactoringrinpatch
2019-10-18Remove a failing search test due to it being unrealisticrinpatch
While the case tested (`lain@ple`) gives wrong ordering due to using only trigram to order, it almost never happens in reality. In reality it would be either `lain` (in which case it's fine to list the user with `lain` in display name first), or `@lain@pleroma.soykaf.com`/`lain@pleroma.soykaf.com` (which is handled fine as well)
2019-10-18Order fts results by trigramrinpatch
2019-10-18User search: Remove trigram and refactor the modulerinpatch
- Remove trigram as it tends to rank garbage results highly, resulting in it prioritized above fts, which gives actually decent results. ACKed by kaniini and lain on irc. - Remove a test for handling misspelled requests, since we no longer have trigram - Remove a test for searching users with `nil` display names, because it is unrealistic, we don't accept usernames that are not >1 char strings - Make rank boosting for followers/followees sane again, previous values resulted in garbage matches getting on top just because the users are followers/followees
2019-10-18Bump the version in mix.exsrinpatch
2019-10-18Merge branch 'bugfix/jsonb-set-fuckup' into 'release/1.1.1'rinpatch
Fix a migration wiping user info of users that don't have any mutes See merge request pleroma/pleroma!1856
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
And introduce safe_jsonb_set
2019-10-14Merge branch 'fix/version-branch-skip' into 'stable'rinpatch
Fix hiding branch name logic See merge request pleroma/pleroma!1845
2019-10-14Fix hiding branch name logicrinpatch
2019-10-14Merge branch 'stable-fix-docs' into 'stable'rinpatch
Fix documentation deploy for stable See merge request pleroma/pleroma!1844
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
Final 1.1 release preparations See merge request pleroma/pleroma!1843
2019-10-14Final 1.1 release preparationsrinpatch
2019-10-14Merge branch 'backport/1.1-branch-name-change' into 'maint/1.1'rinpatch
Backport/1.1 branch name change See merge request pleroma/pleroma!1841
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
message
2019-10-14Preparations for renaming `master` to `stable`rinpatch
2019-10-12Merge branch 'cherry-pick-930cbd6d' into 'maint/1.1'rinpatch
Backport mediaproxy failure tracking enchancements to maint See merge request pleroma/pleroma!1837
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