summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
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-18Merge branch 'release/1.1.1' into 'stable'rinpatch
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-18Merge branch 'cleanup/deprecated_config_upload' into 'develop'rinpatch
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-18upload.ex: Remove deprecated configurationHaelwenn (lanodan) Monnier
2019-10-18Merge branch 'develop' into feature/relay-listMaxim Filippov
2019-10-18Merge branch 'fix-streaming-with-sec-websocket-protocol' into 'develop'kaniini
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
2019-10-17Mastodon API: Mark the conversation as read for the author when they send a n...eugenijm
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-16Merge branch 'user-search-experiments' into 'develop'lain
2019-10-16Merge branch 'feature/multiple-users-activation-permissions' into 'develop'feld
2019-10-16Remove a failing search test due to it being unrealisticrinpatch
2019-10-16Merge branch 'benchmark-finishing' into 'develop'lain
2019-10-16Order fts results by trigramrinpatch
2019-10-16User search: Remove trigram and refactor the modulerinpatch
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
2019-10-14Merge branch 'backport/develop-branch-hiding-fix' into 'develop'rinpatch
2019-10-14Fix hiding branch name logicrinpatch
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 linkrinpatch
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-14Merge branch 'master-to-stable' into 'develop'rinpatch
2019-10-14Correct version parser branch name detectionrinpatch