pleroma

Commit Graph

Author	SHA1	Message	Date
lain	088f378408	Custom Emoji docs: Make it clear that config.exs is not for lewd.	5 years ago
lain	4fecd6f9a7	Config.exs: Add big warning so that nobody ever edits it.	5 years ago
lambda	56956de6fa	Merge branch 'fix/status-reblogged' into 'develop' Assign reblogged in the Mastodon reblog status view Closes #812 See merge request pleroma/pleroma!1057	5 years ago
lambda	f358295cbe	Merge branch 'unfollow-oneself' into 'develop' Consistent response for self follow/unfollow Closes #819 See merge request pleroma/pleroma!1061	5 years ago
lambda	f896699357	Merge branch 'refactor/remove-inReplyToStatusId' into 'develop' Remove inReplyToStatusId See merge request pleroma/pleroma!1062	5 years ago
eugenijm	27d78dc526	Use User.get_cached_by*	5 years ago
rinpatch	fd2e31af86	oops	5 years ago
rinpatch	5d73dca064	Remove inReplyToStatusId	5 years ago
eugenijm	507e7821e3	Handle follow/unfollow directed to themselves	5 years ago
rinpatch	8c6d5a6b4d	Merge branch 'bugfix/registration-email-pattern' into 'develop' fix pattern match on user registration See merge request pleroma/pleroma!1058	5 years ago
Sadposter	e513504e88	Revert "Assert on the success of enqueue before returning" This reverts commit `16d8c8b33b`. Because it breaks everything	5 years ago
Sadposter	16d8c8b33b	Assert on the success of enqueue before returning	5 years ago
Sadposter	5e45557751	Always return {atom, _} from try_send_confirmation	5 years ago
Sadposter	ec42b639a3	fix pattern match on user registration deliver_async will return a single atom	5 years ago
eugenijm	679a8ef629	Assign reblogged in the Mastodon reblog status view	5 years ago
kaniini	7304e0ce18	Merge branch 'docs/archlinux-odbc' into 'develop' docs/installation/arch_linux_en.md: Remove useless ODBC See merge request pleroma/pleroma!1055	5 years ago
Haelwenn (lanodan) Monnier	48982169dc	docs/installation/arch_linux_en.md: Remove useless ODBC See [1] for confirmation. 1: https://git.pleroma.social/pleroma/pleroma/merge_requests/1050#note_24402	5 years ago
Haelwenn	050339c223	Merge branch 'docs/changelog' into 'develop' Add a changelog See merge request pleroma/pleroma!1053	5 years ago
rinpatch	3018d81d87	Put an actual description of the vulnerability and add Breaking: to breaking changes	5 years ago
Alex S	c5d0fffeaf	naming fix	5 years ago
Alex S	c349573791	Merge develop to 788-separate-email-addresses Merge conflicts: test/web/twitter_api/twitter_api_test.exs test/web/twitter_api/twitter_api_controller_test.exs test/web/admin_api/admin_api_controller_test.exs	5 years ago
Alex S	a64eb2b389	fallback to the old behaviour admin and user mailers	5 years ago
rinpatch	3a805cc35c	Add a changelog	5 years ago
Haelwenn	334b2d78dc	Merge branch 'improve-formatter' into 'develop' Improve formatter and update `auto_linker` Closes #795 See merge request pleroma/pleroma!1036	5 years ago
Egor	f9af90c5aa	Revert "simplify mentions escape" This reverts commit `f3e06a1030`.	5 years ago
lambda	184ae60b21	Merge branch 'bugfix/pleroma-email-naming' into 'develop' Make the filename and module name of Pleroma.Emails.* orthogonal See merge request pleroma/pleroma!1029	5 years ago
lambda	0a09692c7d	Merge branch 'features/mastoapi/2.6.0-min_id-pagination' into 'develop' Features: mastoapi-2.6.0 `min_id` pagination Closes #351 See merge request pleroma/pleroma!976	5 years ago
lambda	57d5ff57d6	Merge branch 'fix/732-password-align' into 'develop' password reset page labels align See merge request pleroma/pleroma!986	5 years ago
lambda	1b4c4d29a3	Merge branch 'ssl_trusted_cert' into 'develop' ssl_trusted_certificate should point to chain.pem if we're demonstrating... See merge request pleroma/pleroma!996	5 years ago
kaniini	30a4318ef1	Merge branch 'feature/801-add-support-destroy-multiple-mastofe' into 'develop' adding destroy multiple for mastofe See merge request pleroma/pleroma!1046	5 years ago
Alexander Strizhakov	711ade961e	adding destroy multiple for mastofe	5 years ago
kaniini	9825a94391	Merge branch 'bug/790-repeated-posts-that-are-replies-have-in-reply-to-id-null' into 'develop' in_reply_to_id - null See merge request pleroma/pleroma!1037	5 years ago
Alexander Strizhakov	e03d24af96	in_reply_to_id - null	5 years ago
kaniini	31c06dba5a	Merge branch 'fix/hackney_max_body_param' into 'develop' Add `with_body: true` to requests relying on `max_body: val` Closes #778 See merge request pleroma/pleroma!1049	5 years ago
Roman Chvanikov	4615e56219	Add `with_body: true` to requests relying on `max_body: val`	5 years ago
lambda	42d2c8d95b	Merge branch 'update-mastofe/glitch-soc-2019-04-11' into 'develop' Update Mastodon Frontend to 2019-04-11 bundle See merge request pleroma/pleroma!1044	5 years ago
Haelwenn (lanodan) Monnier	51c97d71af	Update Mastodon Frontend to 2019-04-11 bundle See: https://git.pleroma.social/pleroma/mastofe/tags/bundle-2019-04-11 [ci skip]	5 years ago
Ivan Tashkinov	c3f12cf3c3	[#923 ] OAuth consumer params handling refactoring. Registration and authorization-related params are wrapped in "authorization" in order to reduce edge cases number and simplify handling logic.	5 years ago
Alex S	fe511a6c65	Merge branch 'develop' into feature/788-separate-email-addresses	5 years ago
Alex S	fe13a1d78c	adding notify_email setting for trigger emails	5 years ago
lambda	e5d553aa45	Merge branch 'feature/767-multiple-use-invite-token' into 'develop' Feature/767 multiple use invite token See merge request pleroma/pleroma!1032	5 years ago
lambda	6504b43f96	Merge branch 'feature/user-status-subscriptions' into 'develop' Add ability to subscribe to users See merge request pleroma/pleroma!1024	5 years ago
Sadposter	be8350baa2	Merge branch 'develop' into feature/user-status-subscriptions	5 years ago
lambda	c8440b5e0c	Merge branch 'fix/emoji-api-nonsense' into 'develop' Change response format of /api/pleroma/emoji so it makes sense See merge request pleroma/pleroma!1038	5 years ago
Haelwenn (lanodan) Monnier	9c1b36856b	s/Pleroma.UserEmail/Pleroma.Emails.UserEmail/	5 years ago
Haelwenn (lanodan) Monnier	cae0231731	s/Pleroma.AdminEmail/Pleroma.Emails.AdminEmail/	5 years ago
Haelwenn (lanodan) Monnier	1791ee8ec4	s/Pleroma.Mailer/Pleroma.Emails.Mailer/	5 years ago
kaniini	0ab563d334	Merge branch 'hotfix/fix_undefined_summary' into 'develop' transmogrifier.ex: Add fix_summary/1 See merge request pleroma/pleroma!1039	5 years ago
kaniini	97395e013e	Merge branch 'notification-pleroma-settings' into 'develop' Notification controls Closes #738 See merge request pleroma/pleroma!988	5 years ago
Haelwenn (lanodan) Monnier	cf9ba8fe1b	transmogrifier.ex: Add fix_summary/1 MRF.KeywordPolicy assumes that summary is present in a activity, and this would probably simplify code elsewhere too anyway.	5 years ago

1 2 3 4 5 ...

4780 Commits (f4c9b79306c6003815ef80a9c13a361bf92e0de9) All Branches Search

4780 Commits (f4c9b79306c6003815ef80a9c13a361bf92e0de9)

All Branches