83 Commits (44bfb491eae00d541e6d11c8b52b5de5bc0bd34e)

Author	SHA1	Message	Date
lain	349b9d86dc	Merge branch 'remake-remodel-2' into 'develop' ... Ingestion Pipeline Revamp See merge request pleroma/pleroma!2315	5 years ago
Ivan Tashkinov	aa78325117	[#2323] Fixed a typo causing /accounts/relationships to render default relationships. Improved the tests.	5 years ago
feld	ef7d2b0f11	Merge branch 'gun' into 'develop' ... Gun adapter Closes #945 See merge request pleroma/pleroma!1861	5 years ago
Haelwenn (lanodan) Monnier	185520d1b4	Provide known-good user.uri, remove User.profile_url/1	5 years ago
Haelwenn (lanodan) Monnier	b30fb1f3bb	User: Fix use of source_data in profile_url/1	5 years ago
Haelwenn (lanodan) Monnier	2553400a66	Initial failing test statement against funkwhale channels	5 years ago
Alexander Strizhakov	f497cf2f7c	Merge branch 'develop' into gun	5 years ago
Haelwenn	e999c67cee	Merge branch 'feature/funkwhale-audio' into 'develop' ... Add support for funkwhale Audio activity Closes #764 and #1624 See merge request pleroma/pleroma!2287	5 years ago
Ivan Tashkinov	dfbc05d496	Misc refactoring / tweaks (`ThreadMute.exists?/2`).	5 years ago
Ivan Tashkinov	460e41585c	Further preloading (more endpoints), refactoring, tests.	5 years ago
Haelwenn (lanodan) Monnier	15be6ba9c2	AccountView: fix for other forms of <br> in bio ... Closes: https://git.pleroma.social/pleroma/pleroma/issues/1643	5 years ago
lain	1aa8aa7d7f	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-2	5 years ago
lain	3c2c32b460	Merge branch 'remake-remodel' into develop	5 years ago
Alexander Strizhakov	f9ecb513fa	Merge branch 'develop' into gun	5 years ago
Alexander Strizhakov	f3791add99	removing with_move parameter	5 years ago
Haelwenn (lanodan) Monnier	863ec33ba2	Add support for funkwhale Audio activity ... reel2bits fixture not included as it lacks the Actor fixture for it. Closes: https://git.pleroma.social/pleroma/pleroma/issues/1624 Closes: https://git.pleroma.social/pleroma/pleroma/issues/764	5 years ago
Alexander Strizhakov	f0753eed0f	removing try block in tesla request ... added mocks for tests which fail with Tesla.Mock.Error	5 years ago
Mark Felder	05da5f5cca	Update Copyrights	5 years ago
Haelwenn (lanodan) Monnier	6da6540036	Bump copyright years of files changed after 2020-01-07 ... Done via the following command: git diff fcd5dd259a --stat --name-only | xargs sed -i '/Pleroma Authors/c# Copyright © 2017-2020 Pleroma Authors <https:\/\/pleroma.social\/>'	5 years ago
Haelwenn (lanodan) Monnier	1257331291	MastodonAPI.StatusView: Do not use site_name ... site_name allow to spoof the origin of the domain and so hacks like: <!-- served on https://hacktivis.me/tmp/joinmastodon.org.html --> <meta property="og:image" content="https://hacktivis.me/datalove/img/meme/pleroma/mastodon%2C%20forbidden%20amuse%20yourself.jpeg" /> <meta property="og:title" content="Mastodon: Forbidden Amuse Yourself" /> <meta property="og:site_name" content="joinmastodon.org" /> <meta http-equiv="refresh" content="0; url=http://joinmastodon.org/">	5 years ago
Lain Soykaf	f875b9650a	EmojiReactions: Add Mastodon-aligned reaction endpoints, change response	5 years ago
Lain Soykaf	8a79f20c21	EmojiReactions: Rename to EmojiReacts	5 years ago
feld	df0b00b32d	Merge branch 'mastoapi-non-html-strings' into 'develop' ... mastodon API: do not sanitize html in non-html fields See merge request pleroma/pleroma!2167	5 years ago
rinpatch	983a87175e	mastodon API: do not sanitize html in non-html fields	5 years ago
lain	a802e07241	Emoji Reactions: Add `reacted` field to emoji reactions	5 years ago
lain	347f3ed2c6	Emoji reactions: Change api format once more	5 years ago
lain	615b72238e	Notifications: Add emoji reaction notifications	5 years ago
lain	dd3fc50ea4	Emoji reactions: Change cache and reply format	5 years ago
lain	4c5b5f14dc	StatusView: Add `emoji_reactions`	5 years ago
Thomas Citharel	d2f1c4f658	Add ActivityPub Object Event type support ... Adds Event support in the same way Video objects are handled, with the name of the object as message header. Signed-off-by: Thomas Citharel <tcit@tcit.fr>	5 years ago
Hakaba Hitoyo	701815e64c	[ActivityPub] Configurable ActivityPub actor type	5 years ago
Maksim Pechnikov	95e6a2acd9	Merge branch 'develop' into issue/1342	5 years ago
rinpatch	8404f8c8fb	Merge branch 'improve-move-notificaions-api' into 'develop' ... Add `with_move` query param to the notifications API See merge request pleroma/pleroma!2032	5 years ago
Maksim Pechnikov	3fe7a1fd35	Merge branch 'develop' into issue/1342	5 years ago
Egor Kislitsyn	d4953474ac	Merge branch 'develop' into improve-move-notificaions-api	5 years ago
Ivan Tashkinov	30caf3e51e	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations ... # Conflicts: # lib/pleroma/user.ex	5 years ago
lain	e9993acdbb	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel	5 years ago
Maksim Pechnikov	ed7f850ad2	fix test	5 years ago
Egor Kislitsyn	624e720aa4	Add `with_move` query param to the notifications API	5 years ago
lain	7722e5a67a	Merge branch 'feature/move-activity' into 'develop' ... Support "Move" activity Closes #1316 See merge request pleroma/pleroma!1883	5 years ago
Ivan Tashkinov	52cc7de82c	Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations ... # Conflicts: # mix.lock	5 years ago
Maksim Pechnikov	a52da55eb9	added User.NotificationSetting struct	5 years ago
lain	50b152766f	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into bugfix/1442-dont-return-nil-for-following-count	5 years ago
Egor Kislitsyn	f595cfe623	Remove User.user_info/2	5 years ago
Egor Kislitsyn	1fc28a4b44	Add a view for the move notification	5 years ago
Ivan Tashkinov	de892d2fe1	[#1335] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality.	5 years ago
Ivan Tashkinov	ba5cc30165	[#1335] Implemented notification mutes and reblog mutes as UserRelationships. User to UserRelationship relations and functions refactoring.	5 years ago
Ivan Tashkinov	c31ddce51e	[#1335] Reorganized `users.mutes` as relation to UserMute entity.	5 years ago
Egor Kislitsyn	3c0abfca53	Merge remote-tracking branch 'upstream/develop' into feature/move-activity	5 years ago
Egor Kislitsyn	e6d7e27bd6	Add `allow_following_move` setting to User	5 years ago