akkoma

Author	SHA1	Message	Date
Egor Kislitsyn	f1ca917bb0	Merge branch 'develop' into openapi/account	2020-04-27 14:33:00 +04:00
lain	8480f84615	Update differences_in_mastoapi_responses.md	2020-04-24 15:43:54 +03:00
Alexander	be34672d67	formatting	2020-04-24 15:43:54 +03:00
Alexander	6e625a427c	reply filtering	2020-04-24 15:43:49 +03:00
Egor Kislitsyn	1b06a27746	Update Flake ID description	2020-04-22 20:20:19 +04:00
lain	4576520461	Revert "Merge branch 'issue/1276' into 'develop'" This reverts merge request !1877	2020-04-14 16:32:22 +00:00
Maksim Pechnikov	2b7d7bbd2d	Merge branch 'develop' into issue/1276	2020-04-07 14:09:43 +03:00
Egor Kislitsyn	8a0ffaa9ea	Fix formatting in documentation	2020-04-02 23:10:13 +04:00
Maksim Pechnikov	dfd2c74184	Merge branch 'develop' into issue/1276	2020-03-29 06:57:34 +03:00
Alexander Strizhakov	98a60df41f	include_types parameter in /api/v1/notifications	2020-03-20 13:18:12 +03:00
Alexander Strizhakov	f3791add99	removing with_move parameter	2020-03-16 20:07:45 +03:00
Ivan Tashkinov	b4367125e9	[#1560 ] Added tests for non-federating instance bahaviour to ActivityPubControllerTest.	2020-03-02 21:43:18 +03:00
Maksim Pechnikov	da44ee5b0f	Merge branch 'develop' into issue/1276	2020-02-13 09:20:34 +03:00
lain	24c526a0b1	Merge remote-tracking branch 'origin/develop' into uguu-uwu-notices-bulge	2020-02-11 13:58:36 +01:00
Haelwenn (lanodan) Monnier	ad16f38b9c	differences_in_mastoapi_responses.md: Add note about unlisted results Closes: https://git.pleroma.social/pleroma/pleroma/issues/1164	2020-02-11 01:59:27 +01:00
Maksim Pechnikov	b87533760b	Merge branch 'develop' into issue/1276	2020-02-10 07:59:52 +03:00
Lain Soykaf	ce95882009	EmojiReactions: Add docs and Changelog	2020-02-07 14:59:26 +01:00
Lain Soykaf	8a79f20c21	EmojiReactions: Rename to EmojiReacts	2020-02-06 18:09:57 +01:00
lain	d378550d2d	Emoji Reactions: Document changes	2020-01-29 11:40:57 +01:00
Maksim Pechnikov	e442ea5722	Merge branch 'develop' into issue/1276	2020-01-27 15:20:47 +03:00
lain	9a994878f1	Emoji reactions: Update docs and changelog	2020-01-24 10:53:01 +01:00
lain	85f45c7689	Document new EmojiReaction notifications	2020-01-22 20:11:18 +01:00
lain	043cd5aa54	Emoji reactions: Document changes	2020-01-22 13:58:02 +01:00
lain	4c5b5f14dc	StatusView: Add `emoji_reactions`	2020-01-20 16:24:20 +01:00
Alibek Omarov	e1308f10bd	docs: API: update Mastodon API link	2020-01-11 05:06:40 +00:00
Hakaba Hitoyo	701815e64c	[ActivityPub] Configurable ActivityPub actor type	2019-12-10 13:19:26 +00:00
Egor Kislitsyn	b4027e7187	Document `with_move` parameter of the notification API	2019-12-09 14:46:06 +07:00
Maksim Pechnikov	49bb0a130f	Merge branch 'develop' into issue/1276	2019-12-05 12:22:19 +03:00
Egor Kislitsyn	1fc28a4b44	Add a view for the move notification	2019-11-27 17:52:02 +07:00
Egor Kislitsyn	3c0abfca53	Merge remote-tracking branch 'upstream/develop' into feature/move-activity	2019-11-14 16:39:45 +07:00
Egor Kislitsyn	e6d7e27bd6	Add `allow_following_move` setting to User	2019-11-12 18:45:28 +07:00
eugenijm	7888803ffe	Mastodon API: Add the `recipients` parameter to `GET /api/v1/conversations`	2019-11-07 08:26:24 +03:00
Maksim Pechnikov	58da7f6620	updated docs\changelog	2019-10-31 17:34:17 +03:00
eugenijm	a97b642289	Mastodon API: Add `exclude_visibilities` parameter to the timeline and notification endpoints	2019-10-14 02:57:21 +03:00
eugenijm	8249924485	Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity	2019-10-05 20:12:00 +03:00
kaniini	e07e9cb75e	Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'" This reverts merge request !1737	2019-10-05 10:00:05 +00:00
eugenijm	06d9df79c5	Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity	2019-10-04 00:53:23 +03:00
rinpatch	acc62f327d	Rename some directories because MkDocs uses them for categories	2019-10-02 23:28:45 +03:00

38 commits