aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2019-01-31[MastodonFE] Update Frontend (glitch)Haelwenn (lanodan) Monnier
2019-01-30Merge branch 'add-wiki-reference-to-readme' into 'develop'kaniini
2019-01-30Reformat to make markdownlint happy and other little typographic thingsshibayashi
2019-01-30Add reference to Pleroma Wiki in the Readmeshibayashi
2019-01-30Merge branch 'multiple-hackney-pools' into 'develop'lambda
2019-01-30Merge branch '2019-1-30-update-frontend' into 'develop'lambda
2019-01-30Fix 4aff4efa typoshref
2019-01-30update frontendlain
2019-01-30Merge branch 'multiple-hackney-pools' into 'develop'kaniini
2019-01-30Merge branch 'better-following' into 'develop'kaniini
2019-01-30Fix specs.lain
2019-01-30Use race-condition free mass follow.lain
2019-01-30Use race-condition free following method.lain
2019-01-30Use multiple hackney poolshref
2019-01-30Merge branch 'docs/fix-frontend_config' into 'develop'Haelwenn
2019-01-30docs/config.md: Fix syntax, pleroma_fe isn’t an atomHaelwenn (lanodan) Monnier
2019-01-30Merge branch 'docs/fix-frontend_config' into 'develop'kaniini
2019-01-30docs/config.md: Fix typo, provide an example key with camelCase and where to ...Haelwenn (lanodan) Monnier
2019-01-29Merge branch 'docs/fix-pleroma-api-title' into 'develop'lambda
2019-01-29docs/Pleroma-API.md: Fix ex_doc title by changing the first h1 to itHaelwenn (lanodan) Monnier
2019-01-29Merge branch 'bugfix/fix-rejects' into 'develop'kaniini
2019-01-29Merge branch 'hj-happiness-improvement' into 'develop'kaniini
2019-01-29activitypub: utils: update the state of *any* pending follow relationship tha...William Pitcock
2019-01-29activitypub: transmogrifier: fix follow request rejectionsWilliam Pitcock
2019-01-29[#534] Made federation push sender be determined basing on content instead of...Ivan Tashkinov
2019-01-29Merge branch 'feature/rich-media-part-2-electric-boogaloo' into 'develop'Haelwenn
2019-01-28rich media: oembed: return data in the same format as the other parsersWilliam Pitcock
2019-01-28rich media: kill some testsuite noiseWilliam Pitcock
2019-01-28rich media: parser: add some basic sanity checks on the returned data with pa...William Pitcock
2019-01-28rich media: parser: cache negativesWilliam Pitcock
2019-01-28rich media: parser: add copyright headerWilliam Pitcock
2019-01-28FormatMaxim Filippov
2019-01-28Split hide_network into hide_followers & hide_followingsMaxim Filippov
2019-01-28Merge branch 'app-list-changes' into 'develop'kaniini
2019-01-28App list changes: Separate into two categories, and drop Subway Tooter.scarlett
2019-01-28Put deprecation warnings undre Pleroma.Config.lain
2019-01-28[#534] Merged `upstream/develop`.Ivan Tashkinov
2019-01-28[#534] Various tweaks. Tests for Instances and Instance.Ivan Tashkinov
2019-01-28Return new-style config if old-style config is set to false.lain
2019-01-28Update config.mdlain
2019-01-28Don't run warnings in a task.lain
2019-01-28Change default bg image in new config.lain
2019-01-28Merge branch 'safe-render-activities' into 'develop'Haelwenn
2019-01-28re f83bae7c: remove unnecessary filterhref
2019-01-28Add deprecation warning mechanism.lain
2019-01-28Merge branch 'oauth-login-failure-bug' into 'develop'href
2019-01-28Correctly handle invalid credentials on auth login.lain
2019-01-28Merge branch 'patch-2' into 'develop'Haelwenn
2019-01-28Update the openrc service's retry with the correct formatvaartis
2019-01-28[#534] Refactoring / tweaks per MR review.Ivan Tashkinov