Alex Gleason
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								c9e4200ed2
								
							
						 | 
						
							
							
								
								Create real Views for all Controllers
							
							
							
							
							
							
							
							This makes views depend on each other at runtime instead of compile-time 
							
						 | 
						
							2021-05-29 12:15:57 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								b738f70953
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/gen-magic
							
							
							
							
							
						 | 
						
							2020-10-13 10:08:38 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								9f4fe5485b
								
							
						 | 
						
							
							
								
								alias alphabetically order
							
							
							
							
							
						 | 
						
							2020-10-13 16:43:59 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								a6d8cef33e
								
							
						 | 
						
							
							
								
								OAuthScopesPlug module name
							
							
							
							
							
						 | 
						
							2020-10-13 16:43:54 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
							
							
								
							
							
								39f7fc5b8e
								
							
						 | 
						
							
							
								
								Update majic & call plug before OpenApiSpex
							
							
							
							
							
						 | 
						
							2020-06-16 19:00:54 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
							
							
								
							
							
								f124f68205
								
							
						 | 
						
							
							
								
								Switch from gen_magic to majic, use Majic.Plug, remove Pleroma.MIME
							
							
							
							
							
						 | 
						
							2020-06-16 15:27:27 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								9b76565264
								
							
						 | 
						
							
							
								
								MediaController: enforced owner-only access in :show action.
							
							
							
							
							
							
							
							Improved error response on denied access (now 403). Adjusted tests. 
							
						 | 
						
							2020-05-18 09:51:53 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								af9dfdce6b
								
							
						 | 
						
							
							
								
								MediaController OAuth scope assignments fix.
							
							
							
							
							
							
							
							Typo fix (`def get_media` instead of `def show`). 
							
						 | 
						
							2020-05-17 08:46:43 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								bb03dfdb03
								
							
						 | 
						
							
							
								
								Do not require description in update action
							
							
							
							
							
						 | 
						
							2020-05-14 16:29:32 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								0f885b4b86
								
							
						 | 
						
							
							
								
								Fix OpenAPI spec
							
							
							
							
							
						 | 
						
							2020-05-14 16:18:30 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								099e314a1b
								
							
						 | 
						
							
							
								
								Add OpenAPISpex for MediaController
							
							
							
							
							
						 | 
						
							2020-05-14 12:13:25 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								cb363f0183
								
							
						 | 
						
							
							
								
								MastodonAPI: /api/v2/media endpoints
							
							
							
							
							
						 | 
						
							2020-05-14 10:14:28 +02: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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								585bc57edb
								
							
						 | 
						
							
							
								
								Extract media actions from MastodonAPIController to MediaController
							
							
							
							
							
						 | 
						
							2019-10-01 14:36:35 +07:00 | 
						
						
							
							
							
								
							
							
						 |