summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-08-21[Pleroma.Web.ActivityPub.Transmogrifier]: Fix likesHaelwenn (lanodan) Monnier
2018-08-21Fix attachement renderingHaelwenn (lanodan) Monnier
2018-08-21Render peertube videos in mastodon.lain
2018-08-21Use activitypub to fetch posts.lain
This falls back to ostatus.
2018-08-21Basic peertube support.Haelwenn (lanodan) Monnier
2018-08-21Pleroma.Web.ActivityPub.Transmogrifier: Fix actor being a list of objects ↵Haelwenn (lanodan) Monnier
(Peertube)
2018-08-21attempt to add html validation to mastodon api test caseensra
2018-08-21this should be looking at the follower's bio, not the user's bio.ensra
fixes test.
2018-08-21sync bio sanitization code in testsensra
2018-08-21fix test for converting bio \r\n to <br>.ensra
2018-08-21Formatensra
2018-08-21Twitter API: Support Mastodon-style biosensra
(multi-line, with links, and user mentions)
2018-08-21mastodon api: sanitize the bio HTMLensra
2018-08-20Merge branch 'feature/formatter-consistent-hashtag-mentions' into 'develop'kaniini
formatter: consistent presentation of hashtags and mentions See merge request pleroma/pleroma!280
2018-08-20formattingWilliam Pitcock
2018-08-20common api: format hashtags in the same way as we format mentionsWilliam Pitcock
2018-08-20Merge branch 'update/pleroma-fe-20180821' into 'develop'kaniini
update pleroma frontend See merge request pleroma/pleroma!279
2018-08-20update pleroma frontendWilliam Pitcock
2018-08-20Merge branch 'fix/redirect-on-user-fetch' into 'develop'eal
ActivityPub: follow redirects when fetching user See merge request pleroma/pleroma!278
2018-08-20ActivityPub: follow redirects when fetching usereal
2018-08-20Merge branch 'update/pleroma-fe-20180820' into 'develop'kaniini
update pleroma frontend See merge request pleroma/pleroma!277
2018-08-20update pleroma frontendWilliam Pitcock
2018-08-18Merge branch 'update/pleroma-fe-20180818' into 'develop'kaniini
update pleroma frontend See merge request pleroma/pleroma!276
2018-08-18update pleroma frontendWilliam Pitcock
2018-08-17Merge branch 'develop' into 'develop'kaniini
Fix typo in app creation response See merge request pleroma/pleroma!275
2018-08-17Fix typo in app creation responseshadowfacts
Mastodon sends redirect_uri (singular), so should Pleroma.
2018-08-16Merge branch 'bugfix/undocumented-mastodon-app-api' into 'develop'kaniini
mastodon api: add undocumented fields to json response, return app id as string… See merge request pleroma/pleroma!274
2018-08-16mastodon api controller: client_name, not nameWilliam Pitcock
2018-08-16mastodon api: add undocumented fields to json response, return app id as ↵William Pitcock
string like mastodon itself does
2018-08-16Merge branch 'bugfix/mix-lock' into 'develop'kaniini
update mix.lock See merge request pleroma/pleroma!273
2018-08-16update mix.lockWilliam Pitcock
2018-08-16Merge branch 'patch-2' into 'develop'kaniini
Update mix.exs See merge request pleroma/pleroma!241
2018-08-16Merge branch 'dev-lanodan-url-regex' into 'develop'kaniini
lib/pleroma/formatter.ex: Fix URL regex Closes #127 See merge request pleroma/pleroma!69
2018-08-16Merge branch 'mastofe/system-font' into 'develop'kaniini
Mastodon frontend: Use system font See merge request pleroma/pleroma!247
2018-08-16fix compilekaniini
2018-08-16Merge branch 'develop' into 'patch-2'kaniini
# Conflicts: # mix.exs
2018-08-16Merge branch 'bugfix/federation-kroeg' into 'develop'kaniini
fix federation with kroeg See merge request pleroma/pleroma!272
2018-08-16Merge branch 'fix/put-repeats-at-activitypub-outbox' into 'develop'kaniini
Fix: Output repeats at ActivityPub outbox Closes #191 See merge request pleroma/pleroma!175
2018-08-16Merge branch 'fix/normalize-file-extension' into 'develop'kaniini
Normalize file extension for uploaded files Closes #218 See merge request pleroma/pleroma!233
2018-08-16testsuite: add puckipedia test fixtureWilliam Pitcock
2018-08-15Merge branch ↵lambda
'feature/suggestions-api-with-third-party-recommendation-engine' into 'develop' Feature / Suggestions API with third party recommendation engine See merge request pleroma/pleroma!254
2018-08-14testsuite: formattingWilliam Pitcock
2018-08-14test: add kroeg fixturesWilliam Pitcock
2018-08-14activitypub: transmogrifier: add necessary translations for kroegWilliam Pitcock
2018-08-13Use Image type for emoji icons.eal
2018-08-13ActivityPub user view: include tag if present.eal
2018-08-13CommonAPI: add emoji to user source data on updateeal
2018-08-12formattinglain
2018-08-12Fix for elixir 1.7.lain
2018-08-12update frontendlain