Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cea44b6b3e 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into simplepolicy-announce-leak  
							
							 
							
							
							
						 
						
							2021-05-07 12:40:45 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								926a233cc4 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into simplepolicy-announce-leak  
							
							 
							
							
							
						 
						
							2021-04-30 14:21:17 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c16c7fdb87 
								
							 
						 
						
							
							
								
								SimplePolicy: filter string Objects  
							
							 
							
							
							
						 
						
							2021-04-30 14:20:54 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3d742c3c1a 
								
							 
						 
						
							
							
								
								SimplePolicy: filter nested objects  
							
							 
							
							
							
						 
						
							2021-04-30 14:20:37 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								52fc59f125 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into earmark  
							
							 
							
							
							
						 
						
							2021-04-30 13:17:03 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6727a3659f 
								
							 
						 
						
							
							
								
								Remove Pleroma.Formatter.minify/2  
							
							 
							
							
							
						 
						
							2021-04-30 12:27:06 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								9f711ddcf8 
								
							 
						 
						
							
							
								
								Try to set query timeout intelligently  
							
							 
							
							
							
						 
						
							2021-04-22 10:15:50 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								0effcd2cfe 
								
							 
						 
						
							
							
								
								Set Repo.transaction/2 timeout to infinity. Fixes pleroma.user delete_activities mix task.  
							
							 
							
							
							
						 
						
							2021-04-22 10:15:50 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								15f87cf658 
								
							 
						 
						
							
							
								
								Merge branch 'features/ingestion-ecto-tag' into 'develop'  
							
							 
							
							... 
							
							
							
							TagValidator: New
See merge request pleroma/pleroma!3244  
							
						 
						
							2021-04-16 09:55:55 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								79376b4afb 
								
							 
						 
						
							
							
								
								Merge branch 'feature/521-pinned-post-federation' into 'develop'  
							
							 
							
							... 
							
							
							
							Pinned posts federation
Closes  #521 
See merge request pleroma/pleroma!3312  
							
						 
						
							2021-04-16 09:53:47 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ef36f7fa5c 
								
							 
						 
						
							
							
								
								Move tag fixup to object_validator  
							
							 
							
							
							
						 
						
							2021-04-05 19:07:45 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7ebfe89900 
								
							 
						 
						
							
							
								
								object_validators: Mark validate_data as private  
							
							 
							
							
							
						 
						
							2021-04-01 14:18:41 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								37a7f521fd 
								
							 
						 
						
							
							
								
								Insert string-hashtags in Pipeline  
							
							 
							
							... 
							
							
							
							Cannot be done in Ecto schemas because only one type is allowed in arrays, and
needs to be done before the MRFs. 
							
						 
						
							2021-04-01 14:18:41 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5ae27c8451 
								
							 
						 
						
							
							
								
								pipeline_test: Fix usage of %Activity{}  
							
							 
							
							
							
						 
						
							2021-04-01 14:18:40 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								9015df2229 
								
							 
						 
						
							
							
								
								TagValidator: New  
							
							 
							
							
							
						 
						
							2021-04-01 14:18:40 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								ce9ed6c730 
								
							 
						 
						
							
							
								
								Merge branch 'refactor/object_validator_validate' into 'develop'  
							
							 
							
							... 
							
							
							
							object_validator: Refactor most of validate/2 to a generic block
See merge request pleroma/pleroma!3383  
							
						 
						
							2021-04-01 11:10:12 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								af1cd28f9b 
								
							 
						 
						
							
							
								
								object_validator: Refactor most of validate/2 to a generic block  
							
							 
							
							
							
						 
						
							2021-04-01 12:18:52 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								03f38ac4eb 
								
							 
						 
						
							
							
								
								Prefer FollowBot naming convention vs Followbot  
							
							 
							
							
							
						 
						
							2021-03-30 11:10:44 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								4796df0bc3 
								
							 
						 
						
							
							
								
								Remove Task.async as it is broken here and probably a premature optimization anyway  
							
							 
							
							
							
						 
						
							2021-03-30 11:10:44 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								778010ef8e 
								
							 
						 
						
							
							
								
								Do not try to follow local users. Their posts are already available locally on the instance.  
							
							 
							
							
							
						 
						
							2021-03-30 11:10:44 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								86182ef8e4 
								
							 
						 
						
							
							
								
								Change module name to FollowbotPolicy  
							
							 
							
							
							
						 
						
							2021-03-30 11:10:44 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								f0dcc1ca69 
								
							 
						 
						
							
							
								
								Lint  
							
							 
							
							
							
						 
						
							2021-03-30 11:10:44 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								a176914c73 
								
							 
						 
						
							
							
								
								Better checking of previous follow request attempts  
							
							 
							
							
							
						 
						
							2021-03-30 11:10:44 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								3989ec508c 
								
							 
						 
						
							
							
								
								Prevent duplicates from being processed  
							
							 
							
							
							
						 
						
							2021-03-30 11:10:44 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								3949cfdc24 
								
							 
						 
						
							
							
								
								Make the followbot only dispatch follow requests once per 30 day period  
							
							 
							
							
							
						 
						
							2021-03-30 11:10:43 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								e78738173a 
								
							 
						 
						
							
							
								
								Enforce that the followbot must be marked as a bot.  
							
							 
							
							
							
						 
						
							2021-03-30 11:10:43 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								fba770b3ea 
								
							 
						 
						
							
							
								
								Try to handle misconfiguration scenarios gracefully  
							
							 
							
							
							
						 
						
							2021-03-30 11:10:03 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								8b81d62227 
								
							 
						 
						
							
							
								
								Upstream original followbot implementation  
							
							 
							
							
							
						 
						
							2021-03-30 11:10:03 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1885268c9c 
								
							 
						 
						
							
							
								
								expanding validator  
							
							 
							
							
							
						 
						
							2021-03-25 13:26:54 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2a520ba008 
								
							 
						 
						
							
							
								
								expanding AddRemoveValidator  
							
							 
							
							
							
						 
						
							2021-03-25 13:03:42 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8857242c95 
								
							 
						 
						
							
							
								
								removeing corresponding add activity  
							
							 
							
							
							
						 
						
							2021-03-25 13:03:41 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3adb43cc20 
								
							 
						 
						
							
							
								
								refetch user on incoming add/remove activity  
							
							 
							
							... 
							
							
							
							if featured_address is nil 
							
						 
						
							2021-03-25 13:03:41 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d1d2744ee3 
								
							 
						 
						
							
							
								
								featured_address valition in AddRemoveValidator  
							
							 
							
							
							
						 
						
							2021-03-25 13:03:40 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ff612750b1 
								
							 
						 
						
							
							
								
								validator renaming & add validation for target  
							
							 
							
							
							
						 
						
							2021-03-25 13:03:40 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								17f28c0507 
								
							 
						 
						
							
							
								
								mastodon pins  
							
							 
							
							
							
						 
						
							2021-03-25 13:03:40 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3ec1dbd922 
								
							 
						 
						
							
							
								
								Let pins federate  
							
							 
							
							... 
							
							
							
							- save object ids on pin, instead of activity ids
