summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-08-23Merge branch 'develop' into 'develop'Haelwenn
Add an OpenRC service See merge request pleroma/pleroma!285
2018-08-23Move invite task to pleroma namespaceJorty
Some other minor changes were made to make it consistent with the behavior of other tasks both within Pleroma and the conventions set by dependencies such as Phoenix. Namely, the task is named `gen.invite` and `IO.puts` has been replaced with references to `Mix.shell()` where appropriate.
2018-08-23Add an OpenRC servicevaartis
2018-08-23Update README.md for refactored Mix tasksJorty
2018-08-23Refactor Mix tasksJorty
1. Move Mix tasks into a `pleroma` namespace, to avoid collisions with dependent packages. 2. Rename and condense tasks into two `pleroma.user` and `pleroma.gen.instance` tasks for consistency with Hex and Phoenix. 3. Add additional functionality to the tasks to make them more user-friendly. Arguments with sensible defaults were demoted to flags and in the interactive `generate_config` (renamed to `pleroma.gen.instance`), flags were added to allow non-interactive use, though interactive use remains the primary interface. That task also now prompts the user for database parameters. 4. Documentation has been added to both tasks such that `mix help` now shows useful information. 5. Finally, use of IO.puts in tasks has been replaced with Mix.shell() equivalents to make the behavior more consistent with Mix tasks in other packages, and such that variables like MIX_QUIET are respected. The only exception is in `mix pleroma.user reset_password`, wherein the URL must always be printed regardless of the value of MIX_QUIET since that's its entire purpose.
2018-08-23debughakabahitoyo
2018-08-23Merge branch 'security/activitypub-reject-bogus-ids' into 'develop'kaniini
security: activitypub: reject activities with bogus ids See merge request pleroma/pleroma!286
2018-08-23formattingWilliam Pitcock
2018-08-23tests: add a testcase for verifying that objects without a valid ID are ↵William Pitcock
always rejected
2018-08-23transmogrifier: reject activities lacking a valid IDWilliam Pitcock
2018-08-22fixed notifications API completely breaking if there's a like forHenry Jameson
missing (deleted) post.
2018-08-22Run mix formatHaelwenn (lanodan) Monnier
2018-08-22[Pleroma.Web.TwitterAPI.UserView]: Do not fail if user.bio is nilHaelwenn (lanodan) Monnier
2018-08-22[Pleroma.Web.MastodonAPI.StatusView] Fix rendering peertube videosHaelwenn (lanodan) Monnier
2018-08-21Merge branch 'feature/peertube_2' into 'develop'kaniini
rebase/update of feature/peertube See merge request pleroma/pleroma!217
2018-08-21Merge branch 'sanitize-bio' into 'develop'kaniini
mastodon api: sanitize the bio HTML See merge request pleroma/pleroma!282
2018-08-21Merge branch 'twitter-api-bios' into 'develop'kaniini
Twitter API: Support Mastodon-style bios See merge request pleroma/pleroma!283
2018-08-21[Pleroma.Web.MastodonAPI.StatusView] Support Peertube Video titlesHaelwenn (lanodan) Monnier
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