squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
2,588 Commits 154 Branches 42 Tags 503 MiB
ec464ef20a
Commit Graph

2588 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
William Pitcock
676c97b8c7 nodeinfo: expose configured upload limits 2018-10-29 20:07:52 +00:00
kaniini
7ac701ccd2 Merge branch 'feature/s3-force-media-proxy' into 'develop' 
s3 uploader: force public URIs through media proxy

See merge request pleroma/pleroma!403
 2018-10-29 18:07:47 +00:00
William Pitcock
36825932eb s3 uploader: add new feature to force public attachment URIs to go through media proxy 2018-10-29 18:00:59 +00:00
William Pitcock
f407831120 common api: prefer formatting attachments using the attachment's name instead of URI 2018-10-29 17:59:24 +00:00
kaniini
f61acdc5b4 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
 2018-10-29 17:33:20 +00:00
William Pitcock
784b3a615d utils: fix another possible leak with private S3 backends using mediaproxy 
same rationale as the other mediaproxy changes
 2018-10-29 17:26:15 +00:00
William Pitcock
181f3bb56a mastodon api: enforce upload limits for avatars and banners 2018-10-29 16:43:05 +00:00
William Pitcock
e12489e2fe twitter api: enforce upload limits for avatars, banners and backgrounds 2018-10-29 16:43:05 +00:00
William Pitcock
167d3789a5 activitypub: upload: pass through an upload limit if one is provided 2018-10-29 16:43:05 +00:00
William Pitcock
fa483cd7c2 upload: add new optional argument designating an upload size limit 2018-10-29 16:43:00 +00:00
kaniini
fbbc5fc919 Merge branch 'bugfix/mediaproxy-leaks' into 'develop' 
twitter/mastodon api: always use mediaproxy URLs in attachments

Closes #329

See merge request pleroma/pleroma!400
 2018-10-29 15:28:29 +00:00
William Pitcock
5c6ec2d9fc twitter/mastodon api: always use mediaproxy URLs in attachments 
if using local media, the mediaproxy will not replace the URL anyway.
 2018-10-29 15:19:32 +00:00
kaniini
658036881d 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
 2018-10-28 19:54:21 +00:00
William Pitcock
69192f36ff mix tasks: add new task to unsubscribe all users from, and then ban a remote user (e.g. followbots) 2018-10-28 19:47:56 +00:00
kaniini
39103a91be 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
 2018-10-28 05:52:51 +00:00
kaniini
6aeeb322ae Merge branch 'psql-setup-cleanup' into 'develop' 
Cleanup postgresql setup script

See merge request pleroma/pleroma!397
 2018-10-28 05:49:55 +00:00
William Pitcock
72ea54de6e activitypub: fix possible false positives with broken thread filtering 2018-10-28 05:45:33 +00:00
Greizgh
a494508320 Cleanup postgresql setup script 
Drop unused CREATEDB privilege.
Do not try to handle multiple run.
 2018-10-27 14:31:51 +02:00
kaniini
310a4bc25c Merge branch 'update-pleroma-frontend' into 'develop' 
update pleroma frontend

See merge request pleroma/pleroma!396
 2018-10-26 19:03:49 +00:00
hakabahitoyo
72a880431f update pleroma frontend 2018-10-26 23:35:06 +09:00
hakabahitoyo
0253015467 update pleroma frontend 2018-10-26 23:28:15 +09:00
kaniini
44762daf51 Merge branch 'feature/broken-thread-filtering' into 'develop' 
broken thread filtering, part 1

See merge request pleroma/pleroma!394
 2018-10-26 06:45:38 +00:00
kaniini
9b39670683 Merge branch 'bugfix/http-fd-exhaustion-mediaproxy' into 'develop' 
http: fix mediaproxy FD leaks

See merge request pleroma/pleroma!395
 2018-10-26 06:39:23 +00:00