- pins federation
- removed pinned_activities field from the users table
- activityPub endpoint for user pins
- pulling remote users pins 
							
						 
						
							2021-03-25 13:03:40 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								f930e83fa2 
								
							 
						 
						
							
							
								
								Merge branch 'fix/remove_auto_nsfw' into 'develop'  
							
							 
							
							... 
							
							
							
							Remove sensitive setting #nsfw
See merge request pleroma/pleroma!3223  
							
						 
						
							2021-03-19 08:48:22 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								67bde35e71 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/bridgy-user-icon' into 'develop'  
							
							 
							
							... 
							
							
							
							Add support for actor icon being a list (Bridgy)
See merge request pleroma/pleroma!3372  
							
						 
						
							2021-03-19 08:36:26 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b1d4b2b81e 
								
							 
						 
						
							
							
								
								Add support for actor icon being a list (Bridgy)  
							
							 
							
							
							
						 
						
							2021-03-15 06:44:05 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								7f8785fd9b 
								
							 
						 
						
							
							
								
								[ #3213 ] Performance optimization of filtering by hashtags ("any" condition).  
							
							 
							
							
							
						 
						
							2021-03-07 11:33:21 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								5856f51717 
								
							 
						 
						
							
							
								
								[ #3213 ] ActivityPub hashtags filtering refactoring. Test fix.  
							
							 
							
							
							
						 
						
							2021-03-03 23:09:30 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								882dd46843 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework  
							
							 
							
							
							
						 
						
							2021-03-02 08:26:30 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3bc7d12271 
								
							 
						 
						
							
							
								
								Remove sensitive-property setting #nsfw, create HashtagPolicy  
							
							 
							
							
							
						 
						
							2021-02-27 21:26:17 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								77f3da0358 
								
							 
						 
						
							
							
								
								[ #3213 ] Misc. tweaks: proper upsert in Hashtag, better feature toggle management.  
							
							 
							
							
							
						 
						
							2021-02-23 13:52:28 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								6531eddf36 
								
							 
						 
						
							
							
								
								[ #3213 ] hashtags: altered name type to text. hashtags_objects: removed unused index. HashtagsTableMigrator: records_per_second calculation fix. ActivityPub: hashtags-related options normalization.  
							
							 
							
							
							
						 
						
							2021-02-22 23:26:07 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7fc9cd0974 
								
							 
						 
						
							
							
								
								Video: Handle peertube videos only stashing attachments in x-mpegURL  
							
							 
							
							... 
							
							
							
							Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2535  
							
						 
						
							2021-02-21 23:41:28 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								998437d4a4 
								
							 
						 
						
							
							
								
								[ #3213 ] Experimental / debug feature: database: [improved_hashtag_timeline: :preselect_hashtag_ids].  
							
							 
							
							
							
						 
						
							2021-02-18 21:03:06 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								1dac7d1462 
								
							 
						 
						
							
							
								
								[ #3213 ] Fixed hashtags.name lookup (must use citext type to do index scan). Fixed embedded hashtags lookup (lowercasing), adjusted tests.  
							
							 
							
							
							
						 
						
							2021-02-15 21:13:14 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								5992382cf8 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	CHANGELOG.md
#	lib/mix/tasks/pleroma/database.ex
#	lib/pleroma/web/templates/feed/feed/_activity.rss.eex 
							
						 
						
							2021-02-11 19:31:57 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								a853218701 
								
							 
						 
						
							
							
								
								Merge branch 'features/ap_id-c2s-authentication' into 'develop'  
							
							 
							
							... 
							
							
							
							activity_pub_controller: Add authentication to object & activity endpoints
See merge request pleroma/pleroma!3295  
							
						 
						
							2021-02-09 19:29:43 +00:00