lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e2772d6bf1 
								
							 
						 
						
							
							
								
								Merge branch 'block-behavior' into 'develop'  
							
							... 
							
							
							
							Configurable block visibility, fixes  #2123 
Closes  #2123 
See merge request pleroma/pleroma!3242  
							
						 
						
							2021-11-15 14:27:59 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a17910a6c6 
								
							 
						 
						
							
							
								
								CI: Bump lint stage to elixir-1.12  
							
							... 
							
							
							
							Elixir 1.12 changed formatting rules, this allows to avoid having to rollback to run `mix format` 
							
						 
						
							2021-10-06 08:11:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								6b3842cf50 
								
							 
						 
						
							
							
								
								Merge branch 'remove/mastofe' into 'develop'  
							
							... 
							
							
							
							Remove MastoFE from Pleroma, fixes  #2625 
Closes  #2625 
See merge request pleroma/pleroma!3392  
							
						 
						
							2021-09-07 16:41:53 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								62bf6d67e3 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into poll-notification-fixes  
							
							
							
						 
						
							2021-07-18 11:49:22 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0114754db2 
								
							 
						 
						
							
							
								
								MastodonAPI: Support poll notification  
							
							
							
						 
						
							2021-07-17 22:19:38 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sean King 
								
							 
						 
						
							
							
							
							
								
							
							
								5d279a22b1 
								
							 
						 
						
							
							
								
								Merge develop branch upstream  
							
							
							
						 
						
							2021-07-10 11:04:16 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								fc6ab78a84 
								
							 
						 
						
							
							
								
								Add test on changing [:instance, :upload_limit]  
							
							
							
						 
						
							2021-06-22 12:25:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sean King 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								dc4814f0cd 
								
							 
						 
						
							
							
								
								Fix merge conflicts with upstream  
							
							
							
						 
						
							2021-06-04 14:42:44 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn 
								
							 
						 
						
							
							
							
							
								
							
							
								0c56f9de0d 
								
							 
						 
						
							
							
								
								Merge branch 'tests/openapi-everywhere' into 'develop'  
							
							... 
							
							
							
							Put OpenAPI ~everywhere in tests
