akkoma
5 years agonodeinfo_controller: Fix JSON rendering
Haelwenn (lanodan) Monnier [Fri, 5 Oct 2018 20:32:53 +0000 (22:32 +0200)]
nodeinfo_controller: Fix JSON rendering

This is the last noedinfo difference from my own branch

5 years agoMRF Transparency
Haelwenn (lanodan) Monnier [Thu, 4 Oct 2018 11:37:17 +0000 (13:37 +0200)]
MRF Transparency

5 years agoPleroma.Web.Nodeinfo.NodeinfoController: Further transparency, breaks API of previous one
Haelwenn (lanodan) Monnier [Mon, 1 Oct 2018 09:51:12 +0000 (11:51 +0200)]
Pleroma.Web.Nodeinfo.NodeinfoController: Further transparency, breaks API of previous one

5 years ago[Pleroma.Web.Nodeinfo.NodeinfoController]: Transparency on MRF Simple
Haelwenn (lanodan) Monnier [Wed, 5 Sep 2018 21:06:55 +0000 (23:06 +0200)]
[Pleroma.Web.Nodeinfo.NodeinfoController]: Transparency on MRF Simple

5 years agoMerge branch 'bugfix/fix-mrf-reject-match' into 'develop'
kaniini [Sun, 30 Sep 2018 05:32:56 +0000 (05:32 +0000)]
Merge branch 'bugfix/fix-mrf-reject-match' into 'develop'

activitypub: fix error condition match

See merge request pleroma/pleroma!365

5 years agoactivitypub: fix error condition match
William Pitcock [Sun, 30 Sep 2018 05:25:28 +0000 (05:25 +0000)]
activitypub: fix error condition match

5 years agoMerge branch 'bugfix/magnet-links' into 'develop'
Haelwenn [Fri, 28 Sep 2018 19:20:54 +0000 (19:20 +0000)]
Merge branch 'bugfix/magnet-links' into 'develop'

formatter: Stop using phoenix HTML and format it ourselves

Closes #307

See merge request pleroma/pleroma!363

5 years agoformatter: Stop using phoenix HTML and format it ourselves
Haelwenn (lanodan) Monnier [Fri, 28 Sep 2018 15:20:28 +0000 (17:20 +0200)]
formatter: Stop using phoenix HTML and format it ourselves

* Pheonix has an extra scheme whitelist conflicting with ours
* Pheonix doesn’t seems to do URL encoding, just HTML encoding

Closes: https://git.pleroma.social/pleroma/pleroma/issues/307
5 years agoMerge branch 'feature/twitter_api/fields' into 'develop'
Haelwenn [Fri, 28 Sep 2018 09:25:27 +0000 (09:25 +0000)]
Merge branch 'feature/twitter_api/fields' into 'develop'

[Pleroma.Web.TwitterAPI.UserView]: Add mastodon-fields in "fields"

See merge request pleroma/pleroma!360

5 years ago[Pleroma.Web.TwitterAPI.UserViewTest]: Add test for mastodon-fields
Haelwenn (lanodan) Monnier [Fri, 28 Sep 2018 09:17:33 +0000 (11:17 +0200)]
[Pleroma.Web.TwitterAPI.UserViewTest]: Add test for mastodon-fields

5 years ago[Pleroma.Web.TwitterAPI.UserView]: Add mastodon-fields in "fields"
Haelwenn (lanodan) Monnier [Thu, 27 Sep 2018 18:17:44 +0000 (20:17 +0200)]
[Pleroma.Web.TwitterAPI.UserView]: Add mastodon-fields in "fields"

5 years agoMerge branch 'bugfix/object-fetching-handle-mrf-reject' into 'develop'
kaniini [Fri, 28 Sep 2018 00:51:45 +0000 (00:51 +0000)]
Merge branch 'bugfix/object-fetching-handle-mrf-reject' into 'develop'

activitypub: don't fall back to OStatus fetching when MRF rejects an object

See merge request pleroma/pleroma!362

