Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c435de426d 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into cycles-constants  
							
							
							
						 
						
							2021-06-01 11:33:11 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								0ddf492c5d 
								
							 
						 
						
							
							
								
								Merge branch 'cycles-base-url' into 'develop'  
							
							... 
							
							
							
							Deprecate Pleroma.Web.base_url/0
See merge request pleroma/pleroma!3432  
							
						 
						
							2021-06-01 16:15:27 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								c4b4258374 
								
							 
						 
						
							
							
								
								Merge branch 'features/validators-note' into 'develop'  
							
							... 
							
							
							
							Pipeline Ingestion: Note
Closes  #290 
See merge request pleroma/pleroma!2984  
							
						 
						
							2021-06-01 01:51:38 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f2134e605b 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into cycles-base-url  
							
							
							
						 
						
							2021-05-31 16:49:46 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								51a9f97e87 
								
							 
						 
						
							
							
								
								Deprecate Pleroma.Web.base_url/0  
							
							... 
							
							
							
							Use Pleroma.Web.Endpoint.url/0 directly instead. Reduces compiler cycles. 
							
						 
						
							2021-05-31 16:48:03 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								10dfe81479 
								
							 
						 
						
							
							
								
								Pleroma.Constants.as_local_public/0 --> Pleroma.Web.ActivityPub.Utils.as_local_public/0  
							
							... 
							
							
							
							Move as_local_public/0 to stop making modules depend on Web at compile-time 
							
						 
						
							2021-05-31 13:39:15 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								8871ca5aa3 
								
							 
						 
						
							
							
								
								Merge branch 'cycles-router-api-routes' into 'develop'  
							
							... 
							
							
							
							Recompilation speedup: Pleroma.Web.get_api_routes/0 --> Pleroma.Web.Router.get_api_routes/0
See merge request pleroma/pleroma!3419  
							
						 
						
							2021-05-28 19:06:49 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								359ded086c 
								
							 
						 
						
							
							
								
								Merge branch 'simplepolicy-announce-leak' into 'develop'  
							
							... 
							
							
							
							SimplePolicy: filter nested objects, fixes  #2582 
Closes  #2582 
See merge request pleroma/pleroma!3376  
							
						 
						
							2021-05-28 19:05:13 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								39127f15eb 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into cycles-router-api-routes  
							
							
							
						 
						
							2021-05-28 13:51:21 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c23b81e399 
								
							 
						 
						
							
							
								
								Pleroma.Web.get_api_routes/0 --> Pleroma.Web.Router.get_api_routes/0  
							
							... 
							
							
							
							Reduce recompilation time by breaking compile-time cycles 
							
						 
						
							2021-05-28 13:51:01 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								4694853766 
								
							 
						 
						
							
							
								
								Provide totalItems field for featured collections  
							
							
							
						 
						
							2021-05-27 12:17:31 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								05d678c070 
								
							 
						 
						
							
							
								
								Expose user email address to user/owner; not publicly.  
							
							
							
						 
						
							2021-05-20 12:50:43 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ff02511057 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into attachment-meta  
							
							
							
						 
						
							2021-05-12 20:10:52 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4c060ae733 
								
							 
						 
						
							
							
								
								Ingest remote attachment width/height  
							
							
							
						 
						
							2021-05-12 15:38:49 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ab9eabdf20 
								
							 
						 
						
							
							
								
								Add SetMeta filter to store uploaded image sizes  
							
							
							
						 
						
							2021-05-12 15:07:31 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a8fa00ef66 
								
							 
						 
						
							
							
								
								Fix failing remote mentions test, valid TLDs  
							
							
							
						 
						
							2021-04-30 12:55:43 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e7ac15905e 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into oauth-token-id  
							
							
							
						 
						
							2021-04-29 12:19:10 -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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								f95b52255b 
								
							 
						 
						
							
							
								
								Revert guards on string_to_elixir_types/1, remove unnecessary assignment in test  
							
							
							
						 
						
							2021-04-14 09:39:57 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								905efc57e9 
								
							 
						 
						
							
							
								
								Initial test validating the AdminAPI issue  
							
							
							
						 
						
							2021-04-13 14:39:28 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								cdd271b065 
								
							 
						 
						
							
							
								
								Fix assignment / assertion  
							
							
							
						 
						
							2021-04-13 10:55:54 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								9fbcdc15b1 
								
							 
						 
						
							
							
								
								Validate custom instance thumbnail set via AdminAPI produces correct URL  
							
							
							
						 
						
							2021-04-13 10:52:53 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5ef4659b37 
								
							 
						 
						
							
							
								
								test/pleroma/web/common_api_test.exs: Strip : around emoji key-name  
							
							
							
						 
						
							2021-04-05 19:25:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								53193b84b1 
								
							 
						 
						
							
							
								
								utils: Fix maybe_splice_recipient when "object" isn’t a map  
							
							
							
						 
						
							2021-04-05 19:19:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b0c778fde7 
								
							 
						 
						
							
							
								
								NoteHandlingTest: remove fix_explicit_addressing-related test  
							
							
							
						 
						
							2021-04-05 19:19:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d1205406d9 
								
							 
						 
						
							
							
								
								ActivityPubControllerTest: Apply same addr changes to object  
							
							
							
						 
						
							2021-04-05 19:19:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								641184fc7a 
								
							 
						 
						
							
							
								
								recipients fixes/hardening for CreateGenericValidator  
							
							
							
						 
						
							2021-04-05 19:19:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c944932674 
								
							 
						 
						
							
							
								
								Pipeline Ingestion: Note  
							
							
							
						 
						
							2021-04-05 19:19:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e2a3365b5c 
								
							 
						 
						
							
							
								
								ObjectValidator.CommonFixes: Introduce fix_objects_defaults and fix_activity_defaults  
							
							
							
						 
						
							2021-04-05 19:19:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e56779dd8d 
								
							 
						 
						
							
							
								
								Transmogrifier: Simplify fix_explicit_addressing and fix_implicit_addressing  
							
							
							
						 
						
							2021-04-05 19:19:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5ae27c8451 
								
							 
						 
						
							
							
								
								pipeline_test: Fix usage of %Activity{}  
							
							
							
						 
						
							2021-04-01 14:18:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								16a7ffb1ea 
								
							 
						 
						
							
							
								
								Fix function calls due to module name change  
							
							
							
						 
						
							2021-03-30 11:10:44 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								bfcdcd4f69 
								
							 
						 
						
							
							
								
								Temp file leaked, oops  
							
							
							
						 
						
							2021-03-30 11:10:44 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								03f38ac4eb 
								
							 
						 
						
							
							
								
								Prefer FollowBot naming convention vs Followbot  
							
							
							
						 
						
							2021-03-30 11:10:44 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								fef4f3772c 
								
							 
						 
						
							
							
								
								More tests to validate Followbot is behaving  
							
							
							
						 
						
							2021-03-30 11:10:44 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								f73d166785 
								
							 
						 
						
							
							
								
								Only need to validate a follow request is generated for now  
							
							
							
						 
						
							2021-03-30 11:10:44 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5ae9b05600 
								
							 
						 
						
							
							
								
								separate test file for featured collection  
							
							
							
						 
						
							2021-03-25 13:03:41 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8f0778166c 
								
							 
						 
						
							
							
								
								moving fixture into mastodon folder  
							
							
							
						 
						
							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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b6a69b5efd 
								
							 
						 
						
							
							
								
								Return token's primary key with POST /oauth/token  
							
							
							
						 
						
							2021-03-24 12:50:05 -05:00