hakabahitoyo
								
							 
						 | 
						
							
							
							
							
								
							
							
								8fd0556c78
								
							
						 | 
						
							
							
								
								better config reading
							
							
							
							
							
						 | 
						
							2018-11-17 18:14:42 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									hakabahitoyo
								
							 
						 | 
						
							
							
							
							
								
							
							
								55abd8482e
								
							
						 | 
						
							
							
								
								better config
							
							
							
							
							
						 | 
						
							2018-11-16 20:41:12 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									hakabahitoyo
								
							 
						 | 
						
							
							
							
							
								
							
							
								8e707aba29
								
							
						 | 
						
							
							
								
								format
							
							
							
							
							
						 | 
						
							2018-11-15 15:11:59 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hakaba Hitoyo
								
							 
						 | 
						
							
							
							
							
								
							
							
								58af0787be
								
							
						 | 
						
							
							
								
								add mdii uploader
							
							
							
							
							
						 | 
						
							2018-11-15 14:19:10 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								ee5932a504
								
							
						 | 
						
							
							
								
								http security: allow referrer-policy to be configured
							
							
							
							
							
						 | 
						
							2018-11-12 15:14:46 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								fe67665e19
								
							
						 | 
						
							
							
								
								rename CSPPlug to HTTPSecurityPlug.
							
							
							
							
							
						 | 
						
							2018-11-12 15:08:02 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								5dda13ee5f
								
							
						 | 
						
							
							
								
								config docs: typo fix
							
							
							
							
							
						 | 
						
							2018-11-11 07:27:36 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								df72978dce
								
							
						 | 
						
							
							
								
								csp plug: add support for certificate transparency
							
							
							
							
							
						 | 
						
							2018-11-11 06:55:44 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								69f5dfcfb3
								
							
						 | 
						
							
							
								
								config: add default parameters for CSPPlug
							
							
							
							
							
						 | 
						
							2018-11-11 06:38:50 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								234e471289
								
							
						 | 
						
							
							
								
								config: properly configure CORSPlug.
							
							
							
							
							
						 | 
						
							2018-11-11 05:41:23 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								d1a7a9fd24
								
							
						 | 
						
							
							
								
								config/config.md: Add lines inspired/copied from CONFIGURATION.md
							
							
							
							
							
						 | 
						
							2018-11-10 13:09:38 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								db67c9b118
								
							
						 | 
						
							
							
								
								config/config.md: scope_options_enabled also addresses subject
							
							
							
							
							
						 | 
						
							2018-11-10 13:09:38 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								79bdc3db19
								
							
						 | 
						
							
							
								
								config/config.md: Fill all the blanks
							
							
							
							
							
						 | 
						
							2018-11-10 13:09:37 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								0189ccd4d9
								
							
						 | 
						
							
							
								
								config/config.md: Complete it [WIP]
							
							
							
							
							
						 | 
						
							2018-11-10 13:09:37 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								ee41dbeca5
								
							
						 | 
						
							
							
								
								config/config.md: Create
							
							
							
							
							
						 | 
						
							2018-11-10 13:09:37 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								a880e0a527
								
							
						 | 
						
							
							
								
								Merge branch 'feature/upload-limits' into 'develop'
							
							
							
							
							
							
							
							configurable media upload limits
