38 Commits (5de65ce3e89ba2f229170ed18933c99e5caa8dff)

Author	SHA1	Message	Date
feld	0ddf492c5d	Merge branch 'cycles-base-url' into 'develop' ... Deprecate Pleroma.Web.base_url/0 See merge request pleroma/pleroma!3432	3 years ago
Haelwenn	c4b4258374	Merge branch 'features/validators-note' into 'develop' ... Pipeline Ingestion: Note Closes #290 See merge request pleroma/pleroma!2984	3 years ago
Alex Gleason	f2134e605b	Merge remote-tracking branch 'pleroma/develop' into cycles-base-url	3 years ago
Alex Gleason	51a9f97e87	Deprecate Pleroma.Web.base_url/0 ... Use Pleroma.Web.Endpoint.url/0 directly instead. Reduces compiler cycles.	3 years ago
Alex Gleason	52fc59f125	Merge remote-tracking branch 'upstream/develop' into earmark	3 years ago
Haelwenn (lanodan) Monnier	5ef4659b37	test/pleroma/web/common_api_test.exs: Strip : around emoji key-name	4 years ago
Alexander Strizhakov	3ec1dbd922	Let pins federate ... - save object ids on pin, instead of activity ids - pins federation - removed pinned_activities field from the users table - activityPub endpoint for user pins - pulling remote users pins	4 years ago
rinpatch	d3660b24d3	Copy emoji in the subject from parent post ... Sometimes people put emoji in the subject, which results in the subject looking broken if someone replies to it from a server that does not have the said emoji under the same shortcode. This patch solves the problem by extending the emoji set available in the summary to that of the parent post.	4 years ago
Ivan Tashkinov	1b49b8efe5	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework ... # Conflicts: # CHANGELOG.md	4 years ago
Mark Felder	e854c35e65	Convert tests to all use clear_config instead of Pleroma.Config.put	4 years ago
Ivan Tashkinov	694d98be55	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework	4 years ago
Mark Felder	537ba1c5e0	Merge branch 'develop' into refactor/deactivated_user_field	4 years ago
Ivan Tashkinov	2634a16b4c	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework ... # Conflicts: # CHANGELOG.md	4 years ago
Egor Kislitsyn	51d5951c02	Test that only author can reblog a private status	4 years ago
Egor Kislitsyn	1b79dce7bc	Fix Reblog API ... Do not set visibility parameter to `public` by default and let CommonAPI to infer it from status.	4 years ago
Mark Felder	860b5c7804	Change user.deactivated field to user.is_active	4 years ago
Ivan Tashkinov	e350898828	Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework	4 years ago
Haelwenn (lanodan) Monnier	c4439c630f	Bump Copyright to 2021 ... grep -rl '# Copyright © .* Pleroma' * | xargs sed -i 's;Copyright © .* Pleroma .*;Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>;'	4 years ago
lain	cf0eb0c1c5	Merge branch 'object-normalize-refactor' into 'develop' ... Object: Rework how Object.normalize works See merge request pleroma/pleroma!3229	4 years ago
Roger Braun	48cd336a72	allow external emoji	4 years ago
lain	e1e7e4d379	Object: Rework how Object.normalize works ... Now it defaults to not fetching, and the option is named.	4 years ago
Haelwenn	3966add048	Revert "Merge branch 'features/hashtag-column' into 'develop'" ... This reverts merge request !2824	4 years ago
Haelwenn (lanodan) Monnier	acb03d591b	Insert text representation of hashtags into object["hashtags"] ... Includes a new mix task: pleroma.database fill_old_hashtags	4 years ago
Ivan Tashkinov	ee221277b0	Encapsulation of tags / hashtags fetching from objects.	4 years ago
Alex Gleason	f8c93246d6	Refactor Earmark code, fix tests	4 years ago
lain	fec1ed802e	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope	4 years ago
Egor Kislitsyn	0118ccb53c	Add `local` visibility	4 years ago
lain	dd2b3a8da9	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/expire-mutes	4 years ago
minibikini	1bfd8528bb	Merge branch 'develop' into 'feature/local-only-scope' ... # Conflicts: # CHANGELOG.md	4 years ago
feld	d6907e6e0c	Merge branch 'chore/elixir-1.11' into 'develop' ... Elixir 1.11 compatibility / Phoenix 1.5+ See merge request pleroma/pleroma!3059	4 years ago
lain	8d251096fe	SideEffects: Correctly handle chat messages sent to yourself	4 years ago
Ivan Tashkinov	9ea31b373f	Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11	4 years ago
Egor Kislitsyn	4f79bbbc31	Add local-only statuses	4 years ago
Egor Kislitsyn	3985c1b450	Fix warnings	4 years ago
feld	2013705690	Merge branch 'feature/gen-magic' into 'develop' ... Use libmagic via majic Closes #1736 See merge request pleroma/pleroma!2534	4 years ago
Mark Felder	40f3cdc030	JPEG content_type must be image/jpeg	4 years ago
Mark Felder	409f694e4f	Merge branch 'develop' into refactor/locked_user_field	4 years ago
Alexander Strizhakov	7dffaef479	tests consistency	4 years ago