| 
								
								
									 rinpatch | 2698bbc9f6 | Merge branch 'filtering-following' into 'develop' ActivityPub: Return Announces when filtering by `following`.
See merge request pleroma/pleroma!3022 | 2020-10-06 18:11:34 +00:00 |  | 
				
					
						| 
								
								
									 Maksim Pechnikov | de993b856b | added forceoption to the unfollow operation | 2020-09-28 09:16:42 +03:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 5e86a2809e | transmogrifier: Drop incoming create early if it already exists | 2020-09-23 13:40:45 +02:00 |  | 
				
					
						| 
								
								
									 lain | ee3052a2d8 | ActivityPub: Return Announces when filtering by following. | 2020-09-22 14:20:19 +02:00 |  | 
				
					
						| 
								
								
									 lain | f2f0a0260f | ActivityPub: Don't block-filter your own posts We are filtering out replies to people you block, but that should
not include your own posts. | 2020-09-21 16:08:38 +02:00 |  | 
				
					
						| 
								
								
									 feld | 6c052bd5b6 | Merge branch 'media-preview-proxy-nostream' into 'develop' Media preview proxy
See merge request pleroma/pleroma!3001 | 2020-09-18 18:38:20 +00:00 |  | 
				
					
						| 
								
								
									 Steven Fuchs | f2ef9735c5 | Federate data through persistent websocket connections | 2020-09-18 11:58:22 +00:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | a428800405 | Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream # Conflicts:
#	CHANGELOG.md | 2020-09-17 22:22:59 +03:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | abf25e5d52 | Create MRF.filter_pipeline to inject :object_data when present | 2020-09-17 22:07:54 +03:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 3a0f99ed35 | KeywordPolicy: Still match when fields are absent | 2020-09-17 22:07:54 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | d9fb5bc08a | Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream | 2020-09-17 17:14:20 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | eca8d26784 | Merge branch 'chores/mrf-loglevel' into 'develop' Fetcher: Correctly return MRF reject reason
See merge request pleroma/pleroma!2990 | 2020-09-16 13:37:04 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | adbd0032fa | Merge branch 'features/validators-video' into 'develop' Pipeline Ingestion: Video and Article
See merge request pleroma/pleroma!2908 | 2020-09-16 13:36:27 +00:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 2f155fb89f | Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream | 2020-09-15 20:29:39 +03:00 |  | 
				
					
						| 
								
								
									 eugenijm | 3ab59a6f3c | Mastodon API: fix the public timeline returning an error when the reply_visibilityparameter is set toselffor an unauthenticated user | 2020-09-15 13:00:56 +03:00 |  | 
				
					
						| 
								
								
									 Mark Felder | 709723182d | Ensure SimplePolicy's tags in string representation don't trip up the object validator | 2020-09-14 17:06:42 -05:00 |  | 
				
					
						| 
								
								
									 Mark Felder | c0b36621f1 | Ensure we only apply NSFW Simple policy on parsable objects | 2020-09-11 23:22:14 -05:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | f1f44069ae | Fetcher: Correctly return MRF reject reason | 2020-09-11 20:00:41 +02:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 0bda85857e | Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy # Conflicts:
#	lib/pleroma/instances/instance.ex | 2020-09-11 17:19:58 +03:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | f18178cb09 | AttachmentValidator: directly embed url schema and pass it fix_media_type | 2020-09-11 01:40:20 +02:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 1b3d5956b1 | Pipeline Ingestion: Article | 2020-09-11 01:40:20 +02:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 2132b24a9d | object_validators: likes & announcements as [ObjectID] | 2020-09-11 01:39:39 +02:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 846b59ccb0 | Pipeline Ingestion: Video | 2020-09-11 01:39:39 +02:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | b73e9ef686 | transmogrifier: Call strip_internal_fields on pipeline ingestion | 2020-09-11 01:39:38 +02:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 357d971a10 | expiration for new pipeline | 2020-09-10 21:50:41 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 93e1c8df9d | reject activity creation if passed expires_at option and expiring activities are not configured | 2020-09-10 21:50:41 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 9bf1065a06 | schedule activity expiration in Oban | 2020-09-10 21:50:40 +03:00 |  | 
				
					
						| 
								
								
									 rinpatch | 541a3eede2 | Merge branch 'chores/remove-ostatus-fixtures' into 'develop' Remove OStatus in testsuite
