kaniini [Tue, 30 Oct 2018 20:30:01 +0000 (20:30 +0000)]
Merge branch 'reactivate' into 'develop'
Add user reactivation task.
Closes #338
See merge request pleroma/pleroma!404
scarlett [Mon, 29 Oct 2018 23:08:56 +0000 (23:08 +0000)]
Add user reactivation task.
kaniini [Mon, 29 Oct 2018 20:14:10 +0000 (20:14 +0000)]
Merge branch 'feature/upload-limits' into 'develop'
configurable media upload limits
Closes #118
See merge request pleroma/pleroma!401
William Pitcock [Mon, 29 Oct 2018 20:07:52 +0000 (20:07 +0000)]
nodeinfo: expose configured upload limits
kaniini [Mon, 29 Oct 2018 18:07:47 +0000 (18:07 +0000)]
Merge branch 'feature/s3-force-media-proxy' into 'develop'
s3 uploader: force public URIs through media proxy
See merge request pleroma/pleroma!403
William Pitcock [Mon, 29 Oct 2018 18:00:59 +0000 (18:00 +0000)]
s3 uploader: add new feature to force public attachment URIs to go through media proxy
William Pitcock [Mon, 29 Oct 2018 17:59:24 +0000 (17:59 +0000)]
common api: prefer formatting attachments using the attachment's name instead of URI
kaniini [Mon, 29 Oct 2018 17:33:20 +0000 (17:33 +0000)]
Merge branch 'bugfix/mediaproxy-leaks-2-electric-boogaloo' into 'develop'
utils: fix another possible leak with private S3 backends using mediaproxy
See merge request pleroma/pleroma!402
William Pitcock [Mon, 29 Oct 2018 17:26:15 +0000 (17:26 +0000)]
utils: fix another possible leak with private S3 backends using mediaproxy
same rationale as the other mediaproxy changes
William Pitcock [Mon, 29 Oct 2018 16:39:00 +0000 (16:39 +0000)]
mastodon api: enforce upload limits for avatars and banners
William Pitcock [Mon, 29 Oct 2018 16:36:51 +0000 (16:36 +0000)]
twitter api: enforce upload limits for avatars, banners and backgrounds
William Pitcock [Mon, 29 Oct 2018 16:30:12 +0000 (16:30 +0000)]
activitypub: upload: pass through an upload limit if one is provided
William Pitcock [Mon, 29 Oct 2018 16:29:46 +0000 (16:29 +0000)]
upload: add new optional argument designating an upload size limit
kaniini [Mon, 29 Oct 2018 15:28:29 +0000 (15:28 +0000)]
Merge branch 'bugfix/mediaproxy-leaks' into 'develop'
twitter/mastodon api: always use mediaproxy URLs in attachments
Closes #329
See merge request pleroma/pleroma!400
William Pitcock [Mon, 29 Oct 2018 15:19:32 +0000 (15:19 +0000)]
twitter/mastodon api: always use mediaproxy URLs in attachments
if using local media, the mediaproxy will not replace the URL anyway.
kaniini [Sun, 28 Oct 2018 19:54:21 +0000 (19:54 +0000)]
Merge branch 'feature/unsubscribe-user-task' into 'develop'
mix tasks: add new task to unsubscribe all users from, and then ban a remote user (e.g. followbots)
See merge request pleroma/pleroma!399
William Pitcock [Sun, 28 Oct 2018 19:47:56 +0000 (19:47 +0000)]
mix tasks: add new task to unsubscribe all users from, and then ban a remote user (e.g. followbots)
kaniini [Sun, 28 Oct 2018 05:52:51 +0000 (05:52 +0000)]
Merge branch 'bugfix/broken-thread-filtering-false-positive' into 'develop'
activitypub: fix possible false positives with broken thread filtering
See merge request pleroma/pleroma!398
kaniini [Sun, 28 Oct 2018 05:49:55 +0000 (05:49 +0000)]
Merge branch 'psql-setup-cleanup' into 'develop'
Cleanup postgresql setup script
See merge request pleroma/pleroma!397
William Pitcock [Sun, 28 Oct 2018 05:45:33 +0000 (05:45 +0000)]
activitypub: fix possible false positives with broken thread filtering
Greizgh [Sat, 27 Oct 2018 12:31:51 +0000 (14:31 +0200)]
Cleanup postgresql setup script
Drop unused CREATEDB privilege.
Do not try to handle multiple run.
kaniini [Fri, 26 Oct 2018 19:03:49 +0000 (19:03 +0000)]
Merge branch 'update-pleroma-frontend' into 'develop'
update pleroma frontend
See merge request pleroma/pleroma!396
hakabahitoyo [Fri, 26 Oct 2018 14:35:06 +0000 (23:35 +0900)]
update pleroma frontend
kaniini [Fri, 26 Oct 2018 06:45:38 +0000 (06:45 +0000)]
Merge branch 'feature/broken-thread-filtering' into 'develop'
broken thread filtering, part 1
See merge request pleroma/pleroma!394
kaniini [Fri, 26 Oct 2018 06:39:23 +0000 (06:39 +0000)]
Merge branch 'bugfix/http-fd-exhaustion-mediaproxy' into 'develop'
http: fix mediaproxy FD leaks
See merge request pleroma/pleroma!395
William Pitcock [Fri, 26 Oct 2018 06:38:08 +0000 (06:38 +0000)]
http: fix mediaproxy
William Pitcock [Fri, 26 Oct 2018 06:37:00 +0000 (06:37 +0000)]
testsuite: formatting
William Pitcock [Fri, 26 Oct 2018 06:35:06 +0000 (06:35 +0000)]
tests: add testsuite for broken thread filter
William Pitcock [Fri, 26 Oct 2018 06:16:51 +0000 (06:16 +0000)]
activitypub: add support for filtering broken threads out of timelines
kaniini [Fri, 26 Oct 2018 03:14:57 +0000 (03:14 +0000)]
Merge branch 'bugfix/fd-exhaustion' into 'develop'
http: enable keepalive / connection pooling (closes #336)
Closes #336
See merge request pleroma/pleroma!393
William Pitcock [Fri, 26 Oct 2018 03:06:42 +0000 (03:06 +0000)]
http: enable keepalive / connection pooling (closes #336)
kaniini [Fri, 26 Oct 2018 01:36:07 +0000 (01:36 +0000)]
Merge branch 'bugfix/unshared-inbox-check' into 'develop'
activitypub utils: fix recipient check when the message is unaddressed (mastodon)
See merge request pleroma/pleroma!392
William Pitcock [Fri, 26 Oct 2018 01:24:22 +0000 (01:24 +0000)]
activitypub utils: fix recipient check when the message is unaddressed (mastodon)
kaniini [Thu, 25 Oct 2018 23:49:04 +0000 (23:49 +0000)]
Merge branch 'feature/nodeinfo-frontend-config' into 'develop'
[Pleroma.Web.Nodeinfo.NodeinfoController]: Have a list of supported features
See merge request pleroma/pleroma!329
Haelwenn (lanodan) Monnier [Fri, 7 Sep 2018 00:45:26 +0000 (02:45 +0200)]
[Pleroma.Web.Nodeinfo.NodeinfoController]: Simplify features strings
Haelwenn (lanodan) Monnier [Tue, 4 Sep 2018 16:15:02 +0000 (18:15 +0200)]
[Pleroma.Web.Nodeinfo.NodeinfoController]: Have a list of supported features
kaniini [Thu, 25 Oct 2018 18:24:07 +0000 (18:24 +0000)]
Merge branch 'finmoji-optional' into 'develop'
Make finmoji optional
See merge request pleroma/pleroma!391
scarlett [Thu, 25 Oct 2018 16:58:46 +0000 (17:58 +0100)]
Make finmoji optional
kaniini [Thu, 25 Oct 2018 05:30:52 +0000 (05:30 +0000)]
Merge branch 'bugfix/user-inbox-bcc' into 'develop'
activitypub: splice users into recipient lists when they receive messages at their personal inbox
Closes #343
See merge request pleroma/pleroma!390
William Pitcock [Thu, 25 Oct 2018 05:24:17 +0000 (05:24 +0000)]
tests: add test for user inbox
William Pitcock [Thu, 25 Oct 2018 05:24:01 +0000 (05:24 +0000)]
activitypub utils: fix user splicing
William Pitcock [Thu, 25 Oct 2018 05:02:21 +0000 (05:02 +0000)]
activitypub: splice users into recipient lists when they receive messages at their personal inbox
closes #343
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
projects / akkoma / log