kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								b0adea30b3
								
							
						 | 
						
							
							
								
								Merge branch 're-mrf' into 'develop'
							
							
							
							
							
							
							
							Add a MRF Policy for appending re: to identical subjects in replies.
See merge request pleroma/pleroma!499 
							
						 | 
						
							2018-12-06 15:36:41 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								0020b22688
								
							
						 | 
						
							
							
								
								add VAPID to test config
							
							
							
							
							
						 | 
						
							2018-12-06 20:17:00 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scarlett
								
							 
						 | 
						
							
							
							
							
								
							
							
								8a1df182cf
								
							
						 | 
						
							
							
								
								Add a MRF Policy for appending re: to identical subjects in replies.
							
							
							
							
							
						 | 
						
							2018-12-04 23:35:07 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								ec34de0c1f
								
							
						 | 
						
							
							
								
								WebSub fix test
							
							
							
							
							
						 | 
						
							2018-12-04 14:03:32 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Maksim Pechnikov
								
							 
						 | 
						
							
							
							
							
								
							
							
								3ce16e5a56
								
							
						 | 
						
							
							
								
								init tesla and updated the http requests in Pleroma.Web.Websub
							
							
							
							
							
						 | 
						
							2018-12-04 14:03:32 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								d9a4aed3b3
								
							
						 | 
						
							
							
								
								replace try/catch with File.Exists? in dev.exs
							
							
							
							
							
						 | 
						
							2018-12-01 17:38:45 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								680716b3c9
								
							
						 | 
						
							
							
								
								Config docs
							
							
							
							
							
						 | 
						
							2018-11-30 18:02:51 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								02d3dc6869
								
							
						 | 
						
							
							
								
								Uploads fun, part. 2
							
							
							
							
							
						 | 
						
							2018-11-30 18:02:37 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								b19597f602
								
							
						 | 
						
							
							
								
								reverse proxy / uploads
							
							
							
							
							
						 | 
						
							2018-11-30 18:00:47 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								761ed2355f
								
							
						 | 
						
							
							
								
								config/prod.exs: Remove server: true
							
							
							
							
							
							
							
							This breaks mix tasks in regular Elixir 
							
						 | 
						
							2018-11-30 03:05:34 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									William Pitcock
								
							 
						 | 
						
							
							
							
							
								
							
							
								6979eeda34
								
							
						 | 
						
							
							
								
								config: document mrf_user_allowlist
							
							
							
							
							
						 | 
						
							2018-11-26 23:54:46 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								182e3e8da2
								
							
						 | 
						
							
							
								
								Merge branch 'feature/improve-version' into 'develop'
							
							
							
							
							
							
							
							Improved version string
See merge request pleroma/pleroma!467 
							
						 | 
						
							2018-11-21 16:53:38 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								bc5cf2c192
								
							
						 | 
						
							
							
								
								Improved version string
							
							
							
							
							
						 | 
						
							2018-11-20 17:55:03 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									href
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								bcecdc3ab1
								
							
						 | 
						
							
							
								
								Various runtime configuration fixes
							
							
							
							
							
						 | 
						
							2018-11-19 10:09:24 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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 | 
						
						
							
							
							
								
							
							
						 |