| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 Egor Kislitsyn | fe5d423b43 | Add OpenAPI spec for MascotController | 2020-05-18 22:01:18 +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 | 10ff01acd9 | [#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP. | 2019-10-16 21:59:21 +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 | 0c6009dd2e | Extract mascot actions from MastodonAPIControllerto MascotController | 2019-09-30 19:32:43 +07:00 |  |