William Pitcock
c302c619b9 http: fix mediaproxy 2018-10-26 06:38:08 +00:00
William Pitcock
2ac13061af testsuite: formatting 2018-10-26 06:37:00 +00:00
William Pitcock
0d0c1dcf44 tests: add testsuite for broken thread filter 2018-10-26 06:35:06 +00:00
William Pitcock
26eb11c172 activitypub: add support for filtering broken threads out of timelines 2018-10-26 06:16:51 +00:00
kaniini
ae7c79cfc2 Merge branch 'bugfix/fd-exhaustion' into 'develop' 
http: enable keepalive / connection pooling (closes #336)

Closes #336

See merge request pleroma/pleroma!393
 2018-10-26 03:14:57 +00:00
William Pitcock
7338368ad9 http: enable keepalive / connection pooling (closes #336) 2018-10-26 03:06:42 +00:00
kaniini
2d957b985f 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
 2018-10-26 01:36:07 +00:00
William Pitcock
f6cb963df2 activitypub utils: fix recipient check when the message is unaddressed (mastodon) 2018-10-26 01:24:22 +00:00
kaniini
72031e80d7 Merge branch 'feature/nodeinfo-frontend-config' into 'develop' 
[Pleroma.Web.Nodeinfo.NodeinfoController]: Have a list of supported features

See merge request pleroma/pleroma!329
 2018-10-25 23:49:04 +00:00
Haelwenn (lanodan) Monnier
7906dfe5a0
[Pleroma.Web.Nodeinfo.NodeinfoController]: Simplify features strings 2018-10-26 01:06:34 +02:00
Haelwenn (lanodan) Monnier
57330dd91b
[Pleroma.Web.Nodeinfo.NodeinfoController]: Have a list of supported features 2018-10-26 01:06:19 +02:00
kaniini
9fe9c09883 Merge branch 'finmoji-optional' into 'develop' 
Make finmoji optional

See merge request pleroma/pleroma!391
 2018-10-25 18:24:07 +00:00
scarlett
ae5beb7b64 Make finmoji optional 2018-10-25 17:58:46 +01:00
kaniini
63556150e1 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
 2018-10-25 05:30:52 +00:00
William Pitcock
b1d1f9bc27 tests: add test for user inbox 2018-10-25 05:24:17 +00:00
William Pitcock
ce70eb8c00 activitypub utils: fix user splicing 2018-10-25 05:24:01 +00:00
William Pitcock
2f1f1a4f30 activitypub: splice users into recipient lists when they receive messages at their personal inbox 
closes #343
 2018-10-25 05:02:21 +00:00
kaniini
9e9b1bd5ea 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
 2018-10-25 04:38:46 +00:00
Haelwenn
79b1e4465f 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
 2018-10-25 04:35:29 +00:00
William Pitcock
5383887bd4 transmogrifier: do not try to contain origin of something which doesn't have one 2018-10-25 04:27:33 +00:00
Haelwenn (lanodan) Monnier
b386888a0e
[Pleroma.Web.MastodonAPI.MastodonAPIController]: fallback for try_render/4 
Better be sure than sorry
 2018-10-25 06:21:11 +02:00
kaniini
4646794ee2 Merge branch 'feature/add-in-reply-to-profileurl' into 'develop' 
twitterapi graph enrichment

See merge request pleroma/pleroma!388
 2018-10-25 04:16:40 +00:00
William Pitcock
6cfba7db8d tests: twitterapi: add additional fields 2018-10-25 04:06:42 +00:00
William Pitcock
1ed25c963a twitterapi: activity view: add the other in_reply_to fields 2018-10-25 04:04:04 +00:00
William Pitcock
1b480e3514 user: add helper for fetching profile url (which may be different than ap id) 2018-10-25 04:01:59 +00:00
Haelwenn (lanodan) Monnier
b112112c11
[Pleroma.Web.MastodonAPI.MastodonAPIController]: Wrap around render/4 2018-10-25 05:52:45 +02:00
Haelwenn (lanodan) Monnier
b0a940d5a2
[Pleroma.Web.MastodonAPI.StatusView]: Remove unused arguments 2018-10-25 05:24:03 +02:00