Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								99f70c7e20 
								
							 
						 
						
							
							
								
								Use Pleroma.Config everywhere  
							
							
							
						 
						
							2019-05-30 15:33:58 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alex S 
								
							 
						 
						
							
							
							
							
								
							
							
								aa11fa4864 
								
							 
						 
						
							
							
								
								add report uri and report to  
							
							
							
						 
						
							2019-05-16 12:49:40 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								62516be9c4 
								
							 
						 
						
							
							
								
								Merge branch 'fix/public-option-not-working' into 'develop'  
							
							... 
							
							
							
							Fix public option not working
Closes  #873 
See merge request pleroma/pleroma!1143  
							
						 
						
							2019-05-15 15:42:21 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Aaron Tinio 
								
							 
						 
						
							
							
							
							
								
							
							
								7b8dc99ef1 
								
							 
						 
						
							
							
								
								Implement Pleroma.Plugs.EnsurePublicOrAuthenticated  
							
							
							
						 
						
							2019-05-15 05:09:29 +08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								071f78733a 
								
							 
						 
						
							
							
								
								switch to pleroma/http_signatures library  
							
							
							
						 
						
							2019-05-14 20:03:13 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
							
							
								
							
							
								a2be420f94 
								
							 
						 
						
							
							
								
								differences_in_mastoapi_responses.md: fullname & bio are optionnal  
							
							... 
							
							
							
							[ci skip] 
							
						 
						
							2019-05-13 18:35:45 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								acb04306b6 
								
							 
						 
						
							
							
								
								Standardize construction of websocket URL  
							
							... 
							
							
							
							This follows up on the change made in d747bd98 
							
						 
						
							2019-05-03 11:45:04 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									AkiraFukushima 
								
							 
						 
						
							
							
							
							
								
							
							
								533d8cd581 
								
							 
						 
						
							
							
								
								Parse access_token from body parameters and URL parameters  
							
							
							
						 
						
							2019-05-02 21:04:00 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								88d3cb44c3 
								
							 
						 
						
							
							
								
								replace Repo.get_by(User, nickname: nickname) with User.get_by_nickname(nickname)  
							
							
							
						 
						
							2019-04-02 17:47:02 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								c708656b5e 
								
							 
						 
						
							
							
								
								Merge branch 'robotstxt' into 'develop'  
							
							... 
							
							
							
							Add robots.txt
