limepotato/akkoma
1
0
Fork 0
Code Pull requests Activity
9862 commits 27 branches 107 tags 315 MiB
Commit graph

9862 commits

This branch
This branch
All branches
Author SHA1 Message Date
lain
fa37bfff99 Merge branch 'default-to-hackney-again' into 'develop' 
Config: Default to Hackney again

See merge request pleroma/pleroma!2619
 2020-06-01 13:24:03 +00:00
lain
ac31f687c0 Config: Default to Hackney again 
Gun needs some server setting changes (files) and has problems with
OTP 23 (wildcards), so use Hackney as a default again for now.
 2020-06-01 13:35:39 +02:00
Haelwenn
e96765df6b Merge branch 'chore/bump-hackney' into 'develop' 
mix.lock: update hackney to 1.16.0

Closes #1612

See merge request pleroma/pleroma!2614
 2020-05-30 15:51:19 +00:00
lain
beeeed5b58 Merge branch 'test/fix-config-setting-in-user-test' into 'develop' 
Fix config setting to not affect other tests

See merge request pleroma/pleroma!2615
 2020-05-30 14:03:43 +00:00
Roman Chvanikov
b973d0b2f0 Fix config setting to not affect other tests 2020-05-30 16:47:09 +03:00
rinpatch
0cb7b0ea84 hackney adapter helper: support tlsv1.3 and remove custom opts 
- partitial_chain is no longer exported, but it seems to be the default anyway.
- The bug that caused sni to not be sent automatically seems to be fixed -
https://github.com/benoitc/hackney/issues/612
 2020-05-30 15:36:55 +03:00
lain
b004c427a0 Merge branch 'conversation-pagination' into 'develop' 
Conversation pagination

See merge request pleroma/pleroma!2601
 2020-05-30 10:02:37 +00:00
Steven Fuchs
6d4b80822b Conversation pagination 2020-05-30 10:02:37 +00:00
rinpatch
d23b3701d8 Merge branch 'bugfix/csp-unproxied' into 'develop' 
http_security_plug.ex: Fix non-proxied media

See merge request pleroma/pleroma!2610
 2020-05-29 21:23:49 +00:00
rinpatch
32ba2b7f9f Merge branch 'media-docs' into 'develop' 
Docs: Attachement limitations in MastoAPI differences

See merge request pleroma/pleroma!2607
 2020-05-29 21:20:36 +00:00
rinpatch
d2a1975e56 mix.lock: update hackney to 1.16.0 
Closes #1612
 2020-05-30 00:18:17 +03:00
rinpatch
109af93227 Apply suggestion to lib/pleroma/plugs/http_security_plug.ex 2020-05-29 21:15:07 +00:00
lain
f361264e1a Merge branch 'hotfix/streamer-test-unused-var-warning' into 'develop' 
fix unused var warning in streamer test

See merge request pleroma/pleroma!2612
 2020-05-29 20:31:07 +00:00
Roman Chvanikov
0a83af330b fix unused var warning 2020-05-29 23:05:03 +03:00
rinpatch
660d49227b Merge branch 'connect-src' into 'develop' 
Add blob: to connect-src CSP, fixes #1827

Closes #1827

See merge request pleroma/pleroma!2608
 2020-05-29 19:26:54 +00:00
Alex Gleason
d38f28870e
Add blob: to connect-src CSP 2020-05-29 11:08:17 -05:00
lain
219d2b3146 Merge branch 'fix-streaming' into 'develop' 
Fix argument error in streamer

See merge request pleroma/pleroma!2609
 2020-05-29 15:42:43 +00:00
feld
81db758e8e Merge branch 'mix/database-vacuum-options' into 'develop' 
Database vacuum mix task

See merge request pleroma/pleroma!2599
 2020-05-29 15:33:35 +00:00
kPherox
9ca978494f
Add test for stream boosts of mastodon user 2020-05-30 00:31:20 +09:00
kPherox
de0e262839
Fix argument error in streamer 
`Repo.exists` can't use `nil` as it is unsafe.
Use parent object instead of activity because currently Announce activity's context is null.
 2020-05-30 00:31:18 +09:00
Haelwenn (lanodan) Monnier
da1e31fae3
http_security_plug.ex: Fix non-proxied media 2020-05-29 17:20:09 +02:00
Mark Felder
1b586ff3ae Document new database vacuum tasks 2020-05-29 10:17:06 -05:00
lain
9848978109 Merge branch 'fix-relay-repeat-notification' into 'develop' 
Fix relay repeat notification

See merge request pleroma/pleroma!2590
 2020-05-29 10:42:49 +00:00
