1216 Commits (v2.5.2-6)

Author	SHA1	Message	Date
FloatingGhost	f15c9e8b08	format everything	2 years ago
FloatingGhost	5b11543c96	update pleroma-fe url	2 years ago
FloatingGhost	abefbcec64	Merge branch 'mfm' into develop	2 years ago
FloatingGhost	4fb2251221	Allow authoring MFM	2 years ago
sn0w	60bfaed368	Allow reacting with emojis containing a number	2 years ago
FloatingGhost	32fbd2e4e3	fix all tests	2 years ago
FloatingGhost	142646426e	fix emoji tests	2 years ago
FloatingGhost	0f6bece60d	Merge remote-tracking branch 'origin/patch/readd-mastofe' into develop	3 years ago
FloatingGhost	0d012ebea1	Revert "Merge branch 'remove/mastofe' into 'develop'" ... This reverts commit 6b3842cf50, reversing changes made to 6b1282a829.	3 years ago
FloatingGhost	12a171844b	Merge remote-tracking branch 'upstream/develop' into develop	3 years ago
Alex Gleason	a659428024	Merge branch 'restricted-moderators' into 'develop' ... AdminAPI: Optionally restrict moderators from accessing sensitive data See merge request pleroma/pleroma!3578	3 years ago
Alex Gleason	6e27fc9c12	Merge branch 'log-slow-queries' into 'develop' ... Log slow Ecto queries See merge request pleroma/pleroma!3553	3 years ago
Ivan Tashkinov	08c0f09bad	Made slow queries logging disabled by default.	3 years ago
Alibek Omarov	f02715c4b2	Fix lint errors	3 years ago
Alibek Omarov	cd1041c3a4	API: optionally restrict moderators from accessing sensitive data	3 years ago
Ivan Tashkinov	3e9e7178bc	Configurability of slow queries logging ([:pleroma, :telemetry, :slow_queries_logging]). Adjusted log messages truncation to 65 kb (was default: 8 kb). Non-truncated logging of slow query params.	3 years ago
marcin mikołajczak	de006443f0	MastoAPI: Profile directory	3 years ago
Alex Gleason	e1b89fe3aa	Merge remote-tracking branch 'origin/develop' into live-dashboard	3 years ago
Alex Gleason	29d80b39f2	Add Phoenix LiveDashboard ... Co-authored-by: Egor Kislitsyn <egor@kislitsyn.com>	3 years ago
FloatingGhost	de60b1f3c1	make search provider configurable	3 years ago
FloatingGhost	449d8ff165	integrate search endpoint with ES	3 years ago
Alex Gleason	2ac3d341b0	Fix benchmarks	3 years ago
lain	613f55b078	Merge branch 'benchmark' into 'develop' ... Fix benchmarks See merge request pleroma/pleroma!3551	3 years ago
Alex Gleason	ce4560c2a1	Fix benchmarks	3 years ago
sadposter	a61207cf8f	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	3 years ago
lain	e2772d6bf1	Merge branch 'block-behavior' into 'develop' ... Configurable block visibility, fixes #2123 Closes #2123 See merge request pleroma/pleroma!3242	3 years ago
sadposter	bd9c9136f9	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	3 years ago
sadposter	1aab9b94b1	fix config	3 years ago
Haelwenn	6b3842cf50	Merge branch 'remove/mastofe' into 'develop' ... Remove MastoFE from Pleroma, fixes #2625 Closes #2625 See merge request pleroma/pleroma!3392	3 years ago
sadposter	b202cf15d6	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	3 years ago
rinpatch	21720db859	Merge branch 'dkuku-develop-patch-66061' into 'develop' ... Update dev.exs error message to write to stderr. See merge request pleroma/pleroma!3492	3 years ago
Haelwenn	901204df22	Merge branch 'poll-notification' into 'develop' ... MastodonAPI: Support poll notification See merge request pleroma/pleroma!3484	3 years ago
Sean King	1841bd8383	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remove/mastofe	3 years ago
Ilja	ee26f2c91b	Quarantine placeholders ... * kePlaceholder and valuePlaceholder of quarantined_instances where in wrong case, should be snake_case * The mrf simple and transparency exclusion were already OK	3 years ago
Ilja	f4028c908c	Add key- and valuePlaceholders for quarantined_instances and mrf_simple ... * I also added for keywordpolicy as well now. It was done in the admin-fe, but is better to be done here * I also added comments to explain why we did the _info keys (backwards compatibility)	3 years ago
Ilja	64002e92ad	config/description.exs: Update quarantine settings to tuples	3 years ago
sadposter	2519d4eb1a	Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop	3 years ago
Daniel	5c5571c668	use puts instead warn	3 years ago
Daniel	69ebfb29fb	Update dev.exs error message to write to stderr. Currently it dumps this message at the beginnig of the file when using vim-autoformat with mix format	3 years ago
Alex Gleason	33a19c002a	Merge remote-tracking branch 'pleroma/develop' into errorview-json-fix	3 years ago
Alex Gleason	94db0b7cd6	Add activity+json to Phoenix :format_encoders ... Fixes ErrorView rendering	3 years ago
Alex Gleason	62bf6d67e3	Merge remote-tracking branch 'pleroma/develop' into poll-notification-fixes	3 years ago
Alex Gleason	0114754db2	MastodonAPI: Support poll notification	3 years ago
sadposter	e56c319e8f	merge	3 years ago
Sean King	dc4814f0cd	Fix merge conflicts with upstream	3 years ago
Haelwenn	a5dce42c85	Merge branch 'chore/rename-chat' into 'develop' ... Rename the non-federating Chat feature to Shout See merge request pleroma/pleroma!2842	3 years ago
Mark Felder	679d4c23e9	Update wording for relays in docs and config description	3 years ago
Mark Felder	297feb73f4	Formatting	3 years ago
Mark Felder	dcf84ac12e	disableChat / disableShout didn't actually do anything for PleromaFE	3 years ago
Mark Felder	8ff2d8d17d	Update description file for new shout config setting location	3 years ago