5 years agoactivitypub: don't fall back to OStatus fetching when MRF rejects an object
William Pitcock [Fri, 28 Sep 2018 00:44:15 +0000 (00:44 +0000)]
activitypub: don't fall back to OStatus fetching when MRF rejects an object

5 years agoMerge branch 'security/ap-unsigned-create' into 'develop'
kaniini [Fri, 28 Sep 2018 00:14:53 +0000 (00:14 +0000)]
Merge branch 'security/ap-unsigned-create' into 'develop'

activitypub inbox: only accept unsigned/invalid-signature relayed creates, nothing else

See merge request pleroma/pleroma!361

5 years agoactivitypub inbox: only accept unsigned/invalid-signature relayed creates, nothing...
William Pitcock [Fri, 28 Sep 2018 00:01:54 +0000 (00:01 +0000)]
activitypub inbox: only accept unsigned/invalid-signature relayed creates, nothing else

although the previous handling assumed any unsigned/invalid signature message was a Create,
lets make it more explicit

5 years agoMerge branch 'bugfix/kroeg' into 'develop'
kaniini [Thu, 27 Sep 2018 20:25:35 +0000 (20:25 +0000)]
Merge branch 'bugfix/kroeg' into 'develop'

More kroeg bugfixes

See merge request pleroma/pleroma!353

5 years agotransmogrifier: get_actor called without casting attributedTo in actor and actor...
Haelwenn (lanodan) Monnier [Thu, 27 Sep 2018 09:51:36 +0000 (11:51 +0200)]
transmogrifier: get_actor called without casting attributedTo in actor and actor is nil

5 years agotransmogrifier: Just make attachement maps into a list and reroll
Haelwenn (lanodan) Monnier [Thu, 27 Sep 2018 09:38:30 +0000 (11:38 +0200)]
transmogrifier: Just make attachement maps into a list and reroll

5 years agotransmogrifier: Use the correct variable and prefer inspect in case of a bad type...
Haelwenn (lanodan) Monnier [Thu, 27 Sep 2018 09:10:54 +0000 (11:10 +0200)]
transmogrifier: Use the correct variable and prefer inspect in case of a bad type being passed on

5 years agotransmogrifier: more robustly handle dereferencing pointer URIs
William Pitcock [Thu, 27 Sep 2018 07:14:15 +0000 (07:14 +0000)]
transmogrifier: more robustly handle dereferencing pointer URIs

5 years agotransmogrifier: Use oneliners when applicable
Haelwenn (lanodan) Monnier [Wed, 26 Sep 2018 19:01:33 +0000 (21:01 +0200)]
transmogrifier: Use oneliners when applicable

5 years agotransmogrifier: reformat `cond` block by hand
William Pitcock [Wed, 26 Sep 2018 18:47:18 +0000 (18:47 +0000)]
transmogrifier: reformat `cond` block by hand

5 years agotransmogrifier: Add support for array-less hashtags, add broken announce, harden...
Haelwenn (lanodan) Monnier [Wed, 26 Sep 2018 09:27:00 +0000 (11:27 +0200)]
transmogrifier: Add support for array-less hashtags, add broken announce, harden get_actor

5 years agotransmogrifier: pro-actively add support for Hashtag without array in tag
Haelwenn (lanodan) Monnier [Wed, 26 Sep 2018 08:21:58 +0000 (10:21 +0200)]
transmogrifier: pro-actively add support for Hashtag without array in tag

5 years agotransmogrifier_test: incoming notices with tag not being an array (kroeg)
Haelwenn (lanodan) Monnier [Wed, 26 Sep 2018 05:48:34 +0000 (07:48 +0200)]
transmogrifier_test: incoming notices with tag not being an array (kroeg)

5 years agotransmogrifier: Use a cond, add proactive support for arrays
Haelwenn (lanodan) Monnier [Tue, 25 Sep 2018 15:12:29 +0000 (17:12 +0200)]
transmogrifier: Use a cond, add proactive support for arrays