kPherox
228ff3760e
Use User.is_internal_user? instead 2020-05-29 19:07:05 +09:00
kPherox
9df5b1e6ae
Don't make relay announce notification 2020-05-29 19:06:38 +09:00
rinpatch
396bc69aee Merge branch 'fix/mediaproxy-bypass-emoji' into 'develop' 
Fix profile emojis bypassing mediaproxy and harden CSP

Closes #1810

See merge request pleroma/pleroma!2596
 2020-05-29 09:46:31 +00:00
rinpatch
27180611df HTTP Security plug: make starting csp string generation more readable 2020-05-29 12:32:48 +03:00
Alex Gleason
394258d548
Docs: Attachement limitations in MastoAPI differences 2020-05-28 16:11:33 -05:00
lain
1d30608e20 Merge branch 'fix/1557-gets-local-pack' into 'develop' 
get-packs for local generated pack

Closes #1557

See merge request pleroma/pleroma!2604
 2020-05-28 17:08:30 +00:00
lain
f6ddf0cc50 Merge branch 'feature/1792-update-actor-type' into 'develop' 
Validate actor type

See merge request pleroma/pleroma!2593
 2020-05-28 16:58:28 +00:00
lain
ddbf7084e2 Merge branch 'update-install-guides' into 'develop' 
Update installation guides

See merge request pleroma/pleroma!2603
 2020-05-28 16:54:09 +00:00
Alexander Strizhakov
ae05792d2a
get-packs for local generated pack 2020-05-28 19:41:34 +03:00
Egor Kislitsyn
800e624058
Update installation guides 2020-05-28 19:32:56 +04:00
rinpatch
089d72d2e6 Merge branch 'chore/fix-spelling' into 'develop' 
Fix minor spelling error

See merge request pleroma/pleroma!2598
 2020-05-28 11:38:35 +00:00
Mark Felder
92fba24c74 Alpha sort 2020-05-27 17:17:06 -05:00
Mark Felder
30f96b19c1 Abstract out the database maintenance. I'd like to use this from AdminFE too. 2020-05-27 16:40:51 -05:00
Mark Felder
0d57e06626 Make clearer that this is time and resource consuming 2020-05-27 16:31:37 -05:00
Mark Felder
73ca57e4f1 Make it obvious a full vacuum can take a while 2020-05-27 16:27:29 -05:00
Mark Felder
a2f57bd82b Permit easy access to vaccum full and analyze via a mix task 2020-05-27 16:27:07 -05:00
Mark Felder
95f6240889 Fix minor spelling error 2020-05-27 14:34:37 -05:00
rinpatch
a23df89b5d Merge branch 'bundle/adminfe-20200527' into 'develop' 
Update AdminFE build, re-enables emoji packs

See merge request pleroma/pleroma!2597
 2020-05-27 19:22:53 +00:00
Mark Felder
d28b9708d2 Update AdminFE build, re-enables emoji packs 2020-05-27 13:50:24 -05:00
rinpatch
29ff6d414b HTTP security plug: Harden img-src and media-src when MediaProxy is enabled 2020-05-27 21:41:19 +03:00
rinpatch
455a402c8a HTTP Security plug: rewrite &csp_string/0 
- Directives are now separated with ";" instead of " ;",
according to https://www.w3.org/TR/CSP2/#policy-parsing
the space is optional
- Use an IO list, which at the end gets converted to a binary as
opposed to ++ing a bunch of arrays with binaries together and joining
them to a string. I doubt it gives any significant real world advantage,
but the code is cleaner and now I can sleep at night.
- The static part of csp is pre-joined to a single binary at compile time.
Same reasoning as the last point.
 2020-05-27 21:31:47 +03:00
rinpatch
8f6d428880 AccountView: Use mediaproxy URLs for emojis 
Also use atom keys in emoji maps instead of binaries

Closes #1810
 2020-05-27 19:44:02 +03:00
rinpatch
78c46fb7ba MediaProxy test: use config macros instead of directly putting values 
They were not properly cleaned later and caused trouble for another tests
 2020-05-27 19:34:56 +03:00
kPherox
48fd9be65a
Exclude post actor from to of relay announce 2020-05-27 23:51:15 +09:00
rinpatch
d35be02e70 Merge branch 'refactor-add-mention-step-one' into 'develop' 
Fix ObjectView calling into strange functions

Closes #1807

See merge request pleroma/pleroma!2580
 2020-05-27 14:17:12 +00:00
rinpatch
91f73a7592 Merge branch 'notification-fixes' into 'develop' 
Notification performance fixes

See merge request pleroma/pleroma!2595
 2020-05-27 13:45:14 +00:00
lain
73f222d76a Migrations: Make user_id index on notifications better for query. 2020-05-27 12:56:15 +02:00