aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-18Merge branch 'cleanup/deprecated_config_upload' into 'develop'rinpatch
upload.ex: Remove deprecated configuration See merge request pleroma/pleroma!1855
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-18Tests: Capture log.lain
2019-10-18upload.ex: Remove deprecated configurationHaelwenn (lanodan) Monnier
2019-10-18CommonAPI tests: Capture logs.lain
2019-10-18Merge branch 'develop' into feature/relay-listMaxim Filippov
2019-10-18Merge branch 'fix-streaming-with-sec-websocket-protocol' into 'develop'kaniini
Fix streaming websocket handshake with `Sec-WebSocket-Protocol` See merge request pleroma/pleroma!1847
2019-10-18Apply suggestion to lib/pleroma/web/mastodon_api/websocket_handler.exkaniini
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 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-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