aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
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 'master-to-stable' into 'develop'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-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 notifi...eugenijm
2019-10-13Merge branch 'incoming-id-fixes' into 'develop'lain
2019-10-12Merge branch 'fix/mediaproxy-too-brutal' into 'develop'rinpatch
2019-10-11Make MediaProxy failure tracking less brutalrinpatch
2019-10-11This line either causes a warning, or a failed testMaxim Filippov
2019-10-11Add `GET /api/pleroma/admin/relay` endpoint - lists all followed relaysMaxim Filippov
2019-10-11Merge branch 'develop' into feature/multiple-users-activation-permissionsMaxim Filippov
2019-10-11Deprecate POST/DELETE /api/pleroma/admin/users/:nickname/permission_group/:pe...Maxim Filippov
2019-10-11Merge branch 'pleroma-ctl-enchancements' into 'develop'Haelwenn
2019-10-11Ostatus DeleteHandler: Fix for new option format.lain
2019-10-11SearchController: Fix test.lain
2019-10-11pleroma_ctl: Make it possible to specify branches/flavours when updatingrinpatch
2019-10-11Transmogrifier: Correctly save incoming ids for Accept/Reject.lain
2019-10-11Transmogrifier: Actually store who deleted a note.lain
2019-10-11Deprecate /api/pleroma/admin/users/:nickname/toggle_activation instead of del...Maxim Filippov
2019-10-10Fix https://git.pleroma.social/pleroma/pleroma/issues/1289yalh76
2019-10-11Replace `user.following` with Pleroma.FollowingRelationshipEgor Kislitsyn
2019-10-10Transmogrifier: Save correct ids for incoming deletes.lain
2019-10-10Add `thread_visibility` to migrationsEgor Kislitsyn
2019-10-10Benchmark config: Don't use the sql sandbox.lain
2019-10-10Gitlab CI: Run correct benchmark task.lain
2019-10-10Benchmark config: Database adjustments.lain
2019-10-10Merge remote-tracking branch 'origin/develop' into benchmark-finishinglain
2019-10-10Merge branch 'develop' into 'reactions'lain
2019-10-10Gitlab: Run benchmark in CI.lain
2019-10-10Merge branch 'develop' into feature/reports-groups-and-multiple-state-updateMaxim Filippov
2019-10-09Merge branch 'unicode-search' into 'develop'kaniini
2019-10-09Merge branch 'webfinger-mocks' into 'develop'kaniini
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-24 10:39:27 +0000