kaniini [Thu, 25 Oct 2018 04:38:46 +0000 (04:38 +0000)]
Merge branch 'bugfix/ap-uri-user-search' into 'develop'
transmogrifier: do not try to contain origin of something which doesn't have one
Closes #340
See merge request pleroma/pleroma!389
Haelwenn [Thu, 25 Oct 2018 04:35:29 +0000 (04:35 +0000)]
Merge branch 'bugfix/233-handle-missing-StatusView' into 'develop'
[Pleroma.Web.MastodonAPI.StatusView]: Add fallback on missing handler for status.json
Closes #233
See merge request pleroma/pleroma!257
William Pitcock [Thu, 25 Oct 2018 04:27:33 +0000 (04:27 +0000)]
transmogrifier: do not try to contain origin of something which doesn't have one
Haelwenn (lanodan) Monnier [Thu, 25 Oct 2018 04:05:13 +0000 (06:05 +0200)]
[Pleroma.Web.MastodonAPI.MastodonAPIController]: fallback for try_render/4
Better be sure than sorry
kaniini [Thu, 25 Oct 2018 04:16:40 +0000 (04:16 +0000)]
Merge branch 'feature/add-in-reply-to-profileurl' into 'develop'
twitterapi graph enrichment
See merge request pleroma/pleroma!388
William Pitcock [Thu, 25 Oct 2018 04:06:42 +0000 (04:06 +0000)]
tests: twitterapi: add additional fields
William Pitcock [Thu, 25 Oct 2018 04:04:04 +0000 (04:04 +0000)]
twitterapi: activity view: add the other in_reply_to fields
William Pitcock [Thu, 25 Oct 2018 04:01:59 +0000 (04:01 +0000)]
user: add helper for fetching profile url (which may be different than ap id)
Haelwenn (lanodan) Monnier [Thu, 25 Oct 2018 03:52:45 +0000 (05:52 +0200)]
[Pleroma.Web.MastodonAPI.MastodonAPIController]: Wrap around render/4
Haelwenn (lanodan) Monnier [Thu, 25 Oct 2018 03:18:10 +0000 (05:18 +0200)]
[Pleroma.Web.MastodonAPI.StatusView]: Remove unused arguments
Haelwenn (lanodan) Monnier [Thu, 30 Aug 2018 12:49:42 +0000 (14:49 +0200)]
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex: Output an error when render(status.json) gives a nil
Haelwenn (lanodan) Monnier [Wed, 29 Aug 2018 18:16:01 +0000 (20:16 +0200)]
[Pleroma.Web.MastodonAPI.StatusView]: Remove nils from lists.json
Haelwenn (lanodan) Monnier [Wed, 29 Aug 2018 19:07:12 +0000 (21:07 +0200)]
[Pleroma.Web.MastodonAPI.StatusView]: Return nil as fallback for missing views
kaniini [Thu, 25 Oct 2018 03:11:19 +0000 (03:11 +0000)]
Merge branch 'feature/in-reply-to-screen-name' into 'develop'
initial graph traversal support
Closes #68
See merge request pleroma/pleroma!387
William Pitcock [Thu, 25 Oct 2018 03:03:44 +0000 (03:03 +0000)]
tests: update for new in_reply_to_screen_name field
William Pitcock [Thu, 25 Oct 2018 02:54:29 +0000 (02:54 +0000)]
twitterapi: activity view: implement in_reply_to_screen_name using the new graph walking helper
William Pitcock [Thu, 25 Oct 2018 02:47:55 +0000 (02:47 +0000)]
activity: add helper to fetch an activity's parent
kaniini [Thu, 25 Oct 2018 00:16:15 +0000 (00:16 +0000)]
Merge branch 'update-pleroma-frontend' into 'develop'
Update pleroma frontend
See merge request pleroma/pleroma!385
kaniini [Thu, 25 Oct 2018 00:15:29 +0000 (00:15 +0000)]
Merge branch 'security/add-security-directives-to-systemd-example' into 'develop'
Add some security directives to the systemd example file
See merge request pleroma/pleroma!386
shibayashi [Wed, 24 Oct 2018 22:57:47 +0000 (00:57 +0200)]
Add a little bit more detail in the comments.
shibayashi [Wed, 24 Oct 2018 22:37:31 +0000 (00:37 +0200)]
Add some security related directives to the systemd service example
scarlett [Tue, 23 Oct 2018 11:15:48 +0000 (12:15 +0100)]
update pleroma-fe
scarlett [Tue, 23 Oct 2018 11:15:48 +0000 (12:15 +0100)]
update pleroma-fe
kaniini [Tue, 23 Oct 2018 00:56:09 +0000 (00:56 +0000)]
Merge branch 'bugfix/html-scrub-comments' into 'develop'
html: ensure comments are correctly scrubbed
See merge request pleroma/pleroma!384
kaniini [Tue, 23 Oct 2018 00:50:28 +0000 (00:50 +0000)]
Merge branch 'new-frontend-options' into 'develop'
New frontend options
See merge request pleroma/pleroma!383
William Pitcock [Tue, 23 Oct 2018 00:48:49 +0000 (00:48 +0000)]
html: ensure comments are correctly scrubbed
scarlett [Sun, 21 Oct 2018 11:54:37 +0000 (12:54 +0100)]
Defaults for new frontend options in config.exs
scarlett [Sun, 21 Oct 2018 11:52:52 +0000 (12:52 +0100)]
New frontend options
eal [Sat, 20 Oct 2018 10:14:08 +0000 (10:14 +0000)]
Merge branch 'pleroma-list-belongs' into 'develop'
Pleroma list belongs
Closes #333
See merge request pleroma/pleroma!382
eal [Sat, 20 Oct 2018 10:03:45 +0000 (13:03 +0300)]
Fix some typos in the list test.
AkiraFukushima [Fri, 19 Oct 2018 12:24:15 +0000 (21:24 +0900)]
Add a test for List.get_lists_account_belongs
AkiraFukushima [Thu, 18 Oct 2018 16:46:26 +0000 (01:46 +0900)]
Add an endpoint /api/v1/accounts/:id/lists to get lists to which account belongs
kaniini [Thu, 18 Oct 2018 14:36:40 +0000 (14:36 +0000)]
Merge branch 'bugfix/html-scrub-schemes' into 'develop'
lib/pleroma/html.ex: Fix scheme lists
See merge request pleroma/pleroma!377
William Pitcock [Thu, 18 Oct 2018 14:29:31 +0000 (14:29 +0000)]
html scrubbing policies: restrict img tags to http/https only for mediaproxy compatibility
Haelwenn (lanodan) Monnier [Thu, 18 Oct 2018 05:36:58 +0000 (07:36 +0200)]
lib/pleroma/html.ex: Use macros for valid_schemes, change config for schemes
kaniini [Wed, 17 Oct 2018 19:33:15 +0000 (19:33 +0000)]
Merge branch 'bugfix/osada-mention' into 'develop'
fix osada mentions
Closes #324
See merge request pleroma/pleroma!380
William Pitcock [Wed, 17 Oct 2018 19:27:05 +0000 (19:27 +0000)]
tests: add a testcase for matching osada users in the formatter
William Pitcock [Wed, 17 Oct 2018 19:15:20 +0000 (19:15 +0000)]
formatter: fix matching osada users
Haelwenn [Wed, 17 Oct 2018 04:24:13 +0000 (04:24 +0000)]
Merge branch 'import-maybe-direct-follow' into 'develop'
Use maybe_direct_follow for follow imports
See merge request pleroma/pleroma!378
scarlett [Wed, 17 Oct 2018 03:16:11 +0000 (04:16 +0100)]
Use maybe_direct_follow for follow imports
Haelwenn (lanodan) Monnier [Tue, 16 Oct 2018 01:34:33 +0000 (03:34 +0200)]
lib/pleroma/html.ex: Use a function as a variable (broken for some reason)
Haelwenn (lanodan) Monnier [Tue, 16 Oct 2018 01:00:37 +0000 (03:00 +0200)]
lib/pleroma/html.ex: Fix scheme lists
Gosh please don’t break ourselves…
Also this is copy-paste of the list in lib/pleroma/formatter.ex,
I think this should be put in a common variable, but where?
kaniini [Sun, 14 Oct 2018 20:42:23 +0000 (20:42 +0000)]
Merge branch 'feature/markdown-enable-tags' into 'develop'
common api: enable tag linking in markdown mode
Closes #322
See merge request pleroma/pleroma!376
William Pitcock [Sun, 14 Oct 2018 20:36:11 +0000 (20:36 +0000)]
common api: enable tag linking in markdown mode
kaniini [Sun, 14 Oct 2018 19:29:58 +0000 (19:29 +0000)]
Merge branch 'security/clear-oauth-with-password' into 'develop'
Delete Tokens and Authorizations on password change
Closes #320
See merge request pleroma/pleroma!375
Haelwenn (lanodan) Monnier [Sat, 13 Oct 2018 23:45:11 +0000 (01:45 +0200)]
Delete Tokens and Authorizations on password change
Closes: https://git.pleroma.social/pleroma/pleroma/issues/320
kaniini [Thu, 11 Oct 2018 10:56:12 +0000 (10:56 +0000)]
Merge branch 'security/fix-local-locked-accounts' into 'develop'
security: fix local locked accounts
Closes #316
See merge request pleroma/pleroma!372
William Pitcock [Thu, 11 Oct 2018 10:49:54 +0000 (10:49 +0000)]
user: break out local cases for maybe_direct_follow
William Pitcock [Thu, 11 Oct 2018 10:35:32 +0000 (10:35 +0000)]
test: add regression test for #316
William Pitcock [Thu, 11 Oct 2018 10:35:11 +0000 (10:35 +0000)]
user: local users are always AP-enabled (closes #316)
kaniini [Wed, 10 Oct 2018 08:00:23 +0000 (08:00 +0000)]
Merge branch 'bugfix/length-enforce-subjects' into 'develop'
common api: take the combination of the subject and content for length limit enforcement
Closes #315
See merge request pleroma/pleroma!371
William Pitcock [Wed, 10 Oct 2018 07:53:20 +0000 (07:53 +0000)]
common api: take the combination of the subject and content for length limit enforcement
closes #315
Haelwenn [Sun, 7 Oct 2018 01:34:16 +0000 (01:34 +0000)]
Merge branch 'feature/mrf-transparency-opt-out' into 'develop'
nodeinfo: allow opting out of MRF transparency
See merge request pleroma/pleroma!370
William Pitcock [Sun, 7 Oct 2018 01:23:38 +0000 (01:23 +0000)]
nodeinfo: allow opting out of MRF transparency
kaniini [Sun, 7 Oct 2018 01:16:05 +0000 (01:16 +0000)]
Merge branch 'security/follow-always-async' into 'develop'
AP follows must be always async (closes #306)
Closes #306
See merge request pleroma/pleroma!368
kaniini [Sun, 7 Oct 2018 01:10:12 +0000 (01:10 +0000)]
Merge branch 'patch-2' into 'develop'
Relax form-action content security policy in sample nginx config
See merge request pleroma/pleroma!364
kaniini [Sun, 7 Oct 2018 01:09:33 +0000 (01:09 +0000)]
Merge branch 'update-pleroma-frontend' into 'develop'
update-pleroma-frontend
See merge request pleroma/pleroma!369
William Pitcock [Sun, 7 Oct 2018 01:05:59 +0000 (01:05 +0000)]
{mastodon api, twitter api}: make the follow handshake timeout configurable
hakabahitoyo [Sun, 7 Oct 2018 00:58:08 +0000 (09:58 +0900)]
update-pleroma-frontend
William Pitcock [Fri, 5 Oct 2018 23:50:13 +0000 (23:50 +0000)]
mastodon api: relationship view: better handle no pre-existing follow activity
William Pitcock [Fri, 5 Oct 2018 23:40:49 +0000 (23:40 +0000)]
user: add wait_and_refresh() for async three-way handshake case
William Pitcock [Fri, 5 Oct 2018 23:31:49 +0000 (23:31 +0000)]
mastodon api: account view: fetch follow state and use it to populate `requested` field
William Pitcock [Fri, 5 Oct 2018 23:31:00 +0000 (23:31 +0000)]
activitypub: always track following state for async reasons
William Pitcock [Fri, 5 Oct 2018 23:30:34 +0000 (23:30 +0000)]
activitypub transmogrifier: better manage follow state
William Pitcock [Fri, 5 Oct 2018 22:53:59 +0000 (22:53 +0000)]
user: only pre-create follow relationships on OStatus
closes #306
kaniini [Fri, 5 Oct 2018 21:17:46 +0000 (21:17 +0000)]
Merge branch 'revert-
d31bbb1c' into 'develop'
Rich Text Redo Branch
See merge request pleroma/pleroma!314
William Pitcock [Fri, 5 Oct 2018 21:11:22 +0000 (21:11 +0000)]
test: update test for new html scrub policy
William Pitcock [Fri, 5 Oct 2018 21:05:37 +0000 (21:05 +0000)]
nodeinfo: add accepted post formats to metadata
William Pitcock [Fri, 5 Oct 2018 21:02:17 +0000 (21:02 +0000)]
config: allow for accepted post formats to be configured
William Pitcock [Sun, 9 Sep 2018 23:40:24 +0000 (23:40 +0000)]
formatter: use Pleroma.HTML module instead of HtmlSanitizeEx directly
William Pitcock [Sun, 9 Sep 2018 12:12:31 +0000 (12:12 +0000)]
twitterapi: frontend config: add formattingOptionsEnabled
William Pitcock [Sun, 2 Sep 2018 00:14:25 +0000 (00:14 +0000)]
Revert "Merge branch 'revert-
a26d5e6b' into 'develop'"
This reverts commit
d31bbb1cfe04ca6073a322bcf77239e7d4b79839, reversing
changes made to
340ab3cb9068d444b77213e07beb8c2c3ca128b9.
kaniini [Fri, 5 Oct 2018 20:41:16 +0000 (20:41 +0000)]
Merge branch 'feature/nodeinfo_federation_info' into 'develop'
Nodeinfo federation info
See merge request pleroma/pleroma!367
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
Haelwenn (lanodan) Monnier [Thu, 4 Oct 2018 11:37:17 +0000 (13:37 +0200)]
MRF Transparency
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
Haelwenn (lanodan) Monnier [Wed, 5 Sep 2018 21:06:55 +0000 (23:06 +0200)]
[Pleroma.Web.Nodeinfo.NodeinfoController]: Transparency on MRF Simple
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
William Pitcock [Sun, 30 Sep 2018 05:25:28 +0000 (05:25 +0000)]
activitypub: fix error condition match
barrucadu [Fri, 28 Sep 2018 22:17:19 +0000 (22:17 +0000)]
Relax form-action content security policy
'self' only allows forms submitted to the same origin, which
breaks the "remote follow" form. To allow remote following,
we want to allow forms to be submitted to any host.
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
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
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
Haelwenn (lanodan) Monnier [Fri, 28 Sep 2018 09:17:33 +0000 (11:17 +0200)]
[Pleroma.Web.TwitterAPI.UserViewTest]: Add test for mastodon-fields
Haelwenn (lanodan) Monnier [Thu, 27 Sep 2018 18:17:44 +0000 (20:17 +0200)]
[Pleroma.Web.TwitterAPI.UserView]: Add mastodon-fields in "fields"
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
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
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
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
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
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
Haelwenn (lanodan) Monnier [Thu, 27 Sep 2018 09:38:30 +0000 (11:38 +0200)]
transmogrifier: Just make attachement maps into a list and reroll
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
William Pitcock [Thu, 27 Sep 2018 07:14:15 +0000 (07:14 +0000)]
transmogrifier: more robustly handle dereferencing pointer URIs
Haelwenn (lanodan) Monnier [Wed, 26 Sep 2018 19:01:33 +0000 (21:01 +0200)]
transmogrifier: Use oneliners when applicable
William Pitcock [Wed, 26 Sep 2018 18:47:18 +0000 (18:47 +0000)]
transmogrifier: reformat `cond` block by hand
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
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
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)
Haelwenn (lanodan) Monnier [Tue, 25 Sep 2018 15:12:29 +0000 (17:12 +0200)]
transmogrifier: Use a cond, add proactive support for arrays
projects / akkoma / log