summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2018-08-20ActivityPub: follow redirects when fetching usereal
2018-08-20Merge branch 'update/pleroma-fe-20180820' into 'develop'kaniini
2018-08-20update pleroma frontendWilliam Pitcock
2018-08-18Merge branch 'update/pleroma-fe-20180818' into 'develop'kaniini
2018-08-18update pleroma frontendWilliam Pitcock
2018-08-17Merge branch 'develop' into 'develop'kaniini
2018-08-17Fix typo in app creation responseshadowfacts
2018-08-16Merge branch 'bugfix/undocumented-mastodon-app-api' into 'develop'kaniini
2018-08-16mastodon api controller: client_name, not nameWilliam Pitcock
2018-08-16mastodon api: add undocumented fields to json response, return app id as stri...William Pitcock
2018-08-16Merge branch 'bugfix/mix-lock' into 'develop'kaniini
2018-08-16update mix.lockWilliam Pitcock
2018-08-16Merge branch 'patch-2' into 'develop'kaniini
2018-08-16Merge branch 'dev-lanodan-url-regex' into 'develop'kaniini
2018-08-16Merge branch 'mastofe/system-font' into 'develop'kaniini
2018-08-16fix compilekaniini
2018-08-16Merge branch 'develop' into 'patch-2'kaniini
2018-08-16Merge branch 'bugfix/federation-kroeg' into 'develop'kaniini
2018-08-16Merge branch 'fix/put-repeats-at-activitypub-outbox' into 'develop'kaniini
2018-08-16Merge branch 'fix/normalize-file-extension' into 'develop'kaniini
2018-08-16testsuite: add puckipedia test fixtureWilliam Pitcock
2018-08-15Merge branch 'feature/suggestions-api-with-third-party-recommendation-engine'...lambda
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
2018-08-12Update Mastofe.lain
2018-08-12Merge branch 'feature/invites' into 'develop'lambda
2018-08-12Update generate_invite_token.exlambda
2018-08-12Merge branch 'fix/remote-follow-errormessage' into 'develop'lambda
2018-08-12Merge branch 'bugfix/gopher-empty-lines' into 'develop'lambda
2018-08-12Merge branch 'emoji-in-account-view' into 'develop'lambda
2018-08-10lib/pleroma/gopher/server.ex: Fix errorneous empty linesHaelwenn (lanodan) Monnier
2018-08-10Merge branch 'bugfix/fix-gopher-server-i' into 'develop'lambda
2018-08-10fix gopher server informational messagestrqx@goat.si
2018-08-09Remote follow: don't show confusing error if already followingeal
2018-08-09HTML-sanitize usernames before emojifying.eal
2018-08-08Add tests for emoji in user profileseal
2018-08-08TwitterAPI user view: add screen_name_html and description_html.eal
2018-08-07MastoAPI AccountView: render profile emoji.eal
2018-08-06Merge branch 'bugfix/duplicate-follow-requests' into 'develop'lambda
2018-08-06Merge branch 'feature/camelcase-hashtags' into 'develop'lambda
2018-08-06test: use private visibility for twitterapi update consistency test, to ensur...William Pitcock
2018-08-06user: do not leak virtuals in account searchWilliam Pitcock
2018-08-06user: hide virtual actors from statistics queriesWilliam Pitcock