| 
								
								
									 rinpatch | 1341ee650e | [#675] Do not show DMs in mentions timeline | 2019-03-01 09:37:29 +03:00 |  | 
				
					
						| 
								
								
									 lain | 9e0686efa6 | Move visibility into own module. | 2019-02-22 13:29:52 +01:00 |  | 
				
					
						| 
								
								
									 lain | 62296f5a25 | Fix private post card handling. | 2019-02-22 12:02:51 +01:00 |  | 
				
					
						| 
								
								
									 KZ | 7c722c08f5 | Fix: Fixing an outbox related bug when local user activity is empty | 2019-02-22 04:37:48 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | f8a72f2997 | activitypub: sign http date header | 2019-02-21 00:23:17 +00:00 |  | 
				
					
						| 
								
								
									 Egor | bff9eb5ef7 | Reports | 2019-02-20 16:51:25 +00:00 |  | 
				
					
						| 
								
								
									 Ekaterina Vaartis | 5a46d37af9 | Update the mute implementation to the current codebase Make it part of the info thing (and do a migration to ensure it's there) | 2019-02-19 23:09:16 +03:00 |  | 
				
					
						| 
								
								
									 Ekaterina Vaartis | f41f017bbc | Implement muting, add it to the mastodon API | 2019-02-19 21:49:55 +03:00 |  | 
				
					
						| 
								
								
									 lambda | f25a3f4f78 | Merge branch 'fix/check-follower-collection-in-is_private' into 'develop' properly check for follower address in is_private?
See merge request pleroma/pleroma!841 | 2019-02-19 14:08:19 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | 96dcacade1 | properly check for follower address in is_private? | 2019-02-19 13:23:13 +03:00 |  | 
				
					
						| 
								
								
									 kaniini | 833161b5d2 | Merge branch 'feature/jobs' into 'develop' Job Queue
See merge request pleroma/pleroma!732 | 2019-02-18 19:43:06 +00:00 |  | 
				
					
						| 
								
								
									 kaniini | cd019a5927 | Merge branch 'follow-request-count' into 'develop' Follow request count
See merge request pleroma/pleroma!817 | 2019-02-18 04:01:26 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | 8f98d970c1 | Fix recipient count in hellthread policy | 2019-02-17 13:46:40 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 921571c19b | Merge branch 'hellthread-filter-fix' into 'develop' Hellthread filter fix
Closes #634
See merge request pleroma/pleroma!831 | 2019-02-15 13:18:35 +00:00 |  | 
				
					
						| 
								
								
									 Karen Konou | c2e0a0c8d4 | Readd threshold is not 0 check, optmization? | 2019-02-15 14:05:20 +01:00 |  | 
				
					
						| 
								
								
									 Karen Konou | dca6bee2f7 | Rename test, add check for follower collection when delisting | 2019-02-15 13:43:14 +01:00 |  | 
				
					
						| 
								
								
									 rinpatch | b63a5e309d | Merge branch 'bugfix/actor-containment' into 'develop' activitypub: correctly handle bare URIs in user lookup
Closes #645
See merge request pleroma/pleroma!829 | 2019-02-15 12:27:03 +00:00 |  | 
				
					
						| 
								
								
									 Karen Konou | d943c90249 | Add tests, change default config values, fix a bug | 2019-02-15 12:47:50 +01:00 |  | 
				
					
						| 
								
								
									 eugenijm | ecdf0657ba | Add logic for keeping follow_request_count up-to-date on the follow,`approve_friend_request`, and `deny_friend_request` actions.
Add follow_request_count to the user view. | 2019-02-15 12:20:20 +03:00 |  | 
				
					
						| 
								
								
									 lambda | ea2698beb7 | Merge branch 'bugfix/activitypub-reserialization' into 'develop' activitypub transmogrifier: fix reserialization edge cases
See merge request pleroma/pleroma!826 | 2019-02-14 19:54:16 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 56862f4ce1 | activitypub: clean up logging statements a little | 2019-02-14 19:42:33 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 72ba5b4ab7 | activitypub: user view: formatting | 2019-02-14 03:13:07 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 5307c211b8 | activitypub: user view: report totalItems=0 for follows/followers when hidden | 2019-02-14 03:10:00 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 6542b86292 | activitypub: user view: remove totalItems from user outbox (this is based on a counter in User.Info, but the counter is not reliable.) | 2019-02-14 03:02:45 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | ee2fa1a314 | activitypub: user view: remove totalInbox from user inbox view It is not really feasible to quickly calculate the totalItems value and
it shouldn't be trusted anyway. | 2019-02-14 03:01:39 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 64620d8980 | activitypub: user view: do not expose oAuth endpoints for instance users | 2019-02-14 02:41:21 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | e05bf2940f | activitypub: transmogrifier: correctly handle nil inReplyTo value | 2019-02-14 00:35:54 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 94cbbb0e3a | activitypub: transmogrifier: do not attempt to expand pre-existing AS2 tag objects | 2019-02-14 00:35:53 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 9bd6ed975e | activitypub: user view: use route helpers instead of hardcoded URIs | 2019-02-13 19:34:43 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 29e946ace4 | activitypub: user view: add oauthRegistrationEndpoint to user profiles | 2019-02-13 19:34:43 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | db8abd958d | activitypub: user view: fix up endpoints rendering | 2019-02-13 19:34:43 +00:00 |  | 
				
					
						| 
								
								
									 William Pitcock | 90facd3598 | user view: add AP C2S oauth endpoints to local user profiles | 2019-02-13 19:34:43 +00:00 |  | 
				
					
						| 
								
								
									 Karen Konou | bef9b9cb66 | refactored code | 2019-02-13 16:23:09 +01:00 |  | 
				
					
						| 
								
								
									 Karen Konou | adcdd21f16 | Merge branch 'develop' into hellthread-filter-fix | 2019-02-13 16:22:14 +01:00 |  | 
				
					
						| 
								
								
									 Karen Konou | 1d727cd069 | added checks for public url and follower collections | 2019-02-13 00:01:34 +01:00 |  | 
				
					
						| 
								
								
									 rinpatch | 379d04692c | Filter summary in keywordpolicy | 2019-02-11 21:35:40 +03:00 |  | 
				
					
						| 
								
								
									 lambda | d53e36bf1e | Revert "Merge branch 'object-creation' into 'develop'" This reverts merge request !802 | 2019-02-11 08:07:39 +00:00 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | 305d219413 | Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs # Conflicts:
#	lib/pleroma/web/federator/federator.ex
#	lib/pleroma/web/websub/websub.ex | 2019-02-11 13:54:21 +07:00 |  | 
				
					
						| 
								
								
									 kaniini | 6c8d15da11 | Merge branch 'fix/credo-issues' into 'develop' Fix credo issues
See merge request pleroma/pleroma!786 | 2019-02-10 20:54:21 +00:00 |  | 
				
					
						| 
								
								
									 lain | f8388be9c6 | Do object insertion through Cachex So we don't flood our postgres logs with errors. Should also make things
slightly faster. | 2019-02-09 22:01:08 +01:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 6a6a5b3251 | de-group alias/es | 2019-02-09 16:31:17 +01:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | d2e4eb7c74 | Web.ActivityPub.ActivityPub: assign the Enum.filter to recipients & simplify it | 2019-02-09 14:59:21 +01:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 60ea29dfe6 | Credo fixes: alias grouping/ordering | 2019-02-09 14:59:20 +01:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 8bcfac93a8 | Make credo happy | 2019-02-09 14:59:20 +01:00 |  | 
				
					
						| 
								
								
									 rinpatch | 7356659273 | wow | 2019-02-08 15:12:13 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | f88dec8b33 | What idiot did that? (me) | 2019-02-08 13:16:50 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 6c21f5aa16 | Merge branch 'develop' into feature/keyword-policy | 2019-02-08 13:12:33 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 8a0b755c19 | rename ftl_removal to federated_timeline_removal to keep consistent naming with SimplePolicy | 2019-02-08 13:12:09 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 46aa8c18a2 | Add keyword policy | 2019-02-08 12:38:24 +03:00 |  | 
				
					
						| 
								
								
									 Mark Felder | 74518d0b60 | hide_followings was renamed to hide_followers in the FE, but never synced up in the BE This was a dirty regex replace which worked on my server | 2019-02-06 22:34:44 +00:00 |  |