be7bb90bef
update-pleroma-frontend
2018-10-07 09:58:08 +09:00
614e47aa7c
Merge branch 'revert-d31bbb1c' into 'develop'
...
Rich Text Redo Branch
See merge request pleroma/pleroma!314
2018-10-05 21:17:46 +00:00
497814cbbb
test: update test for new html scrub policy
2018-10-05 21:11:22 +00:00
bd76d9cee6
nodeinfo: add accepted post formats to metadata
2018-10-05 21:05:37 +00:00
285ac80c36
config: allow for accepted post formats to be configured
2018-10-05 21:02:17 +00:00
52b05137c5
formatter: use Pleroma.HTML module instead of HtmlSanitizeEx directly
2018-10-05 20:49:34 +00:00
16307da311
twitterapi: frontend config: add formattingOptionsEnabled
2018-10-05 20:49:34 +00:00
b1be9415ef
Revert "Merge branch 'revert-a26d5e6b' into 'develop'"
...
This reverts commit d31bbb1cfe340ab3cb90
2018-10-05 20:49:34 +00:00
f7ba393bb9
Merge branch 'feature/nodeinfo_federation_info' into 'develop'
...
Nodeinfo federation info
See merge request pleroma/pleroma!367
2018-10-05 20:41:16 +00:00
f2efc8dcfb
nodeinfo_controller: Fix JSON rendering
...
This is the last noedinfo difference from my own branch
2018-10-05 22:32:53 +02:00
28651df478
MRF Transparency
2018-10-05 20:09:08 +02:00
56d31db130
Pleroma.Web.Nodeinfo.NodeinfoController: Further transparency, breaks API of previous one
2018-10-05 20:08:55 +02:00
8226953f1d
[Pleroma.Web.Nodeinfo.NodeinfoController]: Transparency on MRF Simple
2018-10-05 20:02:13 +02:00
4f03bb2299
Merge branch 'bugfix/fix-mrf-reject-match' into 'develop'
...
activitypub: fix error condition match
See merge request pleroma/pleroma!365
2018-09-30 05:32:56 +00:00
4db1bc2c0e
activitypub: fix error condition match
2018-09-30 05:26:13 +00:00
ab2e5ba989
Merge branch 'bugfix/magnet-links' into 'develop'
...
formatter: Stop using phoenix HTML and format it ourselves
Closes #307
See merge request pleroma/pleroma!363
2018-09-28 19:20:54 +00:00
a3cffd3566
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
2018-09-28 17:32:27 +02:00
34b6d444d6
Merge branch 'feature/twitter_api/fields' into 'develop'
...
[Pleroma.Web.TwitterAPI.UserView]: Add mastodon-fields in "fields"
See merge request pleroma/pleroma!360
2018-09-28 09:25:27 +00:00
a74daabfae
[Pleroma.Web.TwitterAPI.UserViewTest]: Add test for mastodon-fields
2018-09-28 11:17:33 +02:00
82b57ebad1
[Pleroma.Web.TwitterAPI.UserView]: Add mastodon-fields in "fields"
2018-09-28 10:44:45 +02:00
dbc9feecbf
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
2018-09-28 00:51:45 +00:00
707077edde
activitypub: don't fall back to OStatus fetching when MRF rejects an object
2018-09-28 00:45:10 +00:00
db989d1fa4
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
2018-09-28 00:14:53 +00:00
5c312ad677
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
2018-09-28 00:03:59 +00:00
6258ddaa60
Merge branch 'bugfix/kroeg' into 'develop'
...
More kroeg bugfixes
See merge request pleroma/pleroma!353
2018-09-27 20:25:35 +00:00
c739737998
transmogrifier: get_actor called without casting attributedTo in actor and actor is nil
2018-09-27 20:00:48 +02:00
9446b02bdf
transmogrifier: Just make attachement maps into a list and reroll
2018-09-27 20:00:48 +02:00
e53da692fb
transmogrifier: Use the correct variable and prefer inspect in case of a bad type being passed on
2018-09-27 20:00:48 +02:00
d830a243a3
transmogrifier: more robustly handle dereferencing pointer URIs
2018-09-27 20:00:48 +02:00
4c3a80de96
transmogrifier: Use oneliners when applicable
2018-09-27 20:00:47 +02:00
ed8dfa3029
transmogrifier: reformat `cond` block by hand
2018-09-27 20:00:47 +02:00
eebe33e86a
transmogrifier: Add support for array-less hashtags, add broken announce, harden get_actor
2018-09-27 20:00:47 +02:00
f3291acc91
transmogrifier: pro-actively add support for Hashtag without array in tag
2018-09-27 20:00:47 +02:00
2c820e10b8
transmogrifier_test: incoming notices with tag not being an array (kroeg)
2018-09-27 20:00:47 +02:00
22927f3a34
transmogrifier: Use a cond, add proactive support for arrays
2018-09-27 20:00:46 +02:00
0aac72f1d3
[Pleroma.Web.ActivityPub.Transmogrifier]: quick fix when tag is a Map
2018-09-27 20:00:46 +02:00
28e8a8ab36
[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
2018-09-27 20:00:46 +02:00
f8a0cb9c0b
[Pleroma.Web.ActivityPub.Transmogrifier]: fix when attachment contain is just a Map [kroeg]
2018-09-27 20:00:46 +02:00
a4abb124ea
[Pleroma.Web.ActivityPub.Transmogrifier]: Fix when inReplyTo is a inlined post [kroeg]
2018-09-27 20:00:46 +02:00
523757be52
[Pleroma.Web.ActivityPub.ActivityPub]: Harden getting endpoints [kroeg]
2018-09-27 20:00:45 +02:00
3de12c194f
Merge branch 'fix/s3/filenames-with-spaces' into 'develop'
...
Uploaders.S3: Replace unsafe characters in object key
See merge request pleroma/pleroma!359
2018-09-24 14:17:21 +00:00
f77ec96707
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
2018-09-24 15:38:32 +02:00
7252055078
Merge branch 'update/pleroma-fe-20180922' into 'develop'
...
update pleroma frontend
See merge request pleroma/pleroma!357
2018-09-22 05:08:37 +00:00
bb213a85c5
update pleroma frontend
2018-09-22 05:08:15 +00:00
3193423be9
Merge branch 'feature/html-scrub-policy-tests' into 'develop'
...
html: add scrub policy tests
See merge request pleroma/pleroma!356
2018-09-22 03:50:39 +00:00
85b59d07b6
test: add smoketests for the scrubbing policies
2018-09-22 03:45:37 +00:00
7f0e291483
html: twittertext: add missing catchall scrub function
2018-09-22 03:45:35 +00:00
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
2018-09-22 03:30:00 +00:00
56577d8b48
twitter api: add no_rich_text option to userview for account prefs
2018-09-22 03:24:40 +00:00
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
2018-09-22 03:08:19 +00:00
hakabahitoyo
kaniini
William Pitcock
Haelwenn (lanodan) Monnier
Haelwenn
Martin Kühl