alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
12,329 Commits 1 Branch 0 Tags 177 MiB
Commit Graph

12329 Commits

Author SHA1 Message Date
Haelwenn (lanodan) Monnier 3f69680ed9
mix.exs: Update tesla to 1.4.0 2020-11-17 13:09:56 +01:00
Haelwenn 28da36975d Merge branch 'bugfix/instance-gen_exiftool' into 'develop' 
pleroma.instance: Fix Exiftool module name

See merge request pleroma/pleroma!3143
 2020-11-14 21:43:07 +00:00
Haelwenn (lanodan) Monnier e2f573d68b
pleroma.instance: Fix Exiftool module name 2020-11-14 22:31:01 +01:00
lain 0d149502fe Merge branch 'fixes_2034_reports_should_send_a_notification_to_admins' into 'develop' 
fixes 2034 Make notifs view work for reports

Closes #2034

See merge request pleroma/pleroma!2912
 2020-11-13 13:35:47 +00:00
Ilja 70e4b86250 Make notifs view work for reports 
* These are the first small steps for issue 2034 "Reports should send a notification to admins".
* I added a new type of notification "pleroma:report" to the the database manually (a migration will need to be written later)
* I added the new type to the notification_controller
* I made the view return the notification. It doesn't include the report itself (yet)
 2020-11-13 13:35:46 +00:00
lain 0597571fca Merge branch 'docs/otp-tuning' into 'develop' 
First draft of tips for optimizing BEAM

See merge request pleroma/pleroma!3123
 2020-11-13 13:31:46 +00:00
rinpatch 157e32a39c Merge branch 'fix/oban-in-database-config' into 'develop' 
remove PurgeExpiredActivity from Oban db config

See merge request pleroma/pleroma!3137
 2020-11-13 10:32:16 +00:00
Alexander Strizhakov 10528344c7
remove PurgeExpiredActivity from Oban db config 2020-11-13 09:07:08 +03:00
feld 74179e6ac3 Merge branch 'majic-dep' into 'develop' 
Install file-dev in Dockerfile build stage

See merge request pleroma/pleroma!3135
 2020-11-12 22:41:00 +00:00
Michael Walker c09813193a Install file-dev in Dockerfile build stage 
This is required by the majic, added in #2534.
 2020-11-12 22:20:17 +00:00
rinpatch 6ca709816f Fix object spoofing vulnerability in attachments 
Validate the content-type of the response when fetching an object,
according to https://www.w3.org/TR/activitypub/#x3-2-retrieving-objects.

content-type headers had to be added to many mocks in order to support
this, some of this was done with a regex. While I did go over the
resulting files to check I didn't modify anything unrelated, there is a
 possibility I missed something.

Closes pleroma#1948
 2020-11-12 15:25:33 +03:00
Haelwenn 99bc175f02 Merge branch 'title-injection-change' into 'develop' 
Title injection change

See merge request pleroma/pleroma!3132
 2020-11-12 08:50:26 +00:00
feld ccec59047b Merge branch 'feature/ingest-blurhash' into 'develop' 
Ingest blurhash for attachments if they were federated

Closes #2294

See merge request pleroma/pleroma!3133
 2020-11-11 22:37:16 +00:00
Mark Felder 966663c3f8 Fix tests for other attachment types 2020-11-11 16:17:35 -06:00
Mark Felder 2156de2fee Ingest blurhash field during transmogrification 2020-11-11 13:39:02 -06:00
Mark Felder 2254e5e595 Render blurhashes in Mastodon API 2020-11-11 12:51:13 -06:00
Mark Felder 6fd72e9e85 Ingest blurhash for attachments if they were federated 2020-11-11 12:27:51 -06:00
lain b0e4e0cf2a Changelog: Add info about title injection 2020-11-11 17:19:09 +01:00
lain 25bd64b03a Bundled FE: Remove title tag 2020-11-11 17:17:41 +01:00
feld 911fc3c523 Merge branch 'mrf-config-descriptions' into 'develop' 
little changes for MRF config descriptions

See merge request pleroma/pleroma!3131
 2020-11-11 16:15:57 +00:00
lain 631def2df2 RedirectController: Don't replace title, but inject into the meta 2020-11-11 17:10:59 +01:00
Alexander Strizhakov 8da9f919f8
little changes for MRF config descriptions 
- log level reduction, if policy doesn't implement config_description method
- docs in dev.md
 2020-11-11 18:49:15 +03:00
feld 3cd7ea693f Merge branch 'feature/2222-config-descriptions-for-custom-modules' into 'develop' 
Config descriptions for custom MRF policies

Closes #2222

