summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-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
Invites Closes #108 See merge request pleroma/pleroma!208
2018-08-12Update generate_invite_token.exlambda
2018-08-12Merge branch 'fix/remote-follow-errormessage' into 'develop'lambda
Remote follow: don't show confusing error if already following See merge request pleroma/pleroma!267
2018-08-12Merge branch 'bugfix/gopher-empty-lines' into 'develop'lambda
lib/pleroma/gopher/server.ex: Fix errorneous empty lines See merge request pleroma/pleroma!270
2018-08-12Merge branch 'emoji-in-account-view' into 'develop'lambda
Render emoji in user profiles See merge request pleroma/pleroma!265
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
fix gopher server informational messages See merge request pleroma/pleroma!268
2018-08-10fix gopher server informational messagestrqx@goat.si
some gopher clients did not accept those lines due to a missing tab
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
Also use the correct field in TwitterAPI...
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
user: filter out duplicate follow requests Closes #228 See merge request pleroma/pleroma!263
2018-08-06Merge branch 'feature/camelcase-hashtags' into 'develop'lambda
formatter: preserve case of hashtags Closes #165 See merge request pleroma/pleroma!262
2018-08-05user: filter out duplicate follow requestsWilliam Pitcock
2018-08-05formatter: preserve case of hashtagsWilliam Pitcock
when generating hashtag links, we used the casefolded version that we use in the link URLs, instead of the original version. accordingly, adjust the formatter to use the original text for the links, while keeping the casefolded version for the URLs.
2018-08-02add suggestions/web configHakaba Hitoyo
2018-08-01Merge branch 'bugfix/digest-legacy-compat' into 'develop'lambda
activitypub: actually send digest header when federating See merge request pleroma/pleroma!261
2018-08-01activitypub: actually send digest header when federatingWilliam Pitcock
this is needed for backwards compatibility with non-digest pleroma instances
2018-08-01Merge branch 'security/digest-signature-validation' into 'develop'lambda
digest signature validation See merge request pleroma/pleroma!260
2018-08-01Allow additionnal schemes in the configHaelwenn (lanodan) Monnier
2018-07-31activitypub: verify remote http signature digests by recomputing the digest ↵William Pitcock
and replacing the digest header
2018-07-31activitypub: add digest header to outbound messages and sign itWilliam Pitcock
2018-07-30[Pleroma.FormatterTest] Add test for XMPP linkHaelwenn (lanodan) Monnier
2018-07-30[Pleroma.FormatterTest]: .add_links: Add a space before the dotHaelwenn (lanodan) Monnier
A dot is legal in the url, even at the end, so I moved it for the test
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-17 14:33:41 +0000