| 
								
								
									 lain | 6e4f52f8a2 | Introduce new ingestion pipeline structure, implement internal Likes with it. | 2019-10-16 16:16:39 +02:00 |  | 
				
					
						| 
								
								
									 eugenijm | 8249924485 | Mastodon API: Add pleroma.unread_conversation_countto 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 |  | 
				
					
						| 
								
								
									 kaniini | 5c04e81724 | Merge branch 'user-info-unread-direct-conversation' into 'develop' Add the `unread_conversation_count` field to the user info
See merge request pleroma/pleroma!1737 | 2019-10-04 17:33:18 +00:00 |  | 
				
					
						| 
								
								
									 lain | 01da6344b9 | Merge branch 'bugfix/notification-nil-actor' into 'develop' notification_view.ex: Make sure `account` isn’t empty
See merge request pleroma/pleroma!1779 | 2019-10-04 11:28:20 +00:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 5dc14c89ce | notification_view.ex: Make sure accountisn’t emptyRelated: https://git.pleroma.social/pleroma/pleroma/issues/1203 | 2019-10-04 07:11:53 +02:00 |  | 
				
					
						| 
								
								
									 eugenijm | 06d9df79c5 | Mastodon API: Add pleroma.unread_conversation_countto the Account entity | 2019-10-04 00:53:23 +03:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 36a34c36fe | Extract poll actions from MastodonAPIControllertoPollController | 2019-10-01 11:44:34 +07:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | e7aef27c00 | Fix merge | 2019-09-30 19:10:54 +07:00 |  | 
				
					
						| 
								
								
									 Ariadne Conill | b7877e9b1c | mastodon api: implement rendering of listen activities | 2019-09-30 10:39:17 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | 6d74a7528c | Merge branch 'feature/follow-requests-count' into 'develop' Mastodon API: add follow_requests_count
See merge request pleroma/pleroma!1726 | 2019-09-29 11:44:31 +00:00 |  | 
				
					
						| 
								
								
									 Ariadne Conill | 14294243a2 | mastodon api: implement follow_requests_count | 2019-09-27 04:22:40 +00:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 98d1347a4e | Extract status actions from MastodonAPIControllerintoStatusController | 2019-09-27 10:51:15 +07:00 |  | 
				
					
						| 
								
								
									 Hakaba Hitoyo | 5fb72170a7 | Revert "add _discoverable_ keyword into ActivityPub @context" This reverts commit 3aef4bdf8f37efd1055a84c5fca12ec4559a17f5. | 2019-09-26 02:57:41 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | b0ec82d24a | Merge branch 'chores/bump-copyright-year' into 'develop' Bump copyright years of files changed in 2019
See merge request pleroma/pleroma!1698 | 2019-09-18 21:57:49 +00:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 447514dfa2 | Bump copyright years of files changed in 2019 Done via the following command:
git diff 1e6c102bfc--stat --name-only | cat - | xargs sed -i 's/2017-2018 Pleroma Authors/2017-2019 Pleroma Authors/' | 2019-09-18 23:21:11 +02:00 |  | 
				
					
						| 
								
								
									 eugenijm | 450bf7a63c | Mastodon API: Add a setting to hide follow/follower count from the user view ( hide_follows_countandhide_followers_count) | 2019-09-17 14:45:47 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | b312ca3d52 | Mastodon API Poll view: Fix handling of polls without an end date | 2019-09-05 12:03:39 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 3face45467 | Mastodon API: Add pleroma.thread_mutedto Status entityNeeded for pleroma-fe!941 | 2019-09-04 14:17:23 +03:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 019ced0558 | Move test/web/mastodon_api/*_test.exs to test/web/mastodon_api/controllers and test/web/mastodon_api/views | 2019-08-26 19:37:57 +07:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 30510ade0e | Extract MastodonAPIController's list actions into MastodonAPI.ListController; Add more tests | 2019-08-26 19:37:54 +07:00 |  |