See merge request pleroma/pleroma!3128
 2020-11-11 13:48:03 +00:00
Alexander Strizhakov f97f24b067
making credo happy and test fix 2020-11-11 10:48:03 +03:00
Alexander Strizhakov efc27f6464
fix for adminFE 
- revert UserAllowPolicy description
- MRF descriptions order
 2020-11-11 10:10:57 +03:00
feld 7681b4c5cd Apply 1 suggestion(s) to 1 file(s) 2020-11-10 16:44:23 +00:00
feld 776067a9a3 Apply 1 suggestion(s) to 1 file(s) 2020-11-10 16:44:17 +00:00
feld 952a8c213e Apply 1 suggestion(s) to 1 file(s) 2020-11-10 16:44:08 +00:00
feld 2933658446 Apply 1 suggestion(s) to 1 file(s) 2020-11-10 16:44:00 +00:00
Alexander Strizhakov 485697d96c
config descriptions for custom MRF policies 2020-11-10 19:20:14 +03:00
lain 88f6b61a5e Merge branch '2260-wrong-report-link' into 'develop' 
Resolve "Wrong user link in Report email"

Closes #2260

See merge request pleroma/pleroma!3121
 2020-11-10 11:04:19 +00:00
lain d77fd6b3d0 Merge branch 'fix/html-title-load' into 'develop' 
Fix title on load of Pleroma HTML, fixes #2281

Closes #2281

See merge request pleroma/pleroma!3125
 2020-11-10 10:05:15 +00:00
lain 4a3d1e78f6 Merge branch 'fix/2291-atom-feed-escape' into 'develop' 
Escaping in xml templates

Closes #2291

See merge request pleroma/pleroma!3126
 2020-11-10 09:34:13 +00:00
Alexander Strizhakov 0c68b9ac13
escaping summary and other fields in xml templates 2020-11-10 10:46:57 +03:00
Haelwenn db07b538a5 Merge branch 'remove/release-env' into 'develop' 
Remove release_env

See merge request pleroma/pleroma!3124
 2020-11-09 09:14:41 +00:00
Sean King e4a21084f0 Fix title on load of Pleroma HTML 2020-11-08 16:16:20 -07:00
lain abf2ec2bbe Update optimizing_beam.md 2020-11-08 09:45:35 +00:00
rinpatch cc45c69fff Remove release_env 
While taking a final look at instance.gen before releasing I noticed
that the release_env task outputs messages in broken english. Upon
further inspection it seems to have even more severe issues which, in
my opinion, warrant it's at least temporary removal:
- We do not explain what it actually does, anywhere. Neither the task
 docs nor instance.gen, nor installation instructions.
- It does not respect FHS on OTP releases (uses /opt/pleroma/config even
 though we store the config in /etc/pleroma/config.exs).
- It doesn't work on OTP releases, which is the main reason it exists.
Neither systemd nor openrc service files for OTP include it.
- It is not mentioned in install guides other than the ones for Debian
and OTP releases.
 2020-11-08 11:56:09 +03:00
Mark Felder a9c1f83fd8 Markdown, you're drunk 2020-11-06 13:16:22 -06:00
Mark Felder 4999549191 Make it clearer the settings go into the vm.args file 2020-11-06 13:15:21 -06:00
Mark Felder 620f1d7237 More grammar fixes 2020-11-06 13:12:13 -06:00
Mark Felder da1862e1d3 Less confusing I hope 2020-11-06 13:04:13 -06:00
Mark Felder 9e90e49ad2 Grammar 2020-11-06 13:02:07 -06:00
Mark Felder 60fe4a8393 First draft of tips for optimizing BEAM 2020-11-06 13:00:31 -06:00
lain 294628d981 Merge branch 'feature/expire-mutes' into 'develop' 
Expiring mutes for users and activities

Closes #1817

See merge request pleroma/pleroma!2971
 2020-11-05 12:44:16 +00:00
lain 9b2ed14277 Docs: Add info about expiring mutes. 2020-11-05 13:23:58 +01:00
lain 4e7418d963 Merge branch 'stats-genserver-fix' into 'develop' 
don't run  Stats GenServer updates in tests

See merge request pleroma/pleroma!2976
 2020-11-04 16:15:04 +00:00
lain 5ddf0be208 Changelog: Add info about admin email user link changes. 2020-11-04 17:13:34 +01:00
lain 6d850c46dc AdminEmail: Use AP id as user url. 2020-11-04 17:12:47 +01:00
lain d8d4e96230 Merge branch 'default-mrf' into 'develop' 
Add TagPolicy as default MRF

See merge request pleroma/pleroma!2834
 2020-11-04 15:54:12 +00:00