aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2019-10-18Merge branch 'patch-1' into 'develop'rinpatch
2019-10-18Merge branch 'fix/pleroma-ctl-rpc' into 'develop'rinpatch
2019-10-19pleroma_ctl: Fix attempting to use RPC for config generationrinpatch
2019-10-18Merge branch 'feature/relay-list' into 'develop'kaniini
2019-10-18Merge branch 'develop' into feature/relay-listMaxim Filippov
2019-10-18Merge branch 'feature/ostatus-removal' into 'develop'kaniini
2019-10-18tests: mastodon api: fix broken test that used OStatusAriadne Conill
2019-10-18object: containment: simplify the pattern match for OStatus testsuite hackAriadne Conill
2019-10-18object: containment: only allow OStatus references in test suite environmentAriadne Conill
2019-10-18tests: mastodon search: search for an account that is visible via activitypub...Ariadne Conill
2019-10-18object: fetcher: fix up formattingAriadne Conill
2019-10-18add some missing tesla fixturesAriadne Conill
2019-10-18activitypub: tag containment checks for better error tracingAriadne Conill
2019-10-18object: containment: also allow OStatus object IDs through when comparing ori...Ariadne Conill
2019-10-18object: fetcher: improve error reportingAriadne Conill
2019-10-18object: containment: don't try to contain ostatus objectsAriadne Conill
2019-10-18tests: fix up signature testsAriadne Conill
2019-10-18tests: fix relay testsAriadne Conill
2019-10-18object fetcher: fix up error handlingAriadne Conill
2019-10-18tests: simplify object fetching and containment testsAriadne Conill
2019-10-18tests: remove some more ostatus testsAriadne Conill
2019-10-18fix up some testsAriadne Conill
2019-10-18kill almost all of the OStatus moduleAriadne Conill
2019-10-18federator: remove OStatus incoming document supportAriadne Conill
2019-10-18remove Salmon moduleAriadne Conill
2019-10-18router: disconnect SalmonAriadne Conill
2019-10-18webfinger: stop pulling Salmon data out of WebFingerAriadne Conill
2019-10-18feed: don't advertise salmon endpointAriadne Conill
2019-10-18publisher: move remote_users() from Salmon moduleAriadne Conill
2019-10-18websub: remove entirelyAriadne Conill
2019-10-18federator: remove websub stuffAriadne Conill
2019-10-18application: don't start Federator.init/1 anymoreAriadne Conill
2019-10-18config: disable Websub and Salmon publisher modulesAriadne Conill
2019-10-18update changelogAriadne Conill
2019-10-18Merge branch 'fix/changelog-typo' into 'develop'rinpatch
2019-10-18Fix wrong list level in the changelogrinpatch
2019-10-18Merge branch 'chore/develop-changelog-sync' into 'develop'rinpatch
2019-10-18Sync the changelog from stable and collapse the API sectionsrinpatch
2019-10-18Merge branch 'backport/develop-safe-jsonb' 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-18Merge branch 'cleanup/deprecated_config_upload' into 'develop'rinpatch
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