summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-10-17Merge branch 'mark-converstation-as-read-on-new-direct-message' into 'develop'feld
Mastodon API / Conversations: Mark the conversation as read for the author when they send a new direct message See merge request pleroma/pleroma!1853
2019-10-17Transmogrifier: Make proper use of the LikeValidator.lain
2019-10-17ObjectValidator: Rewrite LikeValidator with Ecto.lain
2019-10-17Mastodon API: Mark the conversation as read for the author when they send a ↵eugenijm
new direct message
2019-10-17add Markers /api/v1/markersMaksim Pechnikov
2019-10-16[#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.Ivan Tashkinov
2019-10-16Transmogrifier: Use new ingestion pipeline for Likes.lain
2019-10-16Introduce new ingestion pipeline structure, implement internal Likes with it.lain
2019-10-16Merge branch 'user-search-experiments' into 'develop'lain
User search: Remove trigram and refactor the module See merge request pleroma/pleroma!1850
2019-10-16Merge branch 'feature/multiple-users-activation-permissions' into 'develop'feld
Ability to toggle activation status, permission group & delete multiple users Closes admin-fe#39 See merge request pleroma/pleroma!1825
2019-10-16Remove 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-16Merge branch 'benchmark-finishing' into 'develop'lain
Benchmark finishing Closes #755 See merge request pleroma/pleroma!1848
2019-10-16Order fts results by trigramrinpatch
2019-10-16User 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-15DELETE /api/pleroma/admin/users now accepts nicknames arrayMaxim Filippov
2019-10-15Store status data inside flag activityMaxim Filippov
2019-10-15some fixesAlexander
2019-10-15don't stream in benchmark envAlexander
2019-10-15Add `Sec-WebSocket-Protocol` to response headerkPherox
2019-10-15For pleroma.emoji downloaded packs, generate pack.json insteadEkaterina Vaartis
2019-10-14Merge branch 'exclude-visibilities-for-timelines' into 'develop'feld
Mastodon API: Add `exclude_visibilities` parameter to the timeline and notification endpoints See merge request pleroma/pleroma!1818
2019-10-14Merge branch 'backport/develop-branch-hiding-fix' into 'develop'rinpatch
Backport "Fix hiding branch name logic" to develop See merge request pleroma/pleroma!1846
2019-10-14Fix hiding branch name logicrinpatch
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 linkrinpatch
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-14Merge branch 'master-to-stable' into 'develop'rinpatch
Preparations for renaming `master` to `stable` See merge request pleroma/pleroma!1840
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-14Skip deactivated users in followers importEgor Kislitsyn
2019-10-14Do not add `follower_address` to `following` for non local usersEgor Kislitsyn
2019-10-14Mastodon API: Add `exclude_visibilities` parameter to the timeline and ↵eugenijm
notification endpoints
2019-10-13Merge branch 'incoming-id-fixes' into 'develop'lain
Assorted transmogrifier fixes See merge request pleroma/pleroma!1831
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-12Merge branch 'fix/mediaproxy-too-brutal' into 'develop'rinpatch
Make MediaProxy failure tracking less brutal See merge request pleroma/pleroma!1836
2019-10-11Make MediaProxy failure tracking less brutalrinpatch
The current failure tracking mechanism will never request anything that didn't respond with a success, 403, 404, or 5xx codes. This is causing issues when using in real fediverse because of weird status codes some software has and timeouts being frequent. This patch changes failure tracking mechanism to only never request the url again if it responded with 400, 204, or the body is too large, otherwise it can be re-requested in 60 seconds.
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-11This line either causes a warning, or a failed testMaxim Filippov