12315 Commits (25eb222bed8c55a81e1ee4c17e05834d0b894030)

 

All Branches   

Search

Author	SHA1	Message	Date
Maksim	25eb222bed	Apply 1 suggestion(s) to 1 file(s)	4 years ago
Maksim Pechnikov	e4b202d905	added test	4 years ago
Maksim Pechnikov	e1d25bad0c	fix tests	4 years ago
Maksim Pechnikov	36ec604521	added test	4 years ago
Maksim Pechnikov	1830b6aae5	added error messages for posix error code	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
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
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
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
lain	dd2b3a8da9	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/expire-mutes	4 years ago
lain	78cea44553	Merge branch 'ejabberd-pleroma-auth' into 'develop' ... Add ejabberd auth document See merge request pleroma/pleroma!3074	4 years ago
lain	4800ee656b	Merge branch 'features/federation-status' into 'develop' ... Add a federation_status endpoint showing unreachable instances See merge request pleroma/pleroma!3086	4 years ago
lain	5db4c823b2	Merge branch 'restrict-domain' into 'develop' ... View a remote server's timeline See merge request pleroma/pleroma!2713	4 years ago
Haelwenn	9c09ea01aa	Merge branch '2284-voters-count' into 'develop' ... Always return voters_count in polls See merge request pleroma/pleroma!3120	4 years ago
lain	eb1e1e7494	Changelog: Add info about federation status endpoint	4 years ago
lain	504a829edb	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/federation-status	4 years ago
lain	cb3cd3a761	TopicsTest: Small addition.	4 years ago
lain	329aa19c9f	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-restrict-domain	4 years ago
lain	bc4d9c4ffc	Merge branch 'hide-muted-chats' into 'develop' ... Hide chats from muted users Closes #2230 See merge request pleroma/pleroma!3116	4 years ago
Egor Kislitsyn	ca95cbe0b4	Add `with_muted` param to ChatController.index/2	4 years ago
lain	92d252f364	Poll Schema: Update and fix.	4 years ago
lain	f09bb814a9	Changelog: Add info about poll view changes	4 years ago