5 years ago[Pleroma.Web.ActivityPub.Transmogrifier]: quick fix when tag is a Map
Haelwenn (lanodan) Monnier [Fri, 21 Sep 2018 12:46:49 +0000 (14:46 +0200)]
[Pleroma.Web.ActivityPub.Transmogrifier]: quick fix when tag is a Map

5 years ago[Pleroma.Web.ActivityPub.Transmogrifier]: fix emoji in tag when it’s not in a array...
Haelwenn (lanodan) Monnier [Fri, 21 Sep 2018 12:36:29 +0000 (14:36 +0200)]
[Pleroma.Web.ActivityPub.Transmogrifier]: fix emoji in tag when it’s not in a array [kroeg]

Also simplified the code for name trimming.

And not copying the Map.merge part as it looks buggy.
See: https://queer.hacktivis.me/objects/a9f21ebc-9a12-4a6c-89d5-3d46955c6ee8

5 years ago[Pleroma.Web.ActivityPub.Transmogrifier]: fix when attachment contain is just a Map...
Haelwenn (lanodan) Monnier [Fri, 21 Sep 2018 10:57:31 +0000 (12:57 +0200)]
[Pleroma.Web.ActivityPub.Transmogrifier]: fix when attachment contain is just a Map [kroeg]

5 years ago[Pleroma.Web.ActivityPub.Transmogrifier]: Fix when inReplyTo is a inlined post [kroeg]
Haelwenn (lanodan) Monnier [Fri, 21 Sep 2018 10:43:35 +0000 (12:43 +0200)]
[Pleroma.Web.ActivityPub.Transmogrifier]: Fix when inReplyTo is a inlined post [kroeg]

5 years ago[Pleroma.Web.ActivityPub.ActivityPub]: Harden getting endpoints [kroeg]
Haelwenn (lanodan) Monnier [Fri, 21 Sep 2018 09:41:20 +0000 (11:41 +0200)]
[Pleroma.Web.ActivityPub.ActivityPub]: Harden getting endpoints [kroeg]

5 years agoMerge branch 'fix/s3/filenames-with-spaces' into 'develop'
kaniini [Mon, 24 Sep 2018 14:17:21 +0000 (14:17 +0000)]
Merge branch 'fix/s3/filenames-with-spaces' into 'develop'

Uploaders.S3: Replace unsafe characters in object key

See merge request pleroma/pleroma!359

5 years agoUploaders.S3: Replace unsafe characters in object key
Martin Kühl [Mon, 24 Sep 2018 13:38:32 +0000 (15:38 +0200)]
Uploaders.S3: Replace unsafe characters in object key

According to [the S3 docs][s3], the characters safe for use in object keys are:

* 0-9
* a-z
* A-Z
* !
* -
* _
* .
* *
* '
* (
* )

(The / character is not listed but mentioned being safe outside of the list.)

Several characters that are valid in filenames can cause problems, for example
spaces are not valid in URLs and need to be escaped,
sequences of spaces can become squeezed by S3,
some characters like \ are documented to require “significant special handling”.

To avoid these problems, this change encodes the filename
before using it as part of the S3 object name
by replacing all characters except those documented as “safe” with dashes.

[s3]: https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingMetadata.html

5 years agoMerge branch 'update/pleroma-fe-20180922' into 'develop'
kaniini [Sat, 22 Sep 2018 05:08:37 +0000 (05:08 +0000)]
Merge branch 'update/pleroma-fe-20180922' into 'develop'

update pleroma frontend

See merge request pleroma/pleroma!357

5 years agoupdate pleroma frontend
William Pitcock [Sat, 22 Sep 2018 05:07:20 +0000 (05:07 +0000)]
update pleroma frontend

5 years agoMerge branch 'feature/html-scrub-policy-tests' into 'develop'
kaniini [Sat, 22 Sep 2018 03:50:39 +0000 (03:50 +0000)]
Merge branch 'feature/html-scrub-policy-tests' into 'develop'

html: add scrub policy tests

