aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
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-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-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-10Transmogrifier: Save correct ids for incoming deletes.lain
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-10Gitlab: Run benchmark in CI.lain
2019-10-09Merge branch 'unicode-search' into 'develop'kaniini
2019-10-09Merge branch 'webfinger-mocks' into 'develop'kaniini
2019-10-09provide mocks for webfinger endpointsSteven Fuchs
2019-10-09Merge branch 'add-direct-conversation-id-to-status-show-page' into 'develop'lain
2019-10-09Merge branch 'feature/count-statuses-task' into 'develop'lain
2019-10-09Ability to toggle activation status and permission group for a group of usersMaxim Filippov
2019-10-09Search: Add tests for unicode searches.lain
2019-10-09Add a task to re-count statuses for all usersEgor Kislitsyn
2019-10-09Mastodon API: Return `pleroma.direct_conversation_id` when viewing a status (...eugenijm
2019-10-08Merge branch 'chore/format-migrations' into 'develop'rinpatch
2019-10-08Enable `mix format` for migrationsrinpatch
2019-10-07Merge branch 'chore/bump-fe-122323f3' into 'develop'rinpatch
2019-10-07Bump pleroma-fe bundle to https://git.pleroma.social/pleroma/pleroma-fe/commi...rinpatch
2019-10-07Merge branch 'bugfix/exclude-replies' into 'develop'kaniini
2019-10-07mastodon api: fix exclude_replies (closes #1287)Ariadne Conill
2019-10-07Merge branch 'feature/move-rss-out-of-ostatus' into 'develop'kaniini
2019-10-07Extract RSS Feed functionality from OStatusSergey Suprunenko
2019-10-07Merge branch 'chore/context-cleanups' into 'develop'kaniini
2019-10-07clean up bundled litepub schema (closes #1303)Ariadne Conill
2019-10-07Merge branch 'mrf/simple_policy/check_actor' into 'develop'kaniini
2019-10-07Merge branch '1260-rate-limited-auth-actions' into 'develop'Haelwenn
2019-10-07Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limite...Ivan Tashkinov
2019-10-07Merge branch '1234-mastodon-2-4-3-oauth-scopes' into 'develop'Haelwenn
2019-10-07mrf/simple_policy: check actor against accept/rejectHaelwenn (lanodan) Monnier
2019-10-06Merge branch 'fix/bad-migration' into 'develop'kaniini
2019-10-06Fix muted notification migration only working with a schemarinpatch
2019-10-06Merge branch 'refactoring/move-out-keys-from-user-info' into 'develop'kaniini
2019-10-06Fix the use of queries with a schema in a migrationrinpatch
2019-10-06Merge branch 'fix/report-email' into 'develop'feld