aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2019-01-31Merge branch 'docs/pleroma-api-invite-token' into 'develop'Haelwenn
2019-01-31docs/Pleroma-API.md: Add missing token field documentationHaelwenn (lanodan) Monnier
2019-01-31Merge branch 'user-follow-all-unique' into 'develop'kaniini
2019-01-31User.follow_all: ensure its stays uniquehref
2019-01-31Merge branch 'bugfix/rich-media-non-unicode' into 'develop'lambda
2019-01-31test: http mocks: formattingWilliam Pitcock
2019-01-31Merge branch 'develop' into 'develop'kaniini
2019-01-31Merge branch 'fix/rich-media-disable-in-config' into 'develop'kaniini
2019-01-31test: rich media: parser: add malformed data regression testWilliam Pitcock
2019-01-31rich media: parser: only try to validate strings, not numbers (OEmbed)William Pitcock
2019-01-31test: add malformed OGP data fixtureWilliam Pitcock
2019-01-31rich media: parser: reject OGP fields we cannot safely processWilliam Pitcock
2019-01-31Make rich media support toggleablerinpatch
2019-01-31Clarify the description of the `logo_mask` configuration key.Alice
2019-01-31Merge branch 'revert-4d3655c4' into 'develop'lambda
2019-01-31Revert "Merge branch 'spc-fix-3' into 'develop'"lambda
2019-01-31Merge branch 'spc-fix-3' into 'develop'kaniini
2019-01-31Merge branch 'features/glitch-soc-frontend' into 'develop'Haelwenn
2019-01-31Merge branch 'update-mastofe/glitch-soc-2019-01-28' into 'develop'Haelwenn
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-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-28Merge branch 'app-list-changes' into 'develop'kaniini