See merge request pleroma/pleroma!2968 | 2020-09-10 18:41:00 +00:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 148bc24435 | [#2497] Removed Hackney-specific code (no longer needed due to adapter options unification). | 2020-09-10 11:54:10 +03:00 |  | 
				
					
						| 
								
								
									 Mark Felder | 4ee99dafcc | Merge branch 'develop' into media-preview-proxy | 2020-09-09 11:11:36 -05:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 10ef532c63 | AP C2S: Restrict character limit on Note | 2020-09-08 20:21:34 +03:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | ee0e05f930 | Drop unused "inReplyToAtomUri" in objects | 2020-09-08 18:43:57 +02:00 |  | 
				
					
						| 
								
								
									 Mark Felder | 21efda2edb | Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into unlisted | 2020-09-08 09:31:26 -05:00 |  | 
				
					
						| 
								
								
									 Alibek Omarov | 95688c90ad | ForceBotUnlistedPolicy: simplify code | 2020-09-08 01:15:15 +02:00 |  | 
				
					
						| 
								
								
									 Alibek Omarov | 8b695c3eeb | ForceBotUnlistedPolicy: format | 2020-09-07 22:53:45 +02:00 |  | 
				
					
						| 
								
								
									 Alibek Omarov | 699224a900 | ForceBotUnlistedPolicy: initial add, tiny clean up from my previous version | 2020-09-07 22:15:42 +02:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | 696bf09433 | passing adapter options directly without adapter key | 2020-09-07 19:59:17 +03:00 |  | 
				
					
						| 
								
								
									 Alexander Strizhakov | a83916fdac | adapter options unification not needed options deletion | 2020-09-07 19:59:17 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | 88a6ee4a59 | [#2497] Func defs grouping fix. | 2020-09-05 20:23:18 +03:00 |  | 
				
					
						| 
								
								
									 Ivan Tashkinov | f170d47130 | [#2497] Adjusted media proxy preview invalidation. Allowed client-side caching for media preview. Adjusted prewarmer to fetch only proxiable URIs. Removed :preview pool in favor of existing :media one. Misc. refactoring. | 2020-09-05 20:19:09 +03:00 |  | 
				
					
						| 
								
								
									 Mark Felder | 85446cc30c | Merge branch 'develop' into media-preview-proxy | 2020-09-03 10:34:06 -05:00 |  | 
				
					
						| 
								
								
									 lain | 9433311923 | Merge branch 'bugfix/incoming-poll-emoji' into 'develop' Fix emoji in Question, force generated context/context_id insertion
Closes #1870
See merge request pleroma/pleroma!2915 | 2020-09-03 11:50:30 +00:00 |  | 
				
					
						| 
								
								
									 rinpatch | 126461942b | User table: ensure bio is always a string Gets rid of '|| ""' in multiple places and fixes #2067 | 2020-09-01 10:45:42 +03:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | b960cede9a | common_fixes: Force inserting context and context_id | 2020-09-01 08:35:00 +02:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | a142da3e4f | Add new Emoji Ecto.Type and fix emoji in Question | 2020-09-01 08:34:57 +02:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 2ecc7d9230 | transmogrifier: Remove mastodon emoji-format from emoji field | 2020-09-01 08:29:53 +02:00 |  | 
				
					
						| 
								
								
									 Mark Felder | 479578b148 | Merge branch 'develop' into feld-2168-media-preview-proxy | 2020-08-25 11:57:23 -05:00 |  | 
				
					
						| 
								
								
									 feld | d39abd02ac | Merge branch 'relay-fix-admin-fe' into 'develop' Relay fix for admin-fe
See merge request pleroma/pleroma!2902 | 2020-08-24 17:03:18 +00:00 |  | 
				
					
						| 
								
								
									 Mark Felder | 4e6eb22b4a | Try to warm the cache with the preview image if preview proxy enabled | 2020-08-21 12:19:35 -05:00 |  | 
				
					
						| 
								
								
									 Haelwenn (lanodan) Monnier | 36c125a071 | Pipeline Ingestion: Event | 2020-08-20 21:49:26 +02:00 |  |