Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								589bffa57d 
								
							 
						 
						
							
							
								
								Merge branch 'fix/mrf-sample-doc' of git.pleroma.social:pleroma/pleroma into fix/mrf-sample-doc  
							
							
							
						 
						
							2020-02-14 11:06:04 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								31749559e1 
								
							 
						 
						
							
							
								
								Fix MRF docs further. I don't think anyone has actually tested with the old docs.  
							
							
							
						 
						
							2020-02-14 11:04:27 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									feld 
								
							 
						 
						
							
							
							
							
								
							
							
								6caf6a86c5 
								
							 
						 
						
							
							
								
								Apply suggestion to docs/configuration/mrf.md  
							
							
							
						 
						
							2020-02-14 16:55:52 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								88a76d0142 
								
							 
						 
						
							
							
								
								Update suggested path for location of your custom MRF  
							
							
							
						 
						
							2020-02-14 10:55:18 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								0ddcd67d32 
								
							 
						 
						
							
							
								
								Update cheatsheet.md and config/description.exs  
							
							
							
						 
						
							2020-02-14 16:53:53 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								2c95b0fab9 
								
							 
						 
						
							
							
								
								Make the sample code actually compile  
							
							
							
						 
						
							2020-02-13 15:19:01 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6875ccb6bf 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/new-registrations-digest  
							
							
							
						 
						
							2020-02-11 13:54:55 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								6813c0302c 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1383  
							
							
							
						 
						
							2020-02-10 20:49:20 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								815f659ed8 
								
							 
						 
						
							
							
								
								Fix MRF documentation  
							
							
							
						 
						
							2020-02-07 22:17:08 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								6722dade42 
								
							 
						 
						
							
							
								
								Simplify in-database config docs  
							
							... 
							
							
							
							Large part of it was no longer true (i.e none of the changes need
recompilation anymore and you can't brick an instance by changing them,
it's not necessary to manually truncate the db manually anymore) 
							
						 
						
							2020-02-06 15:00:33 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lain Soykaf 
								
							 
						 
						
							
							
							
							
								
							
							
								90b862e7ab 
								
							 
						 
						
							
							
								
								Add cheatsheet entry  
							
							
							
						 
						
							2020-02-04 16:22:13 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								2c40c8b4a2 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1383  
							
							
							
						 
						
							2020-02-03 21:42:36 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								01537cc1d6 
								
							 
						 
						
							
							
								
								Apply suggestion to docs/configuration/cheatsheet.md  
							
							
							
						 
						
							2020-01-30 18:28:28 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								ff4bef140a 
								
							 
						 
						
							
							
								
								Apply suggestion to docs/configuration/cheatsheet.md  
							
							
							
						 
						
							2020-01-30 13:24:24 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								889965141a 
								
							 
						 
						
							
							
								
								RemoteIp: only trust X-Forwarded-For  
							
							... 
							
							
							
							Our nginx config will happily pass `Forwarded`/`X-Real-IP` from the
client. Caddy, Apache and Varnish pass `X-Forwarded-For` as well anyway. 
							
						 
						
							2020-01-30 00:06:58 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								f5cb2af85a 
								
							 
						 
						
							
							
								
								cheatsheet: improve rate limiter docs and add new limiters  
							
							
							
						 
						
							2020-01-30 00:06:58 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								21a2a05407 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1383  
							
							
							
						 
						
							2020-01-28 20:39:20 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Hakaba Hitoyo 
								
							 
						 
						
							
							
							
							
								
							
							
								dabd535e43 
								
							 
						 
						
							
							
								
								Remove user recommendation by third party engine  
							
							
							
						 
						
							2020-01-27 13:21:50 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								4c59e9477a 
								
							 
						 
						
							
							
								
								Merge branch 'feature/new-registrations-digest' of git.pleroma.social:pleroma/pleroma into feature/new-registrations-digest  
							
							
							
						 
						
							2020-01-22 15:59:37 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b8b90d967a 
								
							 
						 
						
							
							
								
								Update documentation  
							
							
							
						 
						
							2020-01-22 22:28:06 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								cf19bf3c7c 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1383  
							
							
							
						 
						
							2020-01-22 20:20:39 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								e761d76e4f 
								
							 
						 
						
							
							
								
								Apply suggestion to docs/configuration/cheatsheet.md  
							
							
							
						 
						
							2020-01-22 16:58:50 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim 
								
							 
						 
						
							
							
							
							
								
							
							
								d43c9ab286 
								
							 
						 
						
							
							
								
								Apply suggestion to docs/configuration/cheatsheet.md  
							
							
							
						 
						
							2020-01-22 16:58:43 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								b7908844f2 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1383  
							
							
							
						 
						
							2020-01-13 12:41:07 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								7d128ca208 
								
							 
						 
						
							
							
								
								dynamic_configuration renaming  
							
							... 
							
							
							
							and moving it from instance settings 
							
						 
						
							2020-01-10 19:34:19 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander Strizhakov 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								00aff5f78c 
								
							 
						 
						
							
							
								
								syncing new setting to descriptions.exs  
							
							
							
						 
						
							2020-01-10 17:54:54 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									RX14 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								b55f2563d0 
								
							 
						 
						
							
							
								
								Fix SMTP mailer example  
							
							... 
							
							
							
							`ssl: true` and `tls: :always` tries to use both TLS and STARTTLS on the
same SMTP connection, causing it to fail. 
							
						 
						
							2020-01-05 19:00:48 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								54c9db38c8 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1383  
							
							
							
						 
						
							2019-12-21 20:38:59 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								36d66d9655 
								
							 
						 
						
							
							
								
								Fix typo  
							
							
							
						 
						
							2019-12-17 02:06:58 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								a12b6454bb 
								
							 
						 
						
							
							
								
								Add an option to require fetches to be signed  
							
							
							
						 
						
							2019-12-16 22:24:03 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								67cb46e15d 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1383  
							
							
							
						 
						
							2019-12-14 21:44:10 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								7528322f83 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/custom-runtime-modules  
							
							
							
						 
						
							2019-12-13 01:51:52 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								e536796984 
								
							 
						 
						
							
							
								
								Add native captcha and enable it by default.  
							
							
							
						 
						
							2019-12-12 17:39:39 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								c6f2735ffa 
								
							 
						 
						
							
							
								
								Remove runtime modules config example  
							
							
							
						 
						
							2019-12-12 14:37:57 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								c098dec473 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into feature/custom-runtime-modules  
							
							
							
						 
						
							2019-12-10 00:16:43 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								5876a9cb79 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1383  
							
							
							
						 
						
							2019-12-08 19:52:46 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								157bceeda9 
								
							 
						 
						
							
							
								
								Move runtime configuration from :instance to :modules  
							
							
							
						 
						
							2019-12-06 15:04:46 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								48ae3c4347 
								
							 
						 
						
							
							
								
								Add support for custom modules  
							
							
							
						 
						
							2019-12-05 20:18:25 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								9487995e8b 
								
							 
						 
						
							
							
								
								Cheat Sheet: Addg chat_limit information.  
							
							
							
						 
						
							2019-12-04 12:51:06 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								b7c449118b 
								
							 
						 
						
							
							
								
								Merge branch 'develop' into issue/1383  
							
							
							
						 
						
							2019-11-28 21:27:01 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Maksim Pechnikov 
								
							 
						 
						
							
							
							
							
								
							
							
								0e9be6bafa 
								
							 
						 
						
							
							
								
								moved OAuth.Token.CleanWorker to Oban Periodic jobs  
							
							
							
						 
						
							2019-11-25 14:32:20 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sadposter 
								
							 
						 
						
							
							
							
							
								
							
							
								e2dc89069d 
								
							 
						 
						
							
							
								
								move documentation section for http client  
							
							
							
						 
						
							2019-11-25 11:26:42 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sadposter 
								
							 
						 
						
							
							
							
							
								
							
							
								d3656c2725 
								
							 
						 
						
							
							
								
								add ability to set a custom user-agent string  
							
							
							
						 
						
							2019-11-25 09:53:11 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								36686f5245 
								
							 
						 
						
							
							
								
								Support authentication via x-admin-token HTTP header  
							
							
							
						 
						
							2019-11-19 15:58:20 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ariadne Conill 
								
							 
						 
						
							
							
							
							
								
							
							
								29f49bf5fa 
								
							 
						 
						
							
							
								
								docs: document MRF ObjectAgePolicy  
							
							
							
						 
						
							2019-11-14 19:47:54 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								04473677cc 
								
							 
						 
						
							
							
								
								docs: move static-fe docs under a proper category  
							
							
							
						 
						
							2019-11-11 23:24:15 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								2cc043591c 
								
							 
						 
						
							
							
								
								Merge branch 'feature/static-fe' into 'develop'  
							
							... 
							
							
							
							Static frontend
See merge request pleroma/pleroma!1917  
							
						 
						
							2019-11-11 19:10:44 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								ab2e61238e 
								
							 
						 
						
							
							
								
								Add a warning about Pg version to the RUM related docs  
							
							
							
						 
						
							2019-11-11 19:13:07 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Phil Hagelberg 
								
							 
						 
						
							
							
							
							
								
							
							
								6ef8049664 
								
							 
						 
						
							
							
								
								Add changelog entry, cheatsheet docs, and alphabetize.  
							
							
							
						 
						
							2019-11-09 18:09:29 -08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								518b0193a1 
								
							 
						 
						
							
							
								
								Big config cheatsheet revamp  
							
							... 
							
							
							
							Categorize things, remove old deprecation warnings, consistently place
dots in unordered lists, fix links, etc. 
							
						 
						
							2019-11-10 03:33:36 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								752d0c6833 
								
							 
						 
						
							
							
								
								Relocate to configuration subdir  
							
							
							
						 
						
							2019-10-22 15:14:04 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									KokaKiwi 
								
							 
						 
						
							
							
							
							
								
							
							
								df3c2dfd8b 
								
							 
						 
						
							
							
								
								Add documentation for PWA manifest configuration.  
							
							
							
						 
						
							2019-10-19 12:15:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Sergey Suprunenko 
								
							 
						 
						
							
							
							
							
								
							
							
								4b3f77a99f 
								
							 
						 
						
							
							
								
								Extract RSS Feed functionality from OStatus  
							
							
							
						 
						
							2019-10-07 12:20:41 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								e4ab9a05dd 
								
							 
						 
						
							
							
								
								cheatsheet.md: link to pleroma-fe docs for :frontend_configurations  
							
							
							
						 
						
							2019-10-04 00:10:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								1cae564b5d 
								
							 
						 
						
							
							
								
								Move config task docs to a separate file and mark it as WIP  
							
							
							
						 
						
							2019-10-03 14:12:57 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								8e08d5b233 
								
							 
						 
						
							
							
								
								MkDocs does not like if a paragraph doesn't have a newline after it  
							
							
							
						 
						
							2019-10-03 11:02:07 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								2656f41818 
								
							 
						 
						
							
							
								
								Remove silent mode note as it's no longer relevant  
							
							
							
						 
						
							2019-10-03 10:57:27 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								aefb4dcff5 
								
							 
						 
						
							
							
								
								Cheatsheet: Use note/warning blocks instead of bold text  
							
							
							
						 
						
							2019-10-03 10:54:41 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								e560d65db3 
								
							 
						 
						
							
							
								
								Fix a typo in activity expirations  
							
							
							
						 
						
							2019-10-03 10:45:40 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								25849157aa 
								
							 
						 
						
							
							
								
								Remove fe settings from :instance as they no longer do anything  
							
							
							
						 
						
							2019-10-03 10:43:38 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								4e70009490 
								
							 
						 
						
							
							
								
								Move bold text in RemoveIp description into a proper warning  
							
							
							
						 
						
							2019-10-03 10:39:53 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								cb162678df 
								
							 
						 
						
							
							
								
								Add missing language spec  
							
							
							
						 
						
							2019-10-03 10:37:34 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								66450f8615 
								
							 
						 
						
							
							
								
								Cheatsheet: Move the deprecated config warning into a warning block  
							
							
							
						 
						
							2019-10-03 10:36:01 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								2cbe2dcbde 
								
							 
						 
						
							
							
								
								Oops  
							
							
							
						 
						
							2019-10-03 10:31:59 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								2767c413fb 
								
							 
						 
						
							
							
								
								Remove a reference to inline docs since everything it describes is  
							
							... 
							
							
							
							described in the cheatsheet already and add A TODO 
							
						 
						
							2019-10-03 00:36:18 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								74d682a09e 
								
							 
						 
						
							
							
								
								Remove Small customizations as it's contents have been integrated into  
							
							... 
							
							
							
							static_dir.md 
							
						 
						
							2019-10-03 00:02:01 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								838ff12ec5 
								
							 
						 
						
							
							
								
								Remove "General tips for customizing Pleroma FE" because it's no longer  
							
							... 
							
							
							
							relevant and we have actual fe docs now 
							
						 
						
							2019-10-02 23:58:57 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								03e1898917 
								
							 
						 
						
							
							
								
								Rename "Configuration" to "Configuration Cheat Sheet" and explain a bit  
							
							... 
							
							
							
							about how Pleroma Configuration works 
							
						 
						
							2019-10-02 23:54:55 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								acc62f327d 
								
							 
						 
						
							
							
								
								Rename some directories because MkDocs uses them for categories  
							
							
							
						 
						
							2019-10-02 23:28:45 +03:00