Alexander Strizhakov
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								ed189568f3
								
							
						 | 
						
							
							
								
								moving mrf settings from instance to separate group
							
							
							
							
							
						 | 
						
							2020-06-16 18:32:18 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex Gleason
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								bedc558809
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'upstream/develop' into accept-deletes
							
							
							
							
							
						 | 
						
							2020-04-20 10:15:40 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex Gleason
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								b54c8813d6
								
							
						 | 
						
							
							
								
								Add :reject_deletes option to SimplePolicy
							
							
							
							
							
						 | 
						
							2020-04-20 10:11:06 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								617a9f6208
								
							
						 | 
						
							
							
								
								Merge branch 'mrf-docs-update' into 'develop'
							
							
							
							
							
							
							
							Expand MRF SimplePolicy docs
See merge request pleroma/pleroma!2370 
							
						 | 
						
							2020-04-20 12:57:45 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ilja
								
							 
						 | 
						
							
							
							
							
								
							
							
								aa0a4a1e78
								
							
						 | 
						
							
							
								
								small fix in the rewrite_policy example
							
							
							
							
							
						 | 
						
							2020-04-15 19:03:27 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex Gleason
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								ed894802d5
								
							
						 | 
						
							
							
								
								Expand MRF SimplePolicy docs
							
							
							
							
							
						 | 
						
							2020-04-12 18:46:47 -05:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									feld
								
							 
						 | 
						
							
							
							
							
								
							
							
								53a7680c16
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into 'fix/mrf-sample-doc'
							
							
							
							
							
							
							
							# Conflicts:
#   docs/configuration/mrf.md 
							
						 | 
						
							2020-02-18 20:58:15 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Felder
								
							 
						 | 
						
							
							
							
							
								
							
							
								2c95b0fab9
								
							
						 | 
						
							
							
								
								Make the sample code actually compile
							
							
							
							
							
						 | 
						
							2020-02-13 15:19:01 -06:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								815f659ed8
								
							
						 | 
						
							
							
								
								Fix MRF documentation
							
							
							
							
							
						 | 
						
							2020-02-07 22:17:08 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								acc62f327d
								
							
						 | 
						
							
							
								
								Rename some directories because MkDocs uses them for categories
							
							
							
							
							
						 | 
						
							2019-10-02 23:28:45 +03:00 | 
						
						
							
							
							
								
							
							
						 |