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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								913d53b7d7 
								
							 
						 
						
							
							
								
								Remove useless header on the get request  
							
							 
							
							
							
						 
						
							2021-03-02 14:04:50 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								ccbf162088 
								
							 
						 
						
							
							
								
								Actually test viewing status after ingestion  
							
							 
							
							
							
						 
						
							2021-03-02 12:33:32 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								f0208980e4 
								
							 
						 
						
							
							
								
								Test both ingestion of post in the status controller and the correct response during the view  
							
							 
							
							
							
						 
						
							2021-03-02 12:29:16 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3aae5231b2 
								
							 
						 
						
							
							
								
								Add OpenAPI spec for AdminAPI.UserController  
							
							 
							
							
							
						 
						
							2021-03-02 20:49:17 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								882dd46843 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework  
							
							 
							
							
							
						 
						
							2021-03-02 08:26:30 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								b1e1db82bc 
								
							 
						 
						
							
							
								
								Store application details in the object under the generator key, not application key  
							
							 
							
							
							
						 
						
							2021-03-01 11:29:10 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e8d88a72cf 
								
							 
						 
						
							
							
								
								Merge branch 'fix/warning-in-test' into 'develop'  
							
							 
							
							... 
							
							
							
							warning fix
See merge request pleroma/pleroma!3350  
							
						 
						
							2021-02-28 16:53:05 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								4a9d3a1f28 
								
							 
						 
						
							
							
								
								Merge branch 'features/reports-enhancements' into 'develop'  
							
							 
							
							... 
							
							
							
							Enhance reports in Pleroma API: index, show
See merge request pleroma/pleroma!3280  
							
						 
						
							2021-02-28 16:45:15 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f85ed1c521 
								
							 
						 
						
							
							
								
								warning fix  
							
							 
							
							
							
						 
						
							2021-02-28 19:41:25 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								050c4b1f14 
								
							 
						 
						
							
							
								
								Merge branch 'bugfix/peertube-mpegURL-object' into 'develop'  
							
							 
							
							... 
							
							
							
							Video: Handle peertube videos only stashing attachments in x-mpegURL
Closes  #2372  and #2535 
See merge request pleroma/pleroma!3336  
							
						 
						
							2021-02-28 16:18:23 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e6a14e1cd1 
								
							 
						 
						
							
							
								
								Merge branch 'feat/client_app_details' into 'develop'  
							
							 
							
							... 
							
							
							
							Support application field
See merge request pleroma/pleroma!3311  
							
						 
						
							2021-02-28 16:17:34 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3bc7d12271 
								
							 
						 
						
							
							
								
								Remove sensitive-property setting #nsfw, create HashtagPolicy  
							
							 
							
							
							
						 
						
							2021-02-27 21:26:17 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								d0823d7f1e 
								
							 
						 
						
							
							
								
								Merge branch 'frontendstatic-ignore-api-calls' into 'develop'  
							
							 
							
							... 
							
							
							
							Filter out API calls from FrontendStatic plug
Closes  #2261 
See merge request pleroma/pleroma!3346  
							
						 
						
							2021-02-27 19:40:38 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								d35b6254b4 
								
							 
						 
						
							
							
								
								Store the client application data in ActivityStreams format  
							
							 
							
							
							
						 
						
							2021-02-26 18:14:57 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								902d4e4a4a 
								
							 
						 
						
							
							
								
								Leave a note for future explorers  
							
							 
							
							
							
						 
						
							2021-02-25 13:06:43 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								2da71a526f 
								
							 
						 
						
							
							
								
								No need to filter out Mix.env() from the API routes.  
							
							 
							
							
							
						 
						
							2021-02-25 13:04:08 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								6b87dfad5d 
								
							 
						 
						
							
							
								
								Filter out MIX_ENV from route list and add a test  
							
							 
							
							
							
						 
						
							2021-02-25 09:23:10 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								8f88a90ca3 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	lib/pleroma/application.ex
#	lib/pleroma/config.ex 
							
						 
						
							2021-02-23 13:58:35 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								77f3da0358 
								
							 
						 
						
							
							
								
								[ #3213 ] Misc. tweaks: proper upsert in Hashtag, better feature toggle management.  
							
							 
							
							
							
						 
						
							2021-02-23 13:52:28 +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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								63739c5a58 
								
							 
						 
						
							
							
								
								Tests to validate client disclosure obeys user setting  
							
							 
							
							
							
						 
						
							2021-02-18 17:23:17 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								d5ef02c7a7 
								
							 
						 
						
							
							
								
								Mastodon makes this field null when posting with MastoFE or if you choose to not disclose it, so it's safe to be null by default  
							
							 
							
							
							
						 
						
							2021-02-18 16:35:03 -06:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1e6c27181e 
								
							 
						 
						
							
							
								
								expires_in in scheduled status params  
							
							 
							
							
							
						 
						
							2021-02-18 14:59:22 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								6d66fadea7 
								
							 
						 
						
							
							
								
								Remove :auth, :enforce_oauth_admin_scope_usage  
							
							 
							
							... 
							
							
							
							`admin` scope has been required by default for more than a year now
and all apps that use the API seems to request a proper scope by now. 
							
						 
						
							2021-02-17 20:47:38 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ff72ce31ca 
								
							 
						 
						
							
							
								
								Enhance reports in Pleroma API: index, show  
							
							 
							
							
							
						 
						
							2021-02-17 18:46:53 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								e7b1f0f5f4 
								
							 
						 
						
							
							
								
								Merge branch 'feat/chat-list-pagination' into 'develop'  
							
							 
							
							... 
							
							
							
							Chats: Introduce /api/v2/pleroma/chats which implements pagination
Closes  #2140 
See merge request pleroma/pleroma!3325  
							
						 
						
							2021-02-17 15:36:59 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								158f9f18ee 
								
							 
						 
						
							
							
								
								Merge branch 'remove-conversation-api' into 'develop'  
							
							 
							
							... 
							
							
							
							Add API endpoint to remove a conversation
Closes  #2488 
See merge request pleroma/pleroma!3321  
							
						 
						
							2021-02-17 15:14:27 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								264cb2c77f 
								
							 
						 
						
							
							
								
								Merge branch '2510-oauth-app-tokens-further-support' into 'develop'  
							
							 
							
							... 
							
							
							
							[#2510 ] Improved support for app-bound OAuth tokens
Closes  #2510 
See merge request pleroma/pleroma!3316  
							
						 
						
							2021-02-17 13:08:51 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								d7ad288c84 
								
							 
						 
						
							
							
								
								Chats: Introduce /api/v2/pleroma/chats which implements pagination  
							
							 
							
							... 
							
							
							
							Also removes incorrect claim that /api/v1/pleroma/chats supports
pagination and deprecates it.
Closes  #2140  
							
						 
						
							2021-02-17 16:03:24 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								111bfdd3a0 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework  
							
							 
							
							
							
						 
						
							2021-02-16 23:23:49 +03:00