Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								c4439c630f
								
							
						 | 
						
							
							
								
								Bump Copyright to 2021
							
							
							
							
							
							
							
							grep -rl '# Copyright © .* Pleroma' * | xargs sed -i 's;Copyright © .* Pleroma .*;Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>;' 
							
						 | 
						
							2021-01-13 07:49:50 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								a6d8cef33e
								
							
						 | 
						
							
							
								
								OAuthScopesPlug module name
							
							
							
							
							
						 | 
						
							2020-10-13 16:43:54 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								d08c63500b
								
							
						 | 
						
							
							
								
								Ignore unexpected query params
							
							
							
							
							
						 | 
						
							2020-05-04 20:16:44 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								1898054da4
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into openapi/reports
							
							
							
							
							
						 | 
						
							2020-04-30 13:51:27 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								560f2c1979
								
							
						 | 
						
							
							
								
								Add OpenAPI spec for ReportController
							
							
							
							
							
						 | 
						
							2020-04-28 16:50:37 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								f685cbd309
								
							
						 | 
						
							
							
								
								Automatic checks of authentication / instance publicity. Definition of missing OAuth scopes in AdminAPIController. Refactoring.
							
							
							
							
							
						 | 
						
							2020-04-21 16:29:19 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								05da5f5cca
								
							
						 | 
						
							
							
								
								Update Copyrights
							
							
							
							
							
						 | 
						
							2020-03-03 16:44:49 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								b93856874d
								
							
						 | 
						
							
							
								
								[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
							
							
							
							
							
							
							
							# Conflicts:
#	CHANGELOG.md
#	lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
#	lib/pleroma/web/router.ex 
							
						 | 
						
							2019-10-06 17:12:17 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								64095961fe
								
							
						 | 
						
							
							
								
								[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
							
							
							
							
							
							
							
							# Conflicts:
#	CHANGELOG.md
#	lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
#	lib/pleroma/web/router.ex 
							
						 | 
						
							2019-10-02 20:42:40 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								b7f27a4f58
								
							
						 | 
						
							
							
								
								Extract report actions from MastodonAPIController to ReportController
							
							
							
							
							
							
							
							Update MastodonAPI.ReportView 
							
						 | 
						
							2019-09-30 17:44:10 +07:00 | 
						
						
							
							
							
								
							
							
						 |