Haelwenn
47c9b972b9
Merge branch 'fix/fake-filters' into 'develop'
...
Revert "Mastodon API: Fake support for loading filters"
See merge request pleroma/pleroma!348
2018-09-19 03:53:25 +00:00
Martin Kühl
f4fcea5258
Revert "Mastodon API: Fake support for loading filters"
...
This reverts commit c1d07da4e16e030129fb
2018-09-18 11:59:10 +02:00
Dominique Feyer
9b0f2d572b
Return 204 response on options request
2018-09-17 12:21:01 +02:00
kaniini
22c366a85f
Merge branch 'feature/mediaproxy-inline-images' into 'develop'
...
html: support mediaproxy for inline images
Closes #275
See merge request pleroma/pleroma!346
2018-09-16 02:25:11 +00:00
William Pitcock
5acfa2e091
config: pass inline images through mediaproxy ( closes #275 )
2018-09-16 02:16:17 +00:00
William Pitcock
a7d0ecdc7c
html: add policy which transforms inline images to pass through the media proxy
2018-09-16 02:16:16 +00:00
William Pitcock
cd13fa17fd
html: allow scrubbing policies to be stackable
2018-09-16 02:16:14 +00:00
kaniini
2881275291
Merge branch 'feature/mrf-scrub' into 'develop'
...
MRF: html scrubbing filter
See merge request pleroma/pleroma!345
2018-09-16 01:31:03 +00:00
William Pitcock
342ed84446
MRF: add policy for normalizing HTML markup (local and remote) to a specific policy
2018-09-16 01:25:36 +00:00
William Pitcock
95376ac1fe
html: add the ability to override the default scrub policy
2018-09-16 01:25:35 +00:00
kaniini
8eed5938d5
Merge branch 'update-pleroma-frontend' into 'develop'
...
update pleroma frontend
See merge request pleroma/pleroma!344
2018-09-16 01:09:38 +00:00
kaniini
c2650f0ffb
Merge branch 'feature/html-scrub-policy' into 'develop'
...
html scrub policy
See merge request pleroma/pleroma!339
2018-09-16 01:05:09 +00:00
hakabahitoyo
f829b18273
update-pleroma-frontend
2018-09-14 10:47:10 +09:00
Haelwenn
90661e20cf
Merge branch 'patch-3' into 'develop'
...
Add visible_in_picker to status emojis
See merge request pleroma/pleroma!342
2018-09-12 18:01:11 +00:00
shadowfacts
85b8590109
Update status_view_test.exs
2018-09-10 23:40:29 +00:00
shadowfacts
39aed5348a
Add visible_in_picker to status emojis
2018-09-10 23:32:19 +00:00
kaniini
da3f930543
Merge branch 'bugfix/activitypub-bot-profile-update' into 'develop'
...
activitypub: transmogrifier: allow profile updates from bots
See merge request pleroma/pleroma!341
2018-09-10 02:03:01 +00:00
William Pitcock
d3248e13e3
activitypub: transmogrifier: allow profile updates from bots
2018-09-10 01:57:03 +00:00
kaniini
b0a5637254
Merge branch 'refactor/mrf-pattern-matching' into 'develop'
...
MRF: significant refactoring
See merge request pleroma/pleroma!340
2018-09-10 01:22:06 +00:00
William Pitcock
e0b8c0ccba
MRF: reject non-public: use pattern match to remove unnecessary if block
2018-09-10 01:16:03 +00:00
William Pitcock
88094c266d
MRF: simple policy: refactor module to use guards and pattern matching
2018-09-10 01:16:02 +00:00
William Pitcock
97253df3ee
MRF: simple policy: contain media removal/nsfw ops to create activities only
2018-09-10 01:16:01 +00:00
William Pitcock
e82ce2a4b3
formatting
2018-09-10 00:28:40 +00:00
William Pitcock
358f88e10a
html: allow inline images by default (because of custom emoji)
2018-09-10 00:24:19 +00:00
William Pitcock
40e2f6e500
html: add default scrubbing profile and configuration knobs
2018-09-10 00:14:57 +00:00
William Pitcock
ac486fc59b
everywhere: use Pleroma.HTML module instead of HtmlSanitizeEx directly
2018-09-10 00:14:47 +00:00
William Pitcock
255f46d7ab
html: new module providing a configurable markup scrubbing policy
2018-09-10 00:13:57 +00:00
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
2018-09-09 23:09:43 +00:00
Dominique Feyer
801d645c6b
TASK: Fix formatting
2018-09-09 23:42:28 +02:00
Dominique Feyer
b79c126ee0
Add missing URL encoding in create authorization redirect
2018-09-09 23:31:47 +02:00
kaniini
3f64ba5fc8
Merge branch 'bugfix/test-circular-reference' into 'develop'
...
test: user enabled plug tests: fix circular reference
See merge request pleroma/pleroma!336
2018-09-09 13:06:17 +00:00
William Pitcock
a4fe14de02
tests: break the cycle using pleroma.factory
2018-09-09 12:56:25 +00:00
William Pitcock
fc92bb28b4
tests: try breaking the cycle a different way
2018-09-09 12:43:58 +00:00
William Pitcock
33a5294fad
test: user enabled plug tests: fix circular reference
2018-09-09 12:23:48 +00:00
kaniini
f55ffc7893
Merge branch 'update/pleroma-fe-20180909' into 'develop'
...
update pleroma frontend
See merge request pleroma/pleroma!335
2018-09-09 12:15:14 +00:00
William Pitcock
e5546c282f
update pleroma frontend
2018-09-09 12:14:34 +00:00
kaniini
b564c23d92
Merge branch 'suggestion-api-restriction' into 'develop'
...
Make limit for /api/v1/suggestions
See merge request pleroma/pleroma!334
2018-09-09 11:38:33 +00:00
Hakaba Hitoyo
4e1bb7bccb
make limit for /api/v1/suggestions
2018-09-09 13:57:23 +09:00
lambda
045953225e
Merge branch 'moonman/pleroma-sha512-crypt' into 'develop'
...
auth overhaul and legacy GS auth
See merge request pleroma/pleroma!331
2018-09-08 09:20:34 +00:00
kaniini
530561a091
Merge branch 'add-secure-and-samesite-cookie-flags' into 'develop'
...
Add Secure and SameSite cookie flags
See merge request pleroma/pleroma!302
2018-09-07 23:55:42 +00:00
kaniini
b0ec4f33e6
Merge branch 'improve-server-config-examples' into 'develop'
...
Improve server config examples
See merge request pleroma/pleroma!307
2018-09-07 23:55:01 +00:00
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
2018-09-07 23:49:36 +00:00
kaniini
14a762a213
Merge branch 'fix/tusk' into 'develop'
...
Fix signin and initial loading with Tusk
See merge request pleroma/pleroma!333
2018-09-07 23:47:43 +00:00
Martin Kühl
c1d07da4e1
Mastodon API: Fake support for loading filters
2018-09-07 16:12:44 +02:00
Martin Kühl
619f67768a
Mastodon API: Add unsupported attributes to relationship responses
...
These attributes are documented as required by the Mastodon API.
Since we don’t support them (I think?), respond with default values.
2018-09-07 16:12:44 +02:00
lambda
403f9d118d
Merge branch 'fix/test-failure-due-to/306' into 'develop'
...
Fix the tests
See merge request pleroma/pleroma!332
2018-09-06 06:50:15 +00:00
lain
d22af29bb4
Fix warning.
2018-09-05 22:42:50 +02:00
lain
70163aec9b
Add LegacyAuthenticationPlug to router.
2018-09-05 22:31:57 +02:00
lain
44b094908c
Update legacy passwords automatically.
2018-09-05 22:30:14 +02:00
Martin Kühl
ff38ffd9f8
Fix the tests
2018-09-05 22:20:59 +02:00
