summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-09-07Merge branch 'add-secure-and-samesite-cookie-flags' into 'develop'kaniini
Add Secure and SameSite cookie flags See merge request pleroma/pleroma!302
2018-09-07Merge branch 'improve-server-config-examples' into 'develop'kaniini
Improve server config examples See merge request pleroma/pleroma!307
2018-09-07Merge branch 'feature/custom_media_url' into 'develop'kaniini
[Pleroma.Uploaders.Local]: Add configuration for custom url path See merge request pleroma/pleroma!318
2018-09-07Merge branch 'fix/tusk' into 'develop'kaniini
Fix signin and initial loading with Tusk See merge request pleroma/pleroma!333
2018-09-07Mastodon API: Fake support for loading filtersMartin Kühl
2018-09-07Mastodon API: Add unsupported attributes to relationship responsesMartin Kühl
These attributes are documented as required by the Mastodon API. Since we don’t support them (I think?), respond with default values.
2018-09-06Merge branch 'fix/test-failure-due-to/306' into 'develop'lambda
Fix the tests See merge request pleroma/pleroma!332
2018-09-05Fix warning.lain
2018-09-05Add LegacyAuthenticationPlug to router.lain
2018-09-05Update legacy passwords automatically.lain
2018-09-05Fix the testsMartin Kühl
2018-09-05Update Mix.locklain
2018-09-05Add Plugs to router.lain
2018-09-05Add UserEnabledPlug.lain
2018-09-05Add SetUserSessionIdPlug.lain
2018-09-05Merge branch 'fix/sign-in-with-toot' into 'develop'Haelwenn
Fix sign-in and sign-out with Toot! See merge request pleroma/pleroma!306
2018-09-05Add new plugs to router.lain
2018-09-05Add EnsureUserKeyPlug, smaller fixeslain
2018-09-05Simplify AuthenticationPluglain
2018-09-05Add SessionAuthenticationPlug.lain
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