Closes #118
See merge request pleroma/pleroma!401 
							
						 | 
						
							2018-10-29 20:14:10 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								36825932eb
								
							
						 | 
						
							
							
								
								s3 uploader: add new feature to force public attachment URIs to go through media proxy
							
							
							
							
							
						 | 
						
							2018-10-29 18:00:59 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								167d3789a5
								
							
						 | 
						
							
							
								
								activitypub: upload: pass through an upload limit if one is provided
							
							
							
							
							
						 | 
						
							2018-10-29 16:43:05 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scarlett
								
							 
						 | 
						
							
							
							
							
								
							
							
								ae5beb7b64
								
							
						 | 
						
							
							
								
								Make finmoji optional
							
							
							
							
							
						 | 
						
							2018-10-25 17:58:46 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scarlett
								
							 
						 | 
						
							
							
							
							
								
							
							
								3e79d941c8
								
							
						 | 
						
							
							
								
								Defaults for new frontend options in config.exs
							
							
							
							
							
						 | 
						
							2018-10-21 12:54:37 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								2154c5dcd8
								
							
						 | 
						
							
							
								
								lib/pleroma/html.ex: Use macros for valid_schemes, change config for schemes
							
							
							
							
							
						 | 
						
							2018-10-18 07:58:15 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								08d5ad71b6
								
							
						 | 
						
							
							
								
								nodeinfo: allow opting out of MRF transparency
							
							
							
							
							
						 | 
						
							2018-10-07 01:23:38 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								7b3fff9af8
								
							
						 | 
						
							
							
								
								{mastodon api, twitter api}: make the follow handshake timeout configurable
							
							
							
							
							
						 | 
						
							2018-10-07 01:05:59 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								285ac80c36
								
							
						 | 
						
							
							
								
								config: allow for accepted post formats to be configured
							
							
							
							
							
						 | 
						
							2018-10-05 21:02:17 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								16307da311
								
							
						 | 
						
							
							
								
								twitterapi: frontend config: add formattingOptionsEnabled
							
							
							
							
							
						 | 
						
							2018-10-05 20:49:34 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								5acfa2e091
								
							
						 | 
						
							
							
								
								config: pass inline images through mediaproxy (closes #275)
							
							
							
							
							
						 | 
						
							2018-09-16 02:16:17 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								342ed84446
								
							
						 | 
						
							
							
								
								MRF: add policy for normalizing HTML markup (local and remote) to a specific policy
							
							
							
							
							
						 | 
						
							2018-09-16 01:25:36 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								358f88e10a
								
							
						 | 
						
							
							
								
								html: allow inline images by default (because of custom emoji)
							
							
							
							
							
						 | 
						
							2018-09-10 00:24:19 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								40e2f6e500
								
							
						 | 
						
							
							
								
								html: add default scrubbing profile and configuration knobs
							
							
							
							
							
						 | 
						
							2018-09-10 00:14:57 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								255f46d7ab
								
							
						 | 
						
							
							
								
								html: new module providing a configurable markup scrubbing policy
							
							
							
							
							
						 | 
						
							2018-09-10 00:13:57 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hakaba Hitoyo
								
							 
						 | 
						
							
							
							
							
								
							
							
								4e1bb7bccb
								
							
						 | 
						
							
							
								
								make limit for /api/v1/suggestions
							
							
							
							
							
						 | 
						
							2018-09-09 13:57:23 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								530561a091
								
							
						 | 
						
							
							
								
								Merge branch 'add-secure-and-samesite-cookie-flags' into 'develop'
							
							
							
							
							
							
							
							Add Secure and SameSite cookie flags
See merge request pleroma/pleroma!302 
							
						 | 
						
							2018-09-07 23:55:42 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								754deb26dd
								
							
						 | 
						
							
							
								
								[Pleroma.Uploaders.Local]: Add configuration for custom url path
							
							
							
							
							
							
							
							One use-case being an external caching proxy 
							
						 | 
						
							2018-09-02 19:00:16 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								c921d99898
								
							
						 | 
						
							
							
								
								config: add ability to disable Pleroma FE config management (closes #276)
							
							
							
							
							
						 | 
						
							2018-09-01 21:05:32 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								de5bd6fc65
								
							
						 | 
						
							
							
								
								config: fix up defaults for s3 endpoint configuration
							
							
							
							
							
						 | 
						
							2018-08-31 04:43:15 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								856b5e1ca4
								
							
						 | 
						
							
							
								
								config: chase pleroma-fe updates from MR pleroma-fe!324.
							
							
							
							
							
						 | 
						
							2018-08-31 04:01:21 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thurloat
								
							 
						 | 
						
							
							
							
							
								
							
							
								8d2d7a8859
								
							
						 | 
						
							
							
								
								Implement uploader behaviour
							
							
							
							
							
							
							
							run formatter <# 
							
						 | 
						
							2018-08-28 09:57:41 -03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thurloat
								
							 
						 | 
						
							
							
							
							
								
							
							
								0df558a6a5
								
							
						 | 
						
							
							
								
								cleaning up a bit.
							
							
							
							
							
						 | 
						
							2018-08-27 22:45:53 -03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thurloat
								
							 
						 | 
						
							
							
							
							
								
							
							
								709816a0f8
								
							
						 | 
						
							
							
								
								example of flexible storage backends
							
							
							
							
							
						 | 
						
							2018-08-27 22:20:54 -03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								e95d958b52
								
							
						 | 
						
							
							
								
								sample config: show how amazon s3 support is activated, including third-party clones like wasabi
							
							
							
							
							
						 | 
						
							2018-08-27 23:30:53 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									shibayashi
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								b9a642da1e
								
							
						 | 
						
							
							
								
								Add Secure and SameSite cookie flags
							
							
							
							
							
						 | 
						
							2018-08-28 00:40:58 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								0f5bff8c66
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into 'feature/relay'
							
							
							
							
							
							
							
							# Conflicts:
#   lib/pleroma/web/activity_pub/utils.ex 
							
						 | 
						
							2018-08-26 21:06:15 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									hakabahitoyo
								
							 
						 | 
						
							
							
							
							
								
							
							
								89e2cb0828
								
							
						 | 
						
							
							
								
								remove unused settings
							
							
							
							
							
						 | 
						
							2018-08-26 17:21:57 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								09cb402203
								
							
						 | 
						
							
							
								
								fe config: add collapse_message_with_subject fe option
							
							
							
							
							
						 | 
						
							2018-08-24 18:21:42 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								183ccd1812
								
							
						 | 
						
							
							
								
								Merge branch 'dev-lanodan-url-regex' into 'develop'
							
							
							
							
							
							
							
							lib/pleroma/formatter.ex: Fix URL regex
Closes #127
See merge request pleroma/pleroma!69 
							
						 | 
						
							2018-08-16 15:41:16 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								9908cf8fda
								
							
						 | 
						
							
							
								
								Merge branch 'feature/suggestions-api-with-third-party-recommendation-engine' into 'develop'
							
							
							
							
							
							
							
							Feature / Suggestions API with third party recommendation engine
See merge request pleroma/pleroma!254 
							
						 | 
						
							2018-08-15 07:47:33 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								7bed350a23
								
							
						 | 
						
							
							
								
								config: allow relaying to be disabled
							
							
							
							
							
						 | 
						
							2018-08-06 08:22:10 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hakaba Hitoyo
								
							 
						 | 
						
							
							
							
							
								
							
							
								f72cfada1a
								
							
						 | 
						
							
							
								
								add suggestions/web config
							
							
							
							
							
						 | 
						
							2018-08-02 18:03:35 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								d5091c3175
								
							
						 | 
						
							
							
								
								Allow additionnal schemes in the config
							
							
							
							
							
						 | 
						
							2018-08-01 02:52:42 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Tristan Mahé
								
							 
						 | 
						
							
							
							
							
								
							
							
								bc2668bb63
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into feature/filter_exif
							
							
							
							
							
						 | 
						
							2018-07-19 17:44:18 -07:00 | 
						
						
							
							
							
								
							
							
						 |