Martin Kühl
c2d592c9c5
Assign token to connection
6 years ago
kaniini
3193423be9
Merge branch 'feature/html-scrub-policy-tests' into 'develop'
...
html: add scrub policy tests
See merge request pleroma/pleroma!356
6 years ago
William Pitcock
85b59d07b6
test: add smoketests for the scrubbing policies
6 years ago
William Pitcock
7f0e291483
html: twittertext: add missing catchall scrub function
6 years ago
kaniini
7e12ef0ab0
Merge branch 'followup/twitterapi-no-rich-text-field' into 'develop'
...
twitter api: add no_rich_text option to userview for account prefs
See merge request pleroma/pleroma!355
6 years ago
William Pitcock
56577d8b48
twitter api: add no_rich_text option to userview for account prefs
6 years ago
kaniini
ec6a7799d8
Merge branch 'feature/rich-text-optout-backend' into 'develop'
...
backend support for opting out of rich text on a per-account basis
See merge request pleroma/pleroma!354
6 years ago
William Pitcock
bd03644ca8
test: add tests for new User.html_filter_policy()
6 years ago
William Pitcock
df00a364fb
mastodon api: formatting
6 years ago
William Pitcock
c2b69798dd
twitter api: add support for disabling rich text
6 years ago
William Pitcock
958e085acb
mastodon api: add support for user-supplied html policy
6 years ago
William Pitcock
2f5b026548
twitter api: add support for user-specified html policy
6 years ago
William Pitcock
735cdfb848
user: add User.html_filter_policy()
6 years ago
William Pitcock
8ae9424edb
html: default to using normal scrub policy if provided scrub policy is nil
6 years ago
kaniini
4cb6331843
Merge branch 'feature/dynamic-user-refresh' into 'develop'
...
user: implement dynamic refresh of profiles
See merge request pleroma/pleroma!350
6 years ago
kaniini
0fe165165f
Merge branch 'task-204-on-options-request' into 'develop'
...
Return 204 response on options request
See merge request pleroma/pleroma!347
6 years ago
William Pitcock
8e28e8a18f
mix: remove fix_ap_users task, now obsolete
6 years ago
William Pitcock
200ab27e7a
test: add test proving that users are refreshed when stale
6 years ago
William Pitcock
c9f6eb9a41
user: implement dynamic refresh of profiles (gets rid of need for fix_ap_users task)
6 years ago
Haelwenn
f2727e23ee
Merge branch 'bump-mastofe-2018-09-20' into 'develop'
...
Update mastodon frontend
Closes https://git.pleroma.social/pleroma/mastofe/issues/33
See: https://git.pleroma.social/pleroma/pleroma/merge_requests/352
6 years ago
Haelwenn (lanodan) Monnier
83e3afac2c
Update mastodon frontend
6 years ago
Haelwenn
7458adc256
Merge branch 'feature/mastodon_api_2.5.0' into 'develop'
...
Update mastodon API to 2.5.0
Closes: https://git.pleroma.social/pleroma/pleroma/issues/298
Closes: https://git.pleroma.social/pleroma/pleroma/issues/299
See: https://git.pleroma.social/pleroma/pleroma/merge_requests/351
6 years ago
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