See merge request pleroma/pleroma!356

5 years agotest: add smoketests for the scrubbing policies
William Pitcock [Sat, 22 Sep 2018 03:44:19 +0000 (03:44 +0000)]
test: add smoketests for the scrubbing policies

5 years agohtml: twittertext: add missing catchall scrub function
William Pitcock [Sat, 22 Sep 2018 03:19:43 +0000 (03:19 +0000)]
html: twittertext: add missing catchall scrub function

5 years agoMerge branch 'followup/twitterapi-no-rich-text-field' into 'develop'
kaniini [Sat, 22 Sep 2018 03:30:00 +0000 (03:30 +0000)]
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

5 years agotwitter api: add no_rich_text option to userview for account prefs
William Pitcock [Sat, 22 Sep 2018 03:20:25 +0000 (03:20 +0000)]
twitter api: add no_rich_text option to userview for account prefs

5 years agoMerge branch 'feature/rich-text-optout-backend' into 'develop'
kaniini [Sat, 22 Sep 2018 03:08:19 +0000 (03:08 +0000)]
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

5 years agotest: add tests for new User.html_filter_policy()
William Pitcock [Sat, 22 Sep 2018 03:01:01 +0000 (03:01 +0000)]
test: add tests for new User.html_filter_policy()

5 years agomastodon api: formatting
William Pitcock [Sat, 22 Sep 2018 02:48:42 +0000 (02:48 +0000)]
mastodon api: formatting

5 years agotwitter api: add support for disabling rich text
William Pitcock [Sat, 22 Sep 2018 02:17:19 +0000 (02:17 +0000)]
twitter api: add support for disabling rich text

5 years agomastodon api: add support for user-supplied html policy
William Pitcock [Sat, 22 Sep 2018 02:14:25 +0000 (02:14 +0000)]
mastodon api: add support for user-supplied html policy

5 years agotwitter api: add support for user-specified html policy
William Pitcock [Sat, 22 Sep 2018 02:13:54 +0000 (02:13 +0000)]
twitter api: add support for user-specified html policy

5 years agouser: add User.html_filter_policy()
William Pitcock [Sat, 22 Sep 2018 01:37:05 +0000 (01:37 +0000)]
user: add User.html_filter_policy()

5 years agohtml: default to using normal scrub policy if provided scrub policy is nil
William Pitcock [Sat, 22 Sep 2018 01:10:53 +0000 (01:10 +0000)]
html: default to using normal scrub policy if provided scrub policy is nil

5 years agoMerge branch 'feature/dynamic-user-refresh' into 'develop'
kaniini [Fri, 21 Sep 2018 00:00:28 +0000 (00:00 +0000)]
Merge branch 'feature/dynamic-user-refresh' into 'develop'

user: implement dynamic refresh of profiles

See merge request pleroma/pleroma!350

5 years agoMerge branch 'task-204-on-options-request' into 'develop'
kaniini [Thu, 20 Sep 2018 23:54:51 +0000 (23:54 +0000)]
Merge branch 'task-204-on-options-request' into 'develop'

Return 204 response on options request

See merge request pleroma/pleroma!347

5 years agomix: remove fix_ap_users task, now obsolete
William Pitcock [Thu, 20 Sep 2018 23:51:06 +0000 (23:51 +0000)]
mix: remove fix_ap_users task, now obsolete

5 years agotest: add test proving that users are refreshed when stale
William Pitcock [Thu, 20 Sep 2018 23:49:08 +0000 (23:49 +0000)]
test: add test proving that users are refreshed when stale

5 years agouser: implement dynamic refresh of profiles (gets rid of need for fix_ap_users task)
William Pitcock [Wed, 19 Sep 2018 06:13:18 +0000 (06:13 +0000)]
user: implement dynamic refresh of profiles (gets rid of need for fix_ap_users task)

5 years agoMerge branch 'bump-mastofe-2018-09-20' into 'develop'
Haelwenn [Thu, 20 Sep 2018 16:24:32 +0000 (16:24 +0000)]
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