Closes  #723 
See merge request pleroma/pleroma!929  
							
						 
						
							2019-03-15 02:50:27 +00: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								cbdd11c381 
								
							 
						 
						
							
							
								
								Merge develop to bump elixir version in the CI so I don't get failing formatting  
							
							
							
						 
						
							2019-03-14 22:33:20 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								e2fe796c63 
								
							 
						 
						
							
							
								
								Add some tests  
							
							
							
						 
						
							2019-03-14 22:02:48 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c42d34b2ec 
								
							 
						 
						
							
							
								
								[Credo] fix Credo.Check.Readability.MaxLineLength  
							
							
							
						 
						
							2019-03-13 04:26:56 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a3a9cec483 
								
							 
						 
						
							
							
								
								[Credo] fix Credo.Check.Readability.AliasOrder  
							
							
							
						 
						
							2019-03-13 04:26:54 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								92a69bddce 
								
							 
						 
						
							
							
								
								escape quotation marks in Content-Disposition header  
							
							
							
						 
						
							2019-03-12 09:21:13 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								5a73cae2be 
								
							 
						 
						
							
							
								
								WIP: Stop mangling filenames  
							
							
							
						 
						
							2019-03-12 09:10:19 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								fc37e5815f 
								
							 
						 
						
							
							
								
								Plugs.HTTPSecurityPlug: Add static_url to CSP's connect-src  
							
							... 
							
							
							
							Closes: https://git.pleroma.social/pleroma/pleroma/merge_requests/469  
							
						 
						
							2019-03-05 01:44:24 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								bc4f77b10b 
								
							 
						 
						
							
							
								
								[ #468 ] Merged upstream/develop, resolved conflicts.  
							
							
							
						 
						
							2019-02-17 14:07:04 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								2a4a4f3342 
								
							 
						 
						
							
							
								
								[ #468 ] Defined OAuth restrictions for all applicable routes.  
							
							... 
							
							
							
							Improved missing "scopes" param handling.
Allowed "any of" / "all of" mode specification in OAuthScopesPlug.
Fixed auth UI / behavior when user selects no permissions at /oauth/authorize. 
							
						 
						
							2019-02-15 19:54:37 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								063baca5e4 
								
							 
						 
						
							
							
								
								[ #468 ] User UI for OAuth permissions restriction. Standardized storage format for scopes fields, updated usages.  
							
							
							
						 
						
							2019-02-14 00:29:29 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								da4c662af3 
								
							 
						 
						
							
							
								
								Plugs.HTTPSecurityPlug: Add webpacker to connect-src  
							
							
							
						 
						
							2019-02-12 22:12:12 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								00e8f0b07d 
								
							 
						 
						
							
							
								
								Plugs.HTTPSecurityPlug: Add unsafe-eval to script-src when in dev mode  
							
							... 
							
							
							
							This is needed to run dev mode mastofe at the same time 
							
						 
						
							2019-02-12 22:12:11 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									shibayashi 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ea1058929c 
								
							 
						 
						
							
							
								
								Use url[:scheme] instead of protocol to determine if https is enabled  
							
							
							
						 
						
							2019-02-12 00:08:52 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6a6a5b3251 
								
							 
						 
						
							
							
								
								de-group alias/es  
							
							
							
						 
						
							2019-02-09 16:31:17 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ivan Tashkinov 
								
							 
						 
						
							
							
							
							
								
							
							
								4ad843fb9d 
								
							 
						 
						
							
							
								
								[ #468 ] Prototype of OAuth2 scopes support. TwitterAPI scope restrictions.  
							
							
							
						 
						
							2019-02-09 17:09:08 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								60ea29dfe6 
								
							 
						 
						
							
							
								
								Credo fixes: alias grouping/ordering  
							
							
							
						 
						
							2019-02-09 14:59:20 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								106f4e7a0f 
								
							 
						 
						
							
							
								
								Credo fixes: parameter consistency  
							
							
							
						 
						
							2019-02-09 14:59:20 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								fa5ec765d9 
								
							 
						 
						
							
							
								
								Serve sw-pleroma.js properly  
							
							
							
						 
						
							2019-02-01 11:34:41 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								8018ae7ae5 
								
							 
						 
						
							
							
								
								Join on preloads to avoid N+1 queries  
							
							
							
						 
						
							2019-01-26 15:55:53 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f3eb414e28 
								
							 
						 
						
							
							
								
								Add a way to use the admin api without a user.  
							
							
							
						 
						
							2018-12-18 21:08:52 +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 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								5dcb7aecea 
								
							 
						 
						
							
							
								
								More put_view.  
							
							
							
						 
						
							2018-12-16 17:51:22 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								658edb166f 
								
							 
						 
						
							
							
								
								fix and improve web push; add configuration docs  
							
							
							
						 
						
							2018-12-14 13:05:29 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								074fa790ba 
								
							 
						 
						
							
							
								
								fix compile warnings  
							
							
							
						 
						
							2018-12-09 20:50:08 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								4944498133 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/compat/push-subscriptions  
							
							... 
							
							
							
							# Conflicts:
#	lib/pleroma/application.ex
#	lib/pleroma/plugs/oauth_plug.ex 
							
						 
						
							2018-12-06 20:15:16 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								8b4397c704 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/compat/push-subscriptions  
							
							... 
							
							
							
							# Conflicts:
#	lib/mix/tasks/sample_config.eex
#	lib/pleroma/web/twitter_api/controllers/util_controller.ex
#	mix.exs
#	mix.lock 
							
						 
						
							2018-12-06 19:55:58 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								c524c50509 
								
							 
						 
						
							
							
								
								fix/273  
							
							
							
						 
						
							2018-12-05 17:32:06 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								f18b86fd5f 
								
							 
						 
						
							
							
								
								More fixes for Info schema.  
							
							
							
						 
						
							2018-12-01 12:46:08 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								c443c9bd72 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into validate-user-info  
							
							
							
						 
						
							2018-12-01 09:55:46 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								1c67277c80 
								
							 
						 
						
							
							
								
								Fix admin api.  
							
							
							
						 
						
							2018-12-01 09:03:16 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									href 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b19597f602 
								
							 
						 
						
							
							
								
								reverse proxy / uploads  
							
							
							
						 
						
							2018-11-30 18:00:47 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								d0ec2812bd 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin' into validate-user-info  
							
							
							
						 
						
							2018-11-30 17:34:20 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								04daa0fa44 
								
							 
						 
						
							
							
								
								Plugs.HTTPSecurityPlug: Activate upgrade-insecure-requests only when there is https  
							
							... 
							
							
							
							This fixes running mastofe with MIX_ENV=dev 
							
						 
						
							2018-11-26 21:41:36 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									shibayashi 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								591b11eafc 
								
							 
						 
						
							
							
								
								Add manifest-src to allow manifest.json  
							
							
							
						 
						
							2018-11-26 20:48:24 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								3356c7d1e9 
								
							 
						 
						
							
							
								
								oauth plug: fix deactivated check  
							
							
							
						 
						
							2018-11-20 18:47:00 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								4a79b89dba 
								
							 
						 
						
							
							
								
								lib/pleroma/plugs/user_is_admin_plug.ex: change 403 string to “User is not admin.”  
							
							
							
						 
						
							2018-11-17 20:25:56 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c8b8f1d32c 
								
							 
						 
						
							
							
								
								[Pleroma.Plugs.UserIsAdminPlug]: Check if admin is true instead of false, fix error reporting  
							
							
							
						 
						
							2018-11-17 20:25:53 +01:00