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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hakaba Hitoyo 
								
							 
						 
						
							
							
							
							
								
							
							
								cc9c062b55 
								
							 
						 
						
							
							
								
								merge  
							
							 
							
							
							
						 
						
							2018-07-19 17:42:00 +09:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hakaba Hitoyo 
								
							 
						 
						
							
							
							
							
								
							
							
								b12d17d2ce 
								
							 
						 
						
							
							
								
								configurable timeout  
							
							 
							
							
							
						 
						
							2018-07-18 13:36:20 +09:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hakaba Hitoyo 
								
							 
						 
						
							
							
							
							
								
							
							
								e4dd58307a 
								
							 
						 
						
							
							
								
								better configuration  
							
							 
							
							
							
						 
						
							2018-07-18 09:58:59 +09:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								2b3f049b06 
								
							 
						 
						
							
							
								
								config: formatting  
							
							 
							
							
							
						 
						
							2018-07-18 00:05:36 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								b23630076f 
								
							 
						 
						
							
							
								
								TwitterAPI: present pleroma frontend config in API  
							
							 
							
							
							
						 
						
							2018-07-17 15:46:24 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								cf219b6add 
								
							 
						 
						
							
							
								
								config: make instance description configurable  
							
							 
							
							
							
						 
						
							2018-07-17 15:46:23 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hakaba Hitoyo 
								
							 
						 
						
							
							
							
							
								
							
							
								091b7925d3 
								
							 
						 
						
							
							
								
								debug  
							
							 
							
							
							
						 
						
							2018-07-17 17:20:13 +09:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hakaba Hitoyo 
								
							 
						 
						
							
							
							
							
								
							
							
								d76f0d87be 
								
							 
						 
						
							
							
								
								do nothing if configuration is skipped  
							
							 
							
							
							
						 
						
							2018-07-17 16:45:18 +09:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									hakabahitoyo 
								
							 
						 
						
							
							
							
							
								
							
							
								e7c580828c 
								
							 
						 
						
							
							
								
								format  
							
							 
							
							
							
						 
						
							2018-07-15 20:36:26 +09:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									hakabahitoyo 
								
							 
						 
						
							
							
							
							
								
							
							
								f96244006e 
								
							 
						 
						
							
							
								
								change api  
							
							 
							
							
							
						 
						
							2018-07-14 12:07:09 +09:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									hakabahitoyo 
								
							 
						 
						
							
							
							
							
								
							
							
								127882a5d5 
								
							 
						 
						
							
							
								
								configurable  
							
							 
							
							
							
						 
						
							2018-07-14 11:41:09 +09:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Tristan Mahé 
								
							 
						 
						
							
							
							
							
								
							
							
								5469fb9561 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into feature/filter_exif  
							
							 
							
							
							
						 
						
							2018-07-13 11:14:37 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Jorty 
								
							 
						 
						
							
							
							
							
								
							
							
								748fff6544 
								
							 
						 
						
							
							
								
								Fix auto-shortcode emoji  
							
							 
							
							... 
							
							
							
							Emoji were broken due to `Pleroma.Formatter` not knowing about the
auto-shortcode emoji. This moves that logic from
`Pleroma.Web.TwitterAPI.UtilController` to `Pleroma.Formatter`.
Additionally, it's now possible to specify multiple shortcode globs, and
the default globs were changed to `["/emoji/custom/**/*.png"]`, since
that's in the .gitignore and the files there would have to be shortcode
emoji anyway. 
							
						 
						
							2018-06-30 21:31:08 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Jorty 
								
							 
						 
						
							
							
							
							
								
							
							
								c171f9790b 
								
							 
						 
						
							
							
								
								Move emoji glob setting to config.exs  
							
							 
							
							... 
							
							
							
							Also, a bit of formatting, and the glob includes an "/emoji/" prefix to
make it more intuitive to users 
							
						 
						
							2018-06-30 17:58:44 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Tristan Mahé 
								
							 
						 
						
							
							
							
							
								
							
							
								c67cf8e9af 
								
							 
						 
						
							
							
								
								format...  
							
							 
							
							
							
						 
						
							2018-06-26 13:49:57 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Tristan Mahé 
								
							 
						 
						
							
							
							
							
								
							
							
								cb21bf5fc2 
								
							 
						 
						
							
							
								
								filter exif data  #187  
							
							 
							
							
							
						 
						
							2018-06-26 13:45:47 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								dfc96f222c 
								
							 
						 
						
							
							
								
								Merge branch 'feature/configurable-blocks' into 'develop'  
							
							 
							
							... 
							
							
							
							Add more configurability to how blocks work
See merge request pleroma/pleroma!203  
							
						 
						
							2018-06-25 06:12:29 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									lambda 
								
							 
						 
						
							
							
							
							
								
							
							
								92135d00fc 
								
							 
						 
						
							
							
								
								Merge branch 'feature/application-xml-mime' into 'develop'  
							
							 
							
							... 
							
							
							
							config: add application/xml mimetype support.
See merge request pleroma/pleroma!228  
							
						 
						
							2018-06-24 13:28:42 +00:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									William Pitcock 
								
							 
						 
						
							
							
							
							
								
							
							
								60d6038be5 
								
							 
						 
						
							
							
								
								mrf simple: add accept lists  
							
							 
							
							... 
							
							
							
							accept lists supplement reject lists by requiring that any message accepted by contained
by the accept list.
in other words, this functionality can be used to implement instances similar to
awoo.space. 
							
						 
						
							2018-06-19 21:28:24 +00:00