Commit Graph

2228 Commits (52b05137c5800186fffee83950c83194a3468057)
 

Author SHA1 Message Date
kaniini b7923aa304 Merge branch 'hotfix_broken_likes' into 'develop'
6 years ago
kaniini 3370fab1d0 Merge branch 'security/emoji-xss' into 'develop'
6 years ago
William Pitcock 834515fb51 formatter: don't add XSS emoji
6 years ago
kaniini 3c7280934e Merge branch 'security/activitypub-spoofing' into 'develop'
6 years ago
William Pitcock 03e92977cb transmogrifier: fix peertube/plume actor handling
6 years ago
William Pitcock 303af9ba4c tests: add regression tests
6 years ago
William Pitcock 0b2c051a04 activitypub: fix possibility of spoofing by containing remote objects to the same domain as their actor
6 years ago
Haelwenn e4079abab8 Merge branch 'feature/disable-config-management' into 'develop'
6 years ago
William Pitcock e2ce0e9e05 run `mix format`.
6 years ago
Martin Kühl 84d84e4ca4 OAuth: Support /revoke endpoint for revoking tokens
6 years ago
Martin Kühl ad2a7972e7 OAuth: Set `created_at` in token exchange response
6 years ago
Martin Kühl b60d232719 AccountView: `sensitive` is supposed to be a boolean, not a string
6 years ago
William Pitcock c921d99898 config: add ability to disable Pleroma FE config management (closes #276)
6 years ago
kaniini 2e2f458705 Merge branch 'lanodan/code-dup_in_mastoapi_search' into 'develop'
6 years ago
kaniini 95abc0eaaa Merge branch 'verify-credentials-default-scope' into 'develop'
6 years ago
Will Pearson 0c2a0e3551 Specify default scope in verify_credentials
6 years ago
Haelwenn (lanodan) Monnier 8885d16e1b
[Pleroma.Web.MastodonAPI.MastodonAPIController].search(2)?: Remove code duplication
6 years ago
Thurloat a9c0f395cb add nil clause for Formatter.get_emoji/1 to return an empty result
6 years ago
lambda d31bbb1cfe Merge branch 'revert-a26d5e6b' into 'develop'
6 years ago
lambda 58539e1357 Revert "Merge branch 'feature/rich-text' into 'develop'"
6 years ago
kaniini 340ab3cb90 Merge branch 'bugfix/s3-configuration' into 'develop'
6 years ago
William Pitcock de5bd6fc65 config: fix up defaults for s3 endpoint configuration
6 years ago
kaniini 03ecbe0456 Merge branch 'update/pleroma-fe-20180831' into 'develop'
6 years ago
William Pitcock 2b4b4888a9 update pleroma frontend
6 years ago
kaniini d40466c291 Merge branch 'update/pleroma-fe-config-20180831' into 'develop'
6 years ago
William Pitcock 856b5e1ca4 config: chase pleroma-fe updates from MR pleroma-fe!324.
6 years ago
kaniini a26d5e6b2a Merge branch 'feature/rich-text' into 'develop'
6 years ago
William Pitcock e7871ed05e tests: add tests for evil HTML filtering
6 years ago
William Pitcock 6aa65b68b8 common api: add support for formatting messages outside of twitter-style plain text
6 years ago
kaniini e838969495 Merge branch 'use-media-proxy-in-suggestions-api' into 'develop'
6 years ago
kaniini 65e8d47cfb Merge branch 'backendhack' into 'develop'
6 years ago
Thurloat adffad5502 increase uploader behaviour documentation accuracy.
6 years ago
shibayashi d027c53d75
Add frame-ancestors 'none' to all configs
6 years ago
Thurloat af01f0196a Add backend failure handling with :ok | :error so the uploader can handle it.
6 years ago
William Pitcock 1a70d41f8e migrations: add index creation migration and recipients_to/cc removal migration
6 years ago
William Pitcock 29b5e30c46 activity: drop recipients_to/recipients_cc fields
6 years ago
William Pitcock 038139d641 migrations: drop filler migration
6 years ago
William Pitcock de9acebbf3 activitypub: use jsonb query for containment instead of recipients_to/recipients_cc.
6 years ago
shibayashi d035566116
installation/pleroma.nginx: Add 'always' to the security headers, so that they are included regardless of the status code
6 years ago
Haelwenn b11746726e Merge branch 'fix-mastodon-notifications-without-nickname' into 'develop'
6 years ago
href ddc6f32b75
Fix Mastodon API when actor's nickname is null
6 years ago
William Pitcock cce9d008f9 streamer: contain list updates in the same way as we do with the database query
6 years ago
William Pitcock ded9091206 mastodon api: use bounded AP object graph query to enforce containment of private statuses
6 years ago
William Pitcock 643fae6e36 activitypub: allow querying the activity/object graph bounded to a specific to/cc set
6 years ago
William Pitcock 9cac7c957c test: add testcase proving lists system does not leak non-public posts
6 years ago
William Pitcock 40ea07cd2f migrations: add migration to fill in recipients_to/recipients_cc fields
6 years ago
William Pitcock 81673b8136 activity: add recipients_to and recipients_cc fields
6 years ago
Thurloat d424e9fa5f fix S3 ref in sample config to generate proper path.
6 years ago
Thurloat ab9e5d64d6 add a sample swift config
6 years ago
Thurloat 2ff25ac0ce A hobbldey-working swift client.
6 years ago