Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								9b6b5ac196 
								
							 
						 
						
							
							
								
								Rename upload filter to AnalyzeMetadata  
							
							 
							
							
							
						 
						
							2021-05-18 15:33:33 -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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								745375bdcf 
								
							 
						 
						
							
							
								
								Merge branch 'dont-crash-email-settings' into 'develop'  
							
							 
							
							... 
							
							
							
							Don't crash so hard when email settings are invalid
Closes  #2606 
See merge request pleroma/pleroma!3400  
							
						 
						
							2021-05-04 13:30:00 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c186b059a7 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into dont-crash-email-settings  
							
							 
							
							
							
						 
						
							2021-05-03 14:43:28 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c80b1aaf51 
								
							 
						 
						
							
							
								
								Don't crash when email settings are invalid  
							
							 
							
							... 
							
							
							
							Fixes: https://git.pleroma.social/pleroma/pleroma/-/issues/2606 
Fixes: https://gitlab.com/soapbox-pub/soapbox/-/issues/4  
							
						 
						
							2021-05-03 14:43:14 -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 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								53760d2cda 
								
							 
						 
						
							
							
								
								Delete obsolete EarmarkRendereTests (moved to UtilsTest)  
							
							 
							
							
							
						 
						
							2021-04-30 12:51:18 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6727a3659f 
								
							 
						 
						
							
							
								
								Remove Pleroma.Formatter.minify/2  
							
							 
							
							
							
						 
						
							2021-04-30 12:27:06 -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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								0ababdc068 
								
							 
						 
						
							
							
								
								Merge branch 'fix/2593-reading-exported-config-file' into 'develop'  
							
							 
							
							... 
							
							
							
							Reading the file, instead of config keyword in ReleaseRuntimeProvider
Closes  #2593 
See merge request pleroma/pleroma!3381  
							
						 
						
							2021-04-16 09:50:26 +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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								681a42c359 
								
							 
						 
						
							
							
								
								release runtime provider fix for paths  
							
							 
							
							
							
						 
						
							2021-04-08 15:45:31 +03: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 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4d046afd27 
								
							 
						 
						
							
							
								
								tests for release config provider  
							
							 
							
							
							
						 
						
							2021-03-27 09:05:33 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8857242c95 
								
							 
						 
						
							
							
								
								removeing corresponding add activity  
							
							 
							
							
							
						 
						
							2021-03-25 13:03:41 +03: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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								d3660b24d3 
								
							 
						 
						
							
							
								
								Copy emoji in the subject from parent post  
							
							 
							
							... 
							
							
							
							Sometimes people put emoji in the subject, which results in the subject
looking broken if someone replies to it from a server that does not
have the said emoji under the same shortcode. This patch solves the problem
by extending the emoji set available in the summary to that of the parent
post. 
							
						 
						
							2021-03-22 21:20:47 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d7e51206a2 
								
							 
						 
						
							
							
								
								respect content-type header in finger request  
							
							 
							
							
							
						 
						
							2021-03-19 18:53:55 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								a9bc652ab9 
								
							 
						 
						
							
							
								
								Merge branch 'mediaproxy-decode' into 'develop'  
							
							 
							
							... 
							
							
							
							Simple way to decode mediaproxy URLs
See merge request pleroma/pleroma!3364  
							
						 
						
							2021-03-19 08:52:12 +00: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 
								
							 
						 
						
							
							
							
							
								
							
							
								946e0aab49 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework  
							
							 
							
							
							
						 
						
							2021-03-10 07:48:50 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								7f413139fb 
								
							 
						 
						
							
							
								
								Merge branch 'openapi/admin/user' into 'develop'  
							
							 
							
							... 
							
							
							
							Add OpenAPI spec for AdminAPI.UserController
See merge request pleroma/pleroma!3355  
							
						 
						
							2021-03-10 03:24:40 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								92526e0230 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework  
							
							 
							
							
							
						 
						
							2021-03-07 11:34:39 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								eaaa20e0f1 
								
							 
						 
						
							
							
								
								Make tests use it  
							
							 
							
							
							
						 
						
							2021-03-05 13:21:22 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								5856f51717 
								
							 
						 
						
							
							
								
								[ #3213 ] ActivityPub hashtags filtering refactoring. Test fix.  
							
							 
							
							
							
						 
						
							2021-03-03 23:09:30 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								13aa98d689 
								
							 
						 
						
							
							
								
								Merge branch 'mergeback/2.3.0' into 'develop'  
							
							 
							
							... 
							
							
							
							Mergeback/2.3.0
See merge request pleroma/pleroma!3360  
							
						 
						
							2021-03-03 15:07:50 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								2e296c079f 
								
							 
						 
						
							
							
								
								Revert "StatusController: Deactivate application support for now."  
							
							 
							
							... 
							
							
							
							This reverts commit 024c11c18d . 
							
						 
						
							2021-03-03 15:33:06 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								913d53b7d7 
								
							 
						 
						
							
							
								
								Remove useless header on the get request  
							
							 
							
							
							
						 
						
							2021-03-02 14:04:50 -06:00