See merge request pleroma/pleroma!3324  
							
						 
						
							2021-06-04 18:53:09 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								ff00b354fa 
								
							 
						 
						
							
							
								
								Rename the non-federating Chat feature to Shout  
							
							
							
						 
						
							2021-06-01 11:49:14 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c435de426d 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'pleroma/develop' into cycles-constants  
							
							
							
						 
						
							2021-06-01 11:33:11 -05: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex Gleason 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								762be6ce10 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into block-behavior  
							
							
							
						 
						
							2021-04-29 11:14:32 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sean King 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8afa3f2d1b 
								
							 
						 
						
							
							
								
								Remove no longer necessary unit tests for MastoFE  
							
							
							
						 
						
							2021-04-15 23:12:42 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ff612750b1 
								
							 
						 
						
							
							
								
								validator renaming & add validation for target  
							
							
							
						 
						
							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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ef5de5eb39 
								
							 
						 
						
							
							
								
								OpenAPI: MastodonAPI Status Controller  
							
							
							
						 
						
							2021-03-15 06:47:07 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0c7c6463d1 
								
							 
						 
						
							
							
								
								OpenAPI: MastodonAPI Account Controller, excluding OAuth  
							
							
							
						 
						
							2021-03-15 06:47:06 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e47f83cfc8 
								
							 
						 
						
							
							
								
								OpenAPI: MastodonAPI Conversation Controller  
							
							
							
						 
						
							2021-03-15 06:47:06 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3123ecdd6e 
								
							 
						 
						
							
							
								
								OpenAPI: MastodonAPI Media Controller  
							
							
							
						 
						
							2021-03-15 06:47:06 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7eecc3b61d 
								
							 
						 
						
							
							
								
								OpenAPI: MastodonAPI Timeline Controller  
							
							
							
						 
						
							2021-03-15 06:47:06 +01: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								024c11c18d 
								
							 
						 
						
							
							
								
								StatusController: Deactivate application support for now.  
							
							... 
							
							
							
							Some more things to discuss about, so we'll remove it from 2.3.0 
							
						 
						
							2021-03-02 14:40:47 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f85ed1c521 
								
							 
						 
						
							
							
								
								warning fix  
							
							
							
						 
						
							2021-02-28 19:41:25 +03: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								63739c5a58 
								
							 
						 
						
							
							
								
								Tests to validate client disclosure obeys user setting  
							
							
							
						 
						
							2021-02-18 17:23:17 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								1e6c27181e 
								
							 
						 
						
							
							
								
								expires_in in scheduled status params  
							
							
							
						 
						
							2021-02-18 14:59:22 +03: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								cf6d3db58f 
								
							 
						 
						
							
							
								
								Add API endpoint to remove a conversation  
							
							
							
						 
						
							2021-02-15 21:48:13 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								bd3d0e8b57 
								
							 
						 
						
							
							
								
								Use a custom oauth token so we can predict and validate the client_name and website  
							
							
							
						 
						
							2021-02-11 15:53:10 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								333ff527fd 
								
							 
						 
						
							
							
								
								Validate client application metadata is retained in the object  
							
							
							
						 
						
							2021-02-11 15:07:21 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								df89b5019b 
								
							 
						 
						
							
							
								
								[ #2510 ] Improved support for app-bound OAuth tokens. Auth-related refactoring.  
							
							
							
						 
						
							2021-02-11 15:02:50 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b5d001fc8c 
								
							 
						 
						
							
							
								
								not used mock  
							
							
							
						 
						
							2021-02-10 18:44:49 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								008499f65a 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into 'fix/2412-filters'  
							
							... 
							
							
							
							# Conflicts:
#   CHANGELOG.md 
							
						 
						
							2021-02-03 14:23:23 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								c3dd860a02 
								
							 
						 
						
							
							
								
								Merge branch 'fix/2449-scheduled-poll-bug' into 'develop'  
							
							... 
							
							
							
							Fix for scheduled post with poll
Closes  #2449 
See merge request pleroma/pleroma!3294  
							
						 
						
							2021-02-03 14:22:23 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								d289ad8579 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into 'fix/2411-mutes-api'  
							
							... 
							
							
							
							# Conflicts:
#   CHANGELOG.md
#   docs/development/API/differences_in_mastoapi_responses.md 
							
						 
						
							2021-02-02 17:57:58 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								cd5ff7a943 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into 'feature/2164-unify-api-arguments'  
							
							... 
							
							
							
							# Conflicts:
#   CHANGELOG.md 
							
						 
						
							2021-02-02 17:11:38 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0dc68c157f 
								
							 
						 
						
							
							
								
								fix for scheduled post with poll  
							
							
							
						 
						
							2021-02-01 18:22:26 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								fdf1dfed56 
								
							 
						 
						
							
							
								
								only_remote -> remote renaming  
							
							
							
						 
						
							2021-02-01 14:11:12 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								77f0a0af7d 
								
							 
						 
						
							
							
								
								more tests and update for docs and changelog  
							
							
							
						 
						
							2021-02-01 14:11:12 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								2cb6dc5a3a 
								
							 
						 
						
							
							
								
								list timeline filtration by params  
							
							
							
						 
						
							2021-02-01 14:11:12 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b6a72680e2 
								
							 
						 
						
							
							
								
								added only_media flag to home timeline  
							
							
							
						 
						
							2021-02-01 14:11:11 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c3110c46f3 
								
							 
						 
						
							
							
								
								expanding filtration for home timeline  
							
							... 
							
							
							
							added local & remote statuses filtration for home timeline 
							
						 
						
							2021-02-01 14:11:11 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c369d2b930 
								
							 
						 
						
							
							
								
								support for with_relationships parameter  
							
							... 
							
							
							
							in /api/v1/mutes and /api/v1/accounts/:id endpoints 
							
						 
						
							2021-01-29 08:41:21 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								bddb01bded 
								
							 
						 
						
							
							
								
								Add tests  
							
							
							
						 
						
							2021-01-27 18:20:07 +04:00