aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
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-03Merge branch 'feature/staff-discovery-api' into 'develop'kaniini
2018-09-03Merge branch 'develop' into 'feature/staff-discovery-api'kaniini
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
2018-09-03Merge branch 'report-chat-and-gopher-support' into 'develop'kaniini
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
2018-09-03Merge branch 'patch-2' into 'develop'Haelwenn
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
2018-09-02Merge branch 'hotfix_broken_likes' into 'develop'kaniini
2018-09-02Merge branch 'security/emoji-xss' into 'develop'kaniini
2018-09-02formatter: don't add XSS emojiWilliam Pitcock
2018-09-01Merge branch 'security/activitypub-spoofing' into 'develop'kaniini
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
2018-09-01Merge branch 'feature/disable-config-management' into 'develop'Haelwenn
2018-09-01run `mix format`.William Pitcock
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
2018-09-01Merge branch 'verify-credentials-default-scope' into 'develop'kaniini
2018-08-31Specify default scope in verify_credentialsWill Pearson
2018-09-01[Pleroma.Web.MastodonAPI.MastodonAPIController].search(2)?: Remove code dupli...Haelwenn (lanodan) Monnier
2018-08-31add nil clause for Formatter.get_emoji/1 to return an empty resultThurloat
2018-08-31Merge branch 'revert-a26d5e6b' into 'develop'lambda
2018-08-31Revert "Merge branch 'feature/rich-text' into 'develop'"lambda
2018-08-31Merge branch 'bugfix/s3-configuration' into 'develop'kaniini
2018-08-31config: fix up defaults for s3 endpoint configurationWilliam Pitcock
2018-08-31Merge branch 'update/pleroma-fe-20180831' into 'develop'kaniini
2018-08-31update pleroma frontendWilliam Pitcock
2018-08-31Merge branch 'update/pleroma-fe-config-20180831' into 'develop'kaniini
2018-08-31config: chase pleroma-fe updates from MR pleroma-fe!324.William Pitcock
2018-08-31Merge branch 'feature/rich-text' into 'develop'kaniini
2018-08-31tests: add tests for evil HTML filteringWilliam Pitcock
2018-08-31common api: add support for formatting messages outside of twitter-style plai...William Pitcock
2018-08-30Merge branch 'use-media-proxy-in-suggestions-api' into 'develop'kaniini
2018-08-30Merge branch 'backendhack' into 'develop'kaniini
2018-08-30increase uploader behaviour documentation accuracy.Thurloat
2018-08-29Add backend failure handling with :ok | :error so the uploader can handle it.Thurloat
2018-08-29migrations: add index creation migration and recipients_to/cc removal migrationWilliam Pitcock