summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-09-05Add LegacyAuthenticationPluglain
2018-09-05Add EnsureAuthenticatedPluglain
2018-09-05Add UserFetcherPlug.lain
2018-09-05Add BasicAuthDecoderPluglain
2018-09-05pinned crypt dependency to specific commitMoon Man
2018-09-05change cond to if elseMoon Man
2018-09-05auth against sha512-crypt password hashes, upgrade to pbkdf2Moon Man
2018-09-03installation/pleroma-apache.conf: OCSP stapling needs to be outside of the ↵shibayashi
virtualhost directive
2018-09-03Merge branch 'feature/staff-discovery-api' into 'develop'kaniini
staff discovery api See merge request pleroma/pleroma!326
2018-09-03Merge branch 'develop' into 'feature/staff-discovery-api'kaniini
# Conflicts: # lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
2018-09-03tests: add test for staffAccounts presence in nodeinfoWilliam Pitcock
2018-09-03nodeinfo: add staffAccounts field to metadataWilliam Pitcock
2018-09-03Merge branch 'feature/mastodon_api_2.4.x' into 'develop'kaniini
Add/Fix Mastodon endpoints for 2.4.3 compatibility See merge request pleroma/pleroma!266
2018-09-03Merge branch 'report-chat-and-gopher-support' into 'develop'kaniini
Report chat and gopher support at /nodeinfo/2.0.json See merge request pleroma/pleroma!327
2018-09-03report chat and gopher support at /nodeinfo/2.0.jsonHakaba Hitoyo
2018-09-03user: add moderator_user_query()William Pitcock
2018-09-03migrations: add is_moderator index for users tableWilliam Pitcock
2018-09-03Merge branch 'nil-bio-emojis' into 'develop'kaniini
add nil clause for Formatter.get_emoji/1 to return an empty result Closes #274 See merge request pleroma/pleroma!315
2018-09-03Merge branch 'patch-2' into 'develop'Haelwenn
Render notification IDs as strings, not numbers See merge request pleroma/pleroma!325
2018-09-03Update mastodon_api_controller.exshadowfacts
2018-09-03Update mastodon_api_controller.exshadowfacts
2018-09-03Render notification IDs as strings, not numbersshadowfacts
2018-09-02sloop around get_emoji/1 to check is_binary and have a fallthroughThurloat
default that returns empty
2018-09-02[Pleroma.Uploaders.Local]: Add configuration for custom url pathHaelwenn (lanodan) Monnier
One use-case being an external caching proxy
2018-09-02Merge branch 'hotfix_broken_likes' into 'develop'kaniini
hotfix for broken like completely breaking the notifications API See merge request pleroma/pleroma!284
2018-09-02Merge branch 'security/emoji-xss' into 'develop'kaniini
formatter: don't add XSS emoji See merge request pleroma/pleroma!322
2018-09-02formatter: don't add XSS emojiWilliam Pitcock
2018-09-01Merge branch 'security/activitypub-spoofing' into 'develop'kaniini
security: activitypub spoofing See merge request pleroma/pleroma!321
2018-09-01transmogrifier: fix peertube/plume actor handlingWilliam Pitcock
2018-09-01tests: add regression testsWilliam Pitcock
2018-09-01activitypub: fix possibility of spoofing by containing remote objects to the ↵William Pitcock
same domain as their actor
2018-09-01Merge branch 'feature/disable-config-management' into 'develop'Haelwenn
config: add ability to disable Pleroma FE config management (closes #276) Closes #276 See merge request pleroma/pleroma!320
2018-09-01run `mix format`.William Pitcock
2018-09-01OAuth: Support /revoke endpoint for revoking tokensMartin Kühl
(for compatibility with Mastodon)
2018-09-01OAuth: Set `created_at` in token exchange responseMartin Kühl
(for compatibility with Mastodon)
2018-09-01AccountView: `sensitive` is supposed to be a boolean, not a stringMartin Kühl
2018-09-01config: add ability to disable Pleroma FE config management (closes #276)William Pitcock
2018-09-01Merge branch 'lanodan/code-dup_in_mastoapi_search' into 'develop'kaniini
Clean code duplication in MastoAPI search(v1/v2) See merge request pleroma/pleroma!316
2018-09-01Merge branch 'verify-credentials-default-scope' into 'develop'kaniini
Specify default scope in verify_credentials See merge request pleroma/pleroma!317
2018-08-31Specify default scope in verify_credentialsWill Pearson
Certain Mastodon/Pleroma front ends call verify_credentials to get the default scope of a new toot. Currently, Pleroma hardcodes this value to "public". This patch changes it to the user's default_scope value.
2018-09-01[Pleroma.Web.MastodonAPI.MastodonAPIController].search(2)?: Remove code ↵Haelwenn (lanodan) Monnier
duplication
2018-08-31add nil clause for Formatter.get_emoji/1 to return an empty resultThurloat
2018-08-31Merge branch 'revert-a26d5e6b' into 'develop'lambda
Revert "Merge branch 'feature/rich-text' into 'develop'" See merge request pleroma/pleroma!313
2018-08-31Revert "Merge branch 'feature/rich-text' into 'develop'"lambda
This reverts merge request !309
2018-08-31Merge branch 'bugfix/s3-configuration' into 'develop'kaniini
config: fix up defaults for s3 endpoint configuration See merge request pleroma/pleroma!312
2018-08-31config: fix up defaults for s3 endpoint configurationWilliam Pitcock
2018-08-31Merge branch 'update/pleroma-fe-20180831' into 'develop'kaniini
update pleroma frontend See merge request pleroma/pleroma!311
2018-08-31update pleroma frontendWilliam Pitcock
2018-08-31Merge branch 'update/pleroma-fe-config-20180831' into 'develop'kaniini
config: chase pleroma-fe updates from MR pleroma-fe!324. See merge request pleroma/pleroma!310
2018-08-31config: chase pleroma-fe updates from MR pleroma-fe!324.William Pitcock
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-16 09:22:36 +0000