5 years agoUpdate mastodon frontend
Haelwenn (lanodan) Monnier [Thu, 20 Sep 2018 16:10:13 +0000 (18:10 +0200)]
Update mastodon frontend

5 years agoMerge branch 'feature/mastodon_api_2.5.0' into 'develop'
Haelwenn [Thu, 20 Sep 2018 14:54:30 +0000 (14:54 +0000)]
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

5 years ago[Pleroma.Web.MastodonAPI.MastodonAPIController]: Bump mastodon_api_level to 2.5.0
Haelwenn (lanodan) Monnier [Thu, 20 Sep 2018 14:48:12 +0000 (16:48 +0200)]
[Pleroma.Web.MastodonAPI.MastodonAPIController]: Bump mastodon_api_level to 2.5.0

5 years ago[Pleroma.Web.MastodonAPI.MastodonAPIController]: Remove unused variables
Haelwenn (lanodan) Monnier [Thu, 20 Sep 2018 14:37:18 +0000 (16:37 +0200)]
[Pleroma.Web.MastodonAPI.MastodonAPIController]: Remove unused variables

5 years ago[Pleroma.Web.Router]: Fake /api/v1/endorsements
Haelwenn (lanodan) Monnier [Thu, 20 Sep 2018 14:25:07 +0000 (16:25 +0200)]
[Pleroma.Web.Router]: Fake /api/v1/endorsements

5 years ago[Pleroma.Web.MastodonAPI.AccountView]: relationship.json: fake endorsed value (false)
Haelwenn (lanodan) Monnier [Thu, 20 Sep 2018 14:22:31 +0000 (16:22 +0200)]
[Pleroma.Web.MastodonAPI.AccountView]: relationship.json: fake endorsed value (false)

5 years ago[Pleroma.Web.MastodonAPI.StatusView] add replies_count
Haelwenn (lanodan) Monnier [Thu, 20 Sep 2018 14:10:46 +0000 (16:10 +0200)]
[Pleroma.Web.MastodonAPI.StatusView] add replies_count

5 years agotwitter api: fix mimetype fallback when attachments use a URI instead of a URL object
William Pitcock [Wed, 19 Sep 2018 04:58:17 +0000 (04:58 +0000)]
twitter api: fix mimetype fallback when attachments use a URI instead of a URL object

5 years agomastodon api: default attachment type to image if one is not present
William Pitcock [Wed, 19 Sep 2018 04:57:28 +0000 (04:57 +0000)]
mastodon api: default attachment type to image if one is not present

5 years agoMerge branch 'fix/fake-filters' into 'develop'
Haelwenn [Wed, 19 Sep 2018 03:53:25 +0000 (03:53 +0000)]
Merge branch 'fix/fake-filters' into 'develop'

Revert "Mastodon API: Fake support for loading filters"

See merge request pleroma/pleroma!348

5 years agoRevert "Mastodon API: Fake support for loading filters"
Martin Kühl [Tue, 18 Sep 2018 09:57:33 +0000 (11:57 +0200)]
Revert "Mastodon API: Fake support for loading filters"

This reverts commit c1d07da4e18cc2acd11a5a131e1482aec5996552.

The fake support was superseded by 6e030129fb33926e6a5bd75c27af6f657f9da2a5 which actually implements the faked filters API.

This change removes the fake support and ensures that the actual implementation is used.

5 years agoReturn 204 response on options request
Dominique Feyer [Mon, 17 Sep 2018 10:21:01 +0000 (12:21 +0200)]
Return 204 response on options request

5 years agoMerge branch 'feature/mediaproxy-inline-images' into 'develop'
kaniini [Sun, 16 Sep 2018 02:25:11 +0000 (02:25 +0000)]
Merge branch 'feature/mediaproxy-inline-images' into 'develop'

html: support mediaproxy for inline images

Closes #275

See merge request pleroma/pleroma!346

