feld 
								
							 
						 
						
							
							
							
							
								
							
							
								5aff479951 
								
							 
						 
						
							
							
								
								Merge branch '1668-prometheus-access-restrictions' into 'develop'  
							
							 
							
							... 
							
							
							
							[#1668 ] App metrics endpoint (Prometheus) access restrictions
Closes  #1668 
See merge request pleroma/pleroma!3093  
							
						 
						
							2020-10-27 17:47:56 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								8a68673eed 
								
							 
						 
						
							
							
								
								[ #3059 ] Formatting fix.  
							
							 
							
							
							
						 
						
							2020-10-22 14:07:33 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								8a55de1d78 
								
							 
						 
						
							
							
								
								[ #3059 ] Fixed Phoenix 1.5 telemetry processing.  
							
							 
							
							
							
						 
						
							2020-10-22 13:54:15 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								524fb0e4c2 
								
							 
						 
						
							
							
								
								[ #1668 ] Restricted access to app metrics endpoint by default. Added ability to configure IP whitelist for this endpoint.  
							
							 
							
							... 
							
							
							
							Added tests and documentation. 
							
						 
						
							2020-10-18 21:22:21 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b081080dd9 
								
							 
						 
						
							
							
								
								fixes after rebase  
							
							 
							
							
							
						 
						
							2020-10-13 16:44:02 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								abc3c7689b 
								
							 
						 
						
							
							
								
								HTTPSecurityPlug module name and filename  
							
							 
							
							
							
						 
						
							2020-10-13 16:43:55 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8dfaa54ffc 
								
							 
						 
						
							
							
								
								InstanceStatic module name  
							
							 
							
							
							
						 
						
							2020-10-13 16:43:55 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								3be8ab5103 
								
							 
						 
						
							
							
								
								RemoteIp module name  
							
							 
							
							
							
						 
						
							2020-10-13 16:43:50 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c97c7d982f 
								
							 
						 
						
							
							
								
								SetLocalePlug module name  
							
							 
							
							
							
						 
						
							2020-10-13 16:42:52 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a07688deb1 
								
							 
						 
						
							
							
								
								TrailingFormatPlug module name  
							
							 
							
							
							
						 
						
							2020-10-13 16:42:51 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a5987155f7 
								
							 
						 
						
							
							
								
								UploadedMedia module name  
							
							 
							
							
							
						 
						
							2020-10-13 16:42:51 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								66974e17a0 
								
							 
						 
						
							
							
								
								Endpoint: Serve a dynamically configured admin interface  
							
							 
							
							
							
						 
						
							2020-07-29 13:03:04 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								ad5c42628a 
								
							 
						 
						
							
							
								
								FrontendStatic: Add plug to serve frontends based on configuration.  
							
							 
							
							
							
						 
						
							2020-07-28 17:35:16 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c6ddfa8f95 
								
							 
						 
						
							
							
								
								static-fe.css: Restore and move to /priv/static/static-fe  
							
							 
							
							
							
						 
						
							2020-05-02 08:28:42 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								c3b9fbd3a7 
								
							 
						 
						
							
							
								
								Revert "Set better Cache-Control header for static content"  
							
							 
							
							... 
							
							
							
							On furher investigation it seems like all that did was cause unintuitive
behavior. The emoji request flood that was the reason for introducing it
isn't really that big of a deal either, since Plug.Static only needs to
read file modification time and size to determine the ETag.
Closes  #1613  
							
						 
						
							2020-03-11 17:58:25 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6da6540036 
								
							 
						 
						
							
							
								
								Bump copyright years of files changed after 2020-01-07  
							
							 
							
							... 
							
							
							
							Done via the following command:
git diff fcd5dd259a  --stat --name-only | xargs sed -i '/Pleroma Authors/c# Copyright © 2017-2020 Pleroma Authors <https:\/\/pleroma.social\/>' 
							
						 
						
							2020-03-02 06:08:45 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								15ea75cd2a 
								
							 
						 
						
							
							
								
								Actually fix upload limit on OTP releases  
							
							 
							
							... 
							
							
							
							Closes  #1109  
							
						 
						
							2020-02-07 20:14:06 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								c098dec473 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/custom-runtime-modules  
							
							 
							
							
							
						 
						
							2019-12-10 00:16:43 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								78299ab182 
								
							 
						 
						
							
							
								
								Set Plug.Logger to log at :debug level  
							
							 
							
							
							
						 
						
							2019-12-09 19:12:24 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								3c45ed4f47 
								
							 
						 
						
							
							
								
								OTP: Fix runtime upload limit config being ignored  
							
							 
							
							... 
							
							
							
							Closes  #1109  
							
						 
						
							2019-12-08 21:08:25 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								84175fe30e 
								
							 
						 
						
							
							
								
								Set better Cache-Control header for static content  
							
							 
							
							... 
							
							
							
							Closes  #1382  
							
						 
						
							2019-11-06 16:41:19 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									minibikini 
								
							 
						 
						
							
							
							
							
								
							
							
								f9380289eb 
								
							 
						 
						
							
							
								
								Add remote_ip plug  
							
							 
							
							
							
						 
						
							2019-09-27 21:59:23 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								cc1d1ee406 
								
							 
						 
						
							
							
								
								Mastdon API: Add ability to get a remote account by nickname to  
							
							 
							
							... 
							
							
							
							`/api/v1/accounts/:id` 
							
						 
						
							2019-09-03 19:26:10 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								0d54a571ca 
								
							 
						 
						
							
							
								
								Add SetLocalePlug  
							
							 
							
							
							
						 
						
							2019-07-10 18:08:03 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								c2ca1f22a2 
								
							 
						 
						
							
							
								
								it is changed in compile time  
							
							 
							
							... 
							
							
							
							we can't change module attributes and endpoint settings in runtime 
							
						 
						
							2019-06-14 15:45:05 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								99f70c7e20 
								
							 
						 
						
							
							
								
								Use Pleroma.Config everywhere  
							
							 
							
							
							
						 
						
							2019-05-30 15:33:58 +07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								f916e4cdd9 
								
							 
						 
						
							
							
								
								Move the Cache Control header test to its own file  
							
							 
							
							... 
							
							
							
							We can consolidate our cache control header tests here 
							
						 
						
							2019-05-24 20:33:55 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								c953ae8c3d 
								
							 
						 
						
							
							
								
								Initial bundle of basic AdminFE  
							
							 
							
							... 
							
							
							
							Due to CSP headers we only allow connecting to self. If you want to
host AdminFE on a separate domain without CSP headers you will be able
to connect to any public Pleroma host. 
							
						 
						
							2019-05-11 01:34:17 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hakurei Reimu 
								
							 
						 
						
							
							
							
							
								
							
							
								6e26ac10a3 
								
							 
						 
						
							
							
								
								make Pleroma.Endpoint use extra_cookie_attrs in config  
							
							 
							
							
							
						 
						
							2019-04-16 22:20:56 +08:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								bffddf5e31 
								
							 
						 
						
							
							
								
								[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	docs/config.md
#	test/support/factory.ex 
							
						 
						
							2019-04-08 12:20:26 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								47a236f753 
								
							 
						 
						
							
							
								
								[ #923 ] OAuth consumer mode refactoring, new tests, tests adjustments, readme.  
							
							 
							
							
							
						 
						
							2019-04-05 15:12:02 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									href 
								
							 
						 
						
							
							
							
							
								
							
							
								bc3618a38d 
								
							 
						 
						
							
							
								
								Set up telemetry and prometheus  
							
							 
							
							
							
						 
						
							2019-04-04 11:30:43 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								eadafc88b8 
								
							 
						 
						
							
							
								
								[ #923 ] Deps config adjustment (no override for httpoison), code analysis issues fixes.  
							
							 
							
							
							
						 
						
							2019-04-01 09:28:56 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								2739057442 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth  
							
							 
							
							
							
						 
						
							2019-03-15 17:11:00 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								aacbf0f570 
								
							 
						 
						
							
							
								
								[ #923 ] OAuth: prototype of sign in / sign up with Twitter.  
							
							 
							
							
							
						 
						
							2019-03-15 17:08:03 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pearson 
								
							 
						 
						
							
							
							
							
								
							
							
								3dadaa4432 
								
							 
						 
						
							
							
								
								robots.txt  
							
							 
							
							... 
							
							
							
							Add default robots.txt that allows bots access to all paths.
Add mix task to generate robots.txt taht allows bots access to no paths.
Document custom emojis, MRF and static_dir
static_dir documentation includes docs for the robots.txt Mix task. 
							
						 
						
							2019-03-15 02:28:18 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c42d34b2ec 
								
							 
						 
						
							
							
								
								[Credo] fix Credo.Check.Readability.MaxLineLength  
							
							 
							
							
							
						 
						
							2019-03-13 04:26:56 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								63ab61ed3f 
								
							 
						 
						
							
							
								
								Sign in via Twitter (WIP).  
							
							 
							
							
							
						 
						
							2019-03-11 20:37:26 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								a184811a60 
								
							 
						 
						
							
							
								
								Use url() instead of static_url in Endpoint.websocket_url()  
							
							 
							
							
							
						 
						
							2019-02-01 22:35:19 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									eugenijm 
								
							 
						 
						
							
							
							
							
								
							
							
								d747bd9870 
								
							 
						 
						
							
							
								
								Use String.replace_leading instead of String.replace for getting websocket streaming api url.  
							
							 
							
							... 
							
							
							
							Extract the login responsible for obtaining websocket URL into the corresponding
Endpoint function. 
							
						 
						
							2019-02-01 21:58:43 +03:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								fa5ec765d9 
								
							 
						 
						
							
							
								
								Serve sw-pleroma.js properly  
							
							 
							
							
							
						 
						
							2019-02-01 11:34:41 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								980b5288ed 
								
							 
						 
						
							
							
								
								update copyright years to 2019  
							
							 
							
							
							
						 
						
							2018-12-31 15:41:47 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								2791ce9a1f 
								
							 
						 
						
							
							
								
								add license boilerplate to pleroma core  
							
							 
							
							
							
						 
						
							2018-12-23 20:56:42 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a6dfe1fc6b 
								
							 
						 
						
							
							
								
								Documentation: Move generated files to priv/static/doc, add it to endpoint.ex  
							
							 
							
							
							
						 
						
							2018-12-18 17:05:36 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b1860fe85a 
								
							 
						 
						
							
							
								
								Instance/Static runtime plug  
							
							 
							
							... 
							
							
							
							This allows to set-up an arbitrary directory which overrides most of the
static files: index.html static/ emoji/ packs/ sounds/ images/ instance/
favicon.png.
If the files are not present in the directory, the bundled ones in
priv/static will be used. 
							
						 
						
							2018-12-17 22:50:59 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								77b5154c82 
								
							 
						 
						
							
							
								
								Cowboy handler for Mastodon WebSocket  
							
							 
							
							
							
						 
						
							2018-12-17 17:06:18 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								f672555ad3 
								
							 
						 
						
							
							
								
								Upgrade to Phoenix 1.4  
							
							 
							
							
							
						 
						
							2018-12-16 17:15:07 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b19597f602 
								
							 
						 
						
							
							
								
								reverse proxy / uploads  
							
							 
							
							
							
						 
						
							2018-11-30 18:00:47 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								bcecdc3ab1 
								
							 
						 
						
							
							
								
								Various runtime configuration fixes  
							
							 
							
							
							
						 
						
							2018-11-19 10:09:24 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									shibayashi 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								87c76a9a2f 
								
							 
						 
						
							
							
								
								Add __Host- prefix when secure flag is enabled  
							
							 
							
							
							
						 
						
							2018-11-13 00:32:38 +01:00