Haelwenn
28da36975d
Merge branch 'bugfix/instance-gen_exiftool' into 'develop'
pleroma.instance: Fix Exiftool module name
See merge request pleroma/pleroma!3143
hace 3 años
Haelwenn (lanodan) Monnier
e2f573d68b
pleroma.instance: Fix Exiftool module name
hace 3 años
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
hace 3 años
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)
hace 3 años
lain
0597571fca
Merge branch 'docs/otp-tuning' into 'develop'
First draft of tips for optimizing BEAM
See merge request pleroma/pleroma!3123
hace 3 años
rinpatch
157e32a39c
Merge branch 'fix/oban-in-database-config' into 'develop'
remove PurgeExpiredActivity from Oban db config
See merge request pleroma/pleroma!3137
hace 3 años
Alexander Strizhakov
10528344c7
remove PurgeExpiredActivity from Oban db config
hace 3 años
feld
74179e6ac3
Merge branch 'majic-dep' into 'develop'
Install file-dev in Dockerfile build stage
See merge request pleroma/pleroma!3135
hace 3 años
Michael Walker
c09813193a
Install file-dev in Dockerfile build stage
This is required by the majic, added in #2534 .
hace 3 años
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
hace 3 años
Haelwenn
99bc175f02
Merge branch 'title-injection-change' into 'develop'
Title injection change
See merge request pleroma/pleroma!3132
hace 3 años
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
hace 3 años
Mark Felder
966663c3f8
Fix tests for other attachment types
hace 3 años
Mark Felder
2156de2fee
Ingest blurhash field during transmogrification
hace 3 años
Mark Felder
2254e5e595
Render blurhashes in Mastodon API
hace 3 años
Mark Felder
6fd72e9e85
Ingest blurhash for attachments if they were federated
hace 3 años
lain
b0e4e0cf2a
Changelog: Add info about title injection
hace 3 años
lain
25bd64b03a
Bundled FE: Remove title tag
hace 3 años
feld
911fc3c523
Merge branch 'mrf-config-descriptions' into 'develop'
little changes for MRF config descriptions
See merge request pleroma/pleroma!3131
hace 3 años
lain
631def2df2
RedirectController: Don't replace title, but inject into the meta
hace 3 años
Alexander Strizhakov
8da9f919f8
little changes for MRF config descriptions
- log level reduction, if policy doesn't implement config_description method
- docs in dev.md
hace 3 años
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
hace 3 años
Alexander Strizhakov
f97f24b067
making credo happy and test fix
hace 3 años
Alexander Strizhakov
efc27f6464
fix for adminFE
- revert UserAllowPolicy description
- MRF descriptions order
hace 3 años
feld
7681b4c5cd
Apply 1 suggestion(s) to 1 file(s)
hace 3 años
feld
776067a9a3
Apply 1 suggestion(s) to 1 file(s)
hace 3 años
feld
952a8c213e
Apply 1 suggestion(s) to 1 file(s)
hace 3 años
feld
2933658446
Apply 1 suggestion(s) to 1 file(s)
hace 3 años
Alexander Strizhakov
485697d96c
config descriptions for custom MRF policies
hace 3 años
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
hace 3 años
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
hace 3 años
lain
4a3d1e78f6
Merge branch 'fix/2291-atom-feed-escape' into 'develop'
Escaping in xml templates
Closes #2291
See merge request pleroma/pleroma!3126
hace 3 años
Alexander Strizhakov
0c68b9ac13
escaping summary and other fields in xml templates
hace 3 años
Haelwenn
db07b538a5
Merge branch 'remove/release-env' into 'develop'
Remove release_env
See merge request pleroma/pleroma!3124
hace 3 años
Sean King
e4a21084f0
Fix title on load of Pleroma HTML
hace 3 años
lain
abf2ec2bbe
Update optimizing_beam.md
hace 3 años
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.
hace 3 años
Mark Felder
a9c1f83fd8
Markdown, you're drunk
hace 3 años
Mark Felder
4999549191
Make it clearer the settings go into the vm.args file
hace 3 años
Mark Felder
620f1d7237
More grammar fixes
hace 3 años
Mark Felder
da1862e1d3
Less confusing I hope
hace 3 años
Mark Felder
9e90e49ad2
Grammar
hace 3 años
Mark Felder
60fe4a8393
First draft of tips for optimizing BEAM
hace 3 años
lain
294628d981
Merge branch 'feature/expire-mutes' into 'develop'
Expiring mutes for users and activities
Closes #1817
See merge request pleroma/pleroma!2971
hace 3 años
lain
9b2ed14277
Docs: Add info about expiring mutes.
hace 3 años
lain
4e7418d963
Merge branch 'stats-genserver-fix' into 'develop'
don't run Stats GenServer updates in tests
See merge request pleroma/pleroma!2976
hace 3 años
lain
5ddf0be208
Changelog: Add info about admin email user link changes.
hace 3 años
lain
6d850c46dc
AdminEmail: Use AP id as user url.
hace 3 años
lain
d8d4e96230
Merge branch 'default-mrf' into 'develop'
Add TagPolicy as default MRF
See merge request pleroma/pleroma!2834
hace 3 años
lain
7bbc328d66
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into stats-genserver-fix
hace 3 años