12328 Commits (28da36975dc325bb577ee81fb791fbdc7ec3e7e2)

 

All Branches   

Search

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