423 Commits (e1370ba1316734f61d8326200df1cb0789a4686f)

Author	SHA1	Message	Date
lain	8b9a0dd4a7	User: Don't error out when following a user that's already followed. ... This leads to a few situations where it is impossible to follow a user.	5 years ago
Maksim Pechnikov	4f2e359687	Merge branch 'develop' into issue/941	5 years ago
Maksim Pechnikov	64ada7f960	fix tests	5 years ago
Maksim Pechnikov	f13d6c7f78	update api to set skip_thread_containment	5 years ago
kaniini	5402d04e3c	Merge branch 'feature/notification-control-part-2' into 'develop' ... notification controls, part 2 See merge request pleroma/pleroma!1204	5 years ago
Egor Kislitsyn	99f70c7e20	Use Pleroma.Config everywhere	5 years ago
William Pitcock	45e4642a58	tests: chase remote/local removal	5 years ago
William Pitcock	59a703fcbe	twitter api: user view: expose user notification settings under pleroma object	5 years ago
William Pitcock	1542cccbbc	tests: chase notification setting changes	5 years ago
Sachin Joshi	ee22fff5ac	remove deprecated PleromaFE configuration	5 years ago
Egor Kislitsyn	5e2b491276	Merge remote-tracking branch 'pleroma/develop' into feature/disable-account	5 years ago
Alexander Strizhakov	a2be420f94	differences_in_mastoapi_responses.md: fullname & bio are optionnal ... [ci skip]	5 years ago
Francis Dinh	2a54e8c1f5	Use "repeated" instead of "retweeted" for repeated statuses in Twitter API ... This makes it consistent with the language used in Pleroma FE (at least in English). Resolves https://git.pleroma.social/pleroma/pleroma-fe/issues/533	5 years ago
Egor Kislitsyn	1557b99beb	Merge remote-tracking branch 'pleroma/develop' into feature/disable-account	5 years ago
Haelwenn (lanodan) Monnier	2f76a40d02	formatter.ex: Add get_emoji_map/1	5 years ago
Haelwenn (lanodan) Monnier	85b5c60694	Pleroma.Formatter: width/height to class=emoji	5 years ago
Sachin Joshi	cd6da3606b	Merge branch 'develop' into bugfix/web-notification-special-char	5 years ago
rinpatch	61ca2f7a4e	Fix `rights` in TwitterAPI's user entity being present only for ... Admins/Moderators In !1093 I reused `maybe_with_role` for `rights` object, however I missed that `maybe_with_role` is called only for admins/moderators.	5 years ago
Egor Kislitsyn	c157e27a00	Merge branch 'develop' into feature/disable-account	5 years ago
rinpatch	4baea6e6d9	Fix leaking private configuration parameters in Mastodon and Twitter APIs, and add new configuration parameters to Mastodon API ... This patch: - Fixes `rights` in twitterapi ignoring `show_role` - Fixes exposing default scope of the user to anyone in Mastodon API - Extends Mastodon API to be able to show and set `no_rich_text`, `default_scope`, `hide_follows`, `hide_followers`, `hide_favorites` (requested by the FE in #674) Sorry in advance for 500 line one commit diff, I should have split it up to separate MRs	5 years ago
Sachin Joshi	963d5774af	fix the status notification with special char	5 years ago
Egor	b9cdf6d3b9	Use `User.get_cached*` everywhere	5 years ago
Alexander Strizhakov	88f0be9693	Feature/826 healthcheck endpoint	5 years ago
Egor Kislitsyn	e8c2f9a73a	Merge remote-tracking branch 'pleroma/develop' into feature/disable-account	5 years ago
Ekaterina Vaartis	aef3a3ca46	Fix tests that used finmoji	6 years ago
rinpatch	e7c3c36766	Update functions in object fetcher for tesla and set up a proper mock for tests	6 years ago
rinpatch	627e5a0a49	Merge branch 'develop' into feature/database-compaction	6 years ago
kaniini	73df3046e0	Merge branch 'feature/788-separate-email-addresses' into 'develop' ... Feature/788 separate email addresses Closes #788 See merge request pleroma/pleroma!1040	6 years ago
Normandy	d4a749cfb2	Handle new-style mastodon follow lists ... Fixes https://git.pleroma.social/pleroma/pleroma/issues/814	6 years ago
rinpatch	5d73dca064	Remove inReplyToStatusId	6 years ago
Alex S	c5d0fffeaf	naming fix	6 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	6 years ago
Egor Kislitsyn	d0304b4f92	more tests	6 years ago
Alex S	fe511a6c65	Merge branch 'develop' into feature/788-separate-email-addresses	6 years ago
Alex S	fe13a1d78c	adding notify_email setting for trigger emails	6 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	6 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	6 years ago
Haelwenn (lanodan) Monnier	9c1b36856b	s/Pleroma.UserEmail/Pleroma.Emails.UserEmail/	6 years ago
kaniini	97395e013e	Merge branch 'notification-pleroma-settings' into 'develop' ... Notification controls Closes #738 See merge request pleroma/pleroma!988	6 years ago
rinpatch	b57b43027c	Change response format of /api/pleroma/emoji to the one that actually makes sense	6 years ago
Alex S	fee50636d0	removing not needed invite update	6 years ago
Alex S	012bb5dcc9	renaming expire_at -> expires_at ... keyword style change	6 years ago
Alex S	47b07cec49	token -> invite renaming	6 years ago
Alex S	be54e40890	twitter api registration ... fix for twitter api tests	6 years ago
Alex S	fa8483cb80	Merging develop into feature/770-add-emoji-tags ... Conflict test/web/twitter_api/util_controller_test.exs	6 years ago
lambda	180b87257c	Merge branch 'bugfix/share-mastodon' into 'develop' ... [OStatus] adds status to pleroma instance if the url given is a status See merge request pleroma/pleroma!1002	6 years ago
Alex S	9e0567ec52	Merge develop into feature/770-add-emoji-tags	6 years ago
Egor Kislitsyn	20c619f85f	replace `Repo.get_by(User, nickname: nickname)` with `User.get_by_nickname(nickname)` in tests	6 years ago
Egor Kislitsyn	9a59c26619	replace `Repo.get_by(User, ap_id: ap_id)` with `User.get_by_ap_id(ap_id)`	6 years ago
Egor Kislitsyn	11c2d6bdc4	change `Repo.get(Activity, id)` => `Activity.get_by_id(id)` in tests	6 years ago