5 years agoconfig: pass inline images through mediaproxy (closes #275)
William Pitcock [Sun, 16 Sep 2018 02:13:54 +0000 (02:13 +0000)]
config: pass inline images through mediaproxy (closes #275)

5 years agohtml: add policy which transforms inline images to pass through the media proxy
William Pitcock [Sun, 16 Sep 2018 02:07:32 +0000 (02:07 +0000)]
html: add policy which transforms inline images to pass through the media proxy

5 years agohtml: allow scrubbing policies to be stackable
William Pitcock [Sun, 16 Sep 2018 02:07:01 +0000 (02:07 +0000)]
html: allow scrubbing policies to be stackable

5 years agoMerge branch 'feature/mrf-scrub' into 'develop'
kaniini [Sun, 16 Sep 2018 01:31:03 +0000 (01:31 +0000)]
Merge branch 'feature/mrf-scrub' into 'develop'

MRF: html scrubbing filter

See merge request pleroma/pleroma!345

5 years agoMRF: add policy for normalizing HTML markup (local and remote) to a specific policy
William Pitcock [Mon, 10 Sep 2018 00:48:28 +0000 (00:48 +0000)]
MRF: add policy for normalizing HTML markup (local and remote) to a specific policy

5 years agohtml: add the ability to override the default scrub policy
William Pitcock [Mon, 10 Sep 2018 00:33:44 +0000 (00:33 +0000)]
html: add the ability to override the default scrub policy

5 years agoMerge branch 'update-pleroma-frontend' into 'develop'
kaniini [Sun, 16 Sep 2018 01:09:38 +0000 (01:09 +0000)]
Merge branch 'update-pleroma-frontend' into 'develop'

update pleroma frontend

See merge request pleroma/pleroma!344

5 years agoMerge branch 'feature/html-scrub-policy' into 'develop'
kaniini [Sun, 16 Sep 2018 01:05:09 +0000 (01:05 +0000)]
Merge branch 'feature/html-scrub-policy' into 'develop'

html scrub policy

See merge request pleroma/pleroma!339

5 years agoupdate-pleroma-frontend
hakabahitoyo [Fri, 14 Sep 2018 01:47:10 +0000 (10:47 +0900)]
update-pleroma-frontend

5 years agoMerge branch 'patch-3' into 'develop'
Haelwenn [Wed, 12 Sep 2018 18:01:11 +0000 (18:01 +0000)]
Merge branch 'patch-3' into 'develop'

Add visible_in_picker to status emojis

See merge request pleroma/pleroma!342

5 years agoUpdate status_view_test.exs
shadowfacts [Mon, 10 Sep 2018 23:40:29 +0000 (23:40 +0000)]
Update status_view_test.exs

5 years agoAdd visible_in_picker to status emojis
shadowfacts [Mon, 10 Sep 2018 23:32:19 +0000 (23:32 +0000)]
Add visible_in_picker to status emojis

5 years agoMerge branch 'bugfix/activitypub-bot-profile-update' into 'develop'
kaniini [Mon, 10 Sep 2018 02:03:01 +0000 (02:03 +0000)]
Merge branch 'bugfix/activitypub-bot-profile-update' into 'develop'

activitypub: transmogrifier: allow profile updates from bots

See merge request pleroma/pleroma!341

5 years agoactivitypub: transmogrifier: allow profile updates from bots
William Pitcock [Mon, 10 Sep 2018 01:57:03 +0000 (01:57 +0000)]
activitypub: transmogrifier: allow profile updates from bots

5 years agoMerge branch 'refactor/mrf-pattern-matching' into 'develop'
kaniini [Mon, 10 Sep 2018 01:22:06 +0000 (01:22 +0000)]
Merge branch 'refactor/mrf-pattern-matching' into 'develop'

MRF: significant refactoring

See merge request pleroma/pleroma!340

5 years agoMRF: reject non-public: use pattern match to remove unnecessary if block
William Pitcock [Mon, 10 Sep 2018 01:13:38 +0000 (01:13 +0000)]
MRF: reject non-public: use pattern match to remove unnecessary if block

5 years agoMRF: simple policy: refactor module to use guards and pattern matching
William Pitcock [Mon, 10 Sep 2018 01:06:44 +0000 (01:06 +0000)]
MRF: simple policy: refactor module to use guards and pattern matching

5 years agoMRF: simple policy: contain media removal/nsfw ops to create activities only
William Pitcock [Mon, 10 Sep 2018 00:53:37 +0000 (00:53 +0000)]
MRF: simple policy: contain media removal/nsfw ops to create activities only

5 years agoformatting
William Pitcock [Mon, 10 Sep 2018 00:28:40 +0000 (00:28 +0000)]
formatting

5 years agohtml: allow inline images by default (because of custom emoji)
William Pitcock [Mon, 10 Sep 2018 00:23:23 +0000 (00:23 +0000)]
html: allow inline images by default (because of custom emoji)

5 years agohtml: add default scrubbing profile and configuration knobs
William Pitcock [Mon, 10 Sep 2018 00:05:26 +0000 (00:05 +0000)]
html: add default scrubbing profile and configuration knobs

5 years agoeverywhere: use Pleroma.HTML module instead of HtmlSanitizeEx directly
William Pitcock [Sun, 9 Sep 2018 23:40:24 +0000 (23:40 +0000)]
everywhere: use Pleroma.HTML module instead of HtmlSanitizeEx directly

5 years agohtml: new module providing a configurable markup scrubbing policy
William Pitcock [Sun, 9 Sep 2018 23:29:00 +0000 (23:29 +0000)]
html: new module providing a configurable markup scrubbing policy

5 years agoMerge branch 'bugfix/missing-url-encoding-oauth-token-redirect' into 'develop'
kaniini [Sun, 9 Sep 2018 23:09:43 +0000 (23:09 +0000)]
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

5 years agoTASK: Fix formatting
Dominique Feyer [Sun, 9 Sep 2018 21:42:28 +0000 (23:42 +0200)]
TASK: Fix formatting

5 years agoAdd missing URL encoding in create authorization redirect
Dominique Feyer [Sun, 9 Sep 2018 21:31:47 +0000 (23:31 +0200)]
Add missing URL encoding in create authorization redirect

5 years agoMerge branch 'bugfix/test-circular-reference' into 'develop'
kaniini [Sun, 9 Sep 2018 13:06:17 +0000 (13:06 +0000)]
Merge branch 'bugfix/test-circular-reference' into 'develop'

test: user enabled plug tests: fix circular reference

See merge request pleroma/pleroma!336

5 years agotests: break the cycle using pleroma.factory
William Pitcock [Sun, 9 Sep 2018 12:56:25 +0000 (12:56 +0000)]
tests: break the cycle using pleroma.factory

5 years agotests: try breaking the cycle a different way
William Pitcock [Sun, 9 Sep 2018 12:43:58 +0000 (12:43 +0000)]
tests: try breaking the cycle a different way

5 years agotest: user enabled plug tests: fix circular reference
William Pitcock [Sun, 9 Sep 2018 12:22:00 +0000 (12:22 +0000)]
test: user enabled plug tests: fix circular reference

5 years agoMerge branch 'update/pleroma-fe-20180909' into 'develop'
kaniini [Sun, 9 Sep 2018 12:15:14 +0000 (12:15 +0000)]
Merge branch 'update/pleroma-fe-20180909' into 'develop'

update pleroma frontend

See merge request pleroma/pleroma!335

5 years agoupdate pleroma frontend
William Pitcock [Sun, 9 Sep 2018 12:09:52 +0000 (12:09 +0000)]
update pleroma frontend

5 years agoMerge branch 'suggestion-api-restriction' into 'develop'
kaniini [Sun, 9 Sep 2018 11:38:33 +0000 (11:38 +0000)]
Merge branch 'suggestion-api-restriction' into 'develop'

Make limit for /api/v1/suggestions

See merge request pleroma/pleroma!334