Haelwenn (lanodan) Monnier
40c51f118f
[Pleroma.Web.MastodonAPI.MastodonAPIController]: Bump mastodon_api_level to 2.5.0
6 years ago
Haelwenn (lanodan) Monnier
f74725df41
[Pleroma.Web.MastodonAPI.MastodonAPIController]: Remove unused variables
6 years ago
Haelwenn (lanodan) Monnier
33a1e92584
[Pleroma.Web.Router]: Fake /api/v1/endorsements
6 years ago
Haelwenn (lanodan) Monnier
a8eaecadee
[Pleroma.Web.MastodonAPI.AccountView]: relationship.json: fake endorsed value (false)
6 years ago
Haelwenn (lanodan) Monnier
43d0b7bf7a
[Pleroma.Web.MastodonAPI.StatusView] add replies_count
6 years ago
William Pitcock
c9585ec007
twitter api: fix mimetype fallback when attachments use a URI instead of a URL object
6 years ago
William Pitcock
0cac493fdc
mastodon api: default attachment type to image if one is not present
6 years ago
Haelwenn
47c9b972b9
Merge branch 'fix/fake-filters' into 'develop'
...
Revert "Mastodon API: Fake support for loading filters"
See merge request pleroma/pleroma!348
6 years ago
Martin Kühl
f4fcea5258
Revert "Mastodon API: Fake support for loading filters"
...
This reverts commit c1d07da4e1
.
The fake support was superseded by 6e030129fb
which actually implements the faked filters API.
This change removes the fake support and ensures that the actual implementation is used.
6 years ago
Dominique Feyer
9b0f2d572b
Return 204 response on options request
6 years ago
kaniini
22c366a85f
Merge branch 'feature/mediaproxy-inline-images' into 'develop'
...
html: support mediaproxy for inline images
Closes #275
See merge request pleroma/pleroma!346
6 years ago
William Pitcock
5acfa2e091
config: pass inline images through mediaproxy ( closes #275 )
6 years ago
William Pitcock
a7d0ecdc7c
html: add policy which transforms inline images to pass through the media proxy
6 years ago
William Pitcock
cd13fa17fd
html: allow scrubbing policies to be stackable
6 years ago
kaniini
2881275291
Merge branch 'feature/mrf-scrub' into 'develop'
...
MRF: html scrubbing filter
See merge request pleroma/pleroma!345
6 years ago
William Pitcock
342ed84446
MRF: add policy for normalizing HTML markup (local and remote) to a specific policy
6 years ago
William Pitcock
95376ac1fe
html: add the ability to override the default scrub policy
6 years ago
kaniini
8eed5938d5
Merge branch 'update-pleroma-frontend' into 'develop'
...
update pleroma frontend
See merge request pleroma/pleroma!344
6 years ago
kaniini
c2650f0ffb
Merge branch 'feature/html-scrub-policy' into 'develop'
...
html scrub policy
See merge request pleroma/pleroma!339
6 years ago
hakabahitoyo
f829b18273
update-pleroma-frontend
6 years ago
Haelwenn
90661e20cf
Merge branch 'patch-3' into 'develop'
...
Add visible_in_picker to status emojis
See merge request pleroma/pleroma!342
6 years ago
shadowfacts
85b8590109
Update status_view_test.exs
6 years ago
shadowfacts
39aed5348a
Add visible_in_picker to status emojis
6 years ago
kaniini
da3f930543
Merge branch 'bugfix/activitypub-bot-profile-update' into 'develop'
...
activitypub: transmogrifier: allow profile updates from bots
See merge request pleroma/pleroma!341
6 years ago
William Pitcock
d3248e13e3
activitypub: transmogrifier: allow profile updates from bots
6 years ago
kaniini
b0a5637254
Merge branch 'refactor/mrf-pattern-matching' into 'develop'
...
MRF: significant refactoring
See merge request pleroma/pleroma!340
6 years ago
William Pitcock
e0b8c0ccba
MRF: reject non-public: use pattern match to remove unnecessary if block
6 years ago
William Pitcock
88094c266d
MRF: simple policy: refactor module to use guards and pattern matching
6 years ago
William Pitcock
97253df3ee
MRF: simple policy: contain media removal/nsfw ops to create activities only
6 years ago
William Pitcock
e82ce2a4b3
formatting
6 years ago
William Pitcock
358f88e10a
html: allow inline images by default (because of custom emoji)
6 years ago
William Pitcock
40e2f6e500
html: add default scrubbing profile and configuration knobs
6 years ago
William Pitcock
ac486fc59b
everywhere: use Pleroma.HTML module instead of HtmlSanitizeEx directly
6 years ago
William Pitcock
255f46d7ab
html: new module providing a configurable markup scrubbing policy
6 years ago
kaniini
7b96d20328
Merge branch 'bugfix/missing-url-encoding-oauth-token-redirect' into 'develop'
...
Add missing URL encoding in create authorization redirect
See merge request pleroma/pleroma!338
6 years ago
Dominique Feyer
801d645c6b
TASK: Fix formatting
6 years ago
Dominique Feyer
b79c126ee0
Add missing URL encoding in create authorization redirect
6 years ago
kaniini
3f64ba5fc8
Merge branch 'bugfix/test-circular-reference' into 'develop'
...
test: user enabled plug tests: fix circular reference
See merge request pleroma/pleroma!336
6 years ago
William Pitcock
a4fe14de02
tests: break the cycle using pleroma.factory
6 years ago
William Pitcock
fc92bb28b4
tests: try breaking the cycle a different way
6 years ago
William Pitcock
33a5294fad
test: user enabled plug tests: fix circular reference
6 years ago
kaniini
f55ffc7893
Merge branch 'update/pleroma-fe-20180909' into 'develop'
...
update pleroma frontend
See merge request pleroma/pleroma!335
6 years ago
William Pitcock
e5546c282f
update pleroma frontend
6 years ago
kaniini
b564c23d92
Merge branch 'suggestion-api-restriction' into 'develop'
...
Make limit for /api/v1/suggestions
See merge request pleroma/pleroma!334
6 years ago
Hakaba Hitoyo
4e1bb7bccb
make limit for /api/v1/suggestions
6 years ago
lambda
045953225e
Merge branch 'moonman/pleroma-sha512-crypt' into 'develop'
...
auth overhaul and legacy GS auth
See merge request pleroma/pleroma!331
6 years ago
kaniini
530561a091
Merge branch 'add-secure-and-samesite-cookie-flags' into 'develop'
...
Add Secure and SameSite cookie flags
See merge request pleroma/pleroma!302
6 years ago
kaniini
b0ec4f33e6
Merge branch 'improve-server-config-examples' into 'develop'
...
Improve server config examples
See merge request pleroma/pleroma!307
6 years ago
kaniini
3e4f39116b
Merge branch 'feature/custom_media_url' into 'develop'
...
[Pleroma.Uploaders.Local]: Add configuration for custom url path
See merge request pleroma/pleroma!318
6 years ago
kaniini
14a762a213
Merge branch 'fix/tusk' into 'develop'
...
Fix signin and initial loading with Tusk
See merge request pleroma/pleroma!333
6 years ago