lain 
								
							 
						 
						
							
							
							
							
								
							
							
								e221c681dc 
								
							 
						 
						
							
							
								
								New frontend configuration mechanism.  
							
							
							
						 
						
							2019-01-23 12:40:57 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								74346a7035 
								
							 
						 
						
							
							
								
								Fix merge conflict  
							
							
							
						 
						
							2019-01-18 18:31:25 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Mark Felder 
								
							 
						 
						
							
							
							
							
								
							
							
								8c368d42a2 
								
							 
						 
						
							
							
								
								Make attachment links configurable  
							
							... 
							
							
							
							Thanks @href! 
							
						 
						
							2019-01-17 15:48:14 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								4d5f15cd42 
								
							 
						 
						
							
							
								
								Introduce optional unfurling of nsfw content  
							
							
							
						 
						
							2019-01-17 11:00:02 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								bfe2a11a6b 
								
							 
						 
						
							
							
								
								Add config doc  
							
							
							
						 
						
							2019-01-16 10:45:56 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scarlett 
								
							 
						 
						
							
							
							
							
								
							
							
								9eba6b96dc 
								
							 
						 
						
							
							
								
								Fix spellign.  
							
							
							
						 
						
							2019-01-11 09:55:33 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								48591aab98 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts  
							
							... 
							
							
							
							# Conflicts:
#	docs/config.md 
							
						 
						
							2019-01-09 16:56:31 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								0c750bc432 
								
							 
						 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts  
							
							
							
						 
						
							2019-01-08 16:32:07 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Egor Kislitsyn 
								
							 
						 
						
							
							
							
							
								
							
							
								6428ef77ad 
								
							 
						 
						
							
							
								
								add default configuration for the pinned statuses and some doc  
							
							
							
						 
						
							2019-01-08 16:11:03 +07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								0fae04c4e3 
								
							 
						 
						
							
							
								
								Add a setting for users to autofollow on sign up.  
							
							
							
						 
						
							2019-01-08 09:57:53 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								c9b99d4486 
								
							 
						 
						
							
							
								
								config/config.exs: Add syslog backends  
							
							
							
						 
						
							2019-01-06 01:11:53 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
							
							
								
							
							
								b73a1a33de 
								
							 
						 
						
							
							
								
								Merge branch 'captcha' into 'develop'  
							
							... 
							
							
							
							Make captcha (kocaptcha) stateless
See merge request pleroma/pleroma!585  
							
						 
						
							2019-01-03 17:04:27 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								1a0391c8a4 
								
							 
						 
						
							
							
								
								Add documentation.  
							
							
							
						 
						
							2019-01-01 17:40:42 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								286632dfa2 
								
							 
						 
						
							
							
								
								Add docs/Admin-API.md  
							
							... 
							
							
							
							[ci skip] 
							
						 
						
							2018-12-31 12:27:46 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									lain 
								
							 
						 
						
							
							
							
							
								
							
							
								5811e65e67 
								
							 
						 
						
							
							
								
								Add some hard limits on inserted activities.  
							
							
							
						 
						
							2018-12-26 12:39:35 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								c76179419d 
								
							 
						 
						
							
							
								
								Renamed the things  
							
							
							
						 
						
							2018-12-23 11:14:29 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Karen Konou 
								
							 
						 
						
							
							
							
							
								
							
							
								c92f91ffeb 
								
							 
						 
						
							
							
								
								Add documentation  
							
							
							
						 
						
							2018-12-23 10:41:56 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Ekaterina Vaartis 
								
							 
						 
						
							
							
							
							
								
							
							
								336e37d98f 
								
							 
						 
						
							
							
								
								Make captcha (kocaptcha) stateless  
							
							... 
							
							
							
							Also rename seconds_retained to seconds_valid since that's how it is
now. Put it down from 180 to 20 seconds. The answer data is now
stored in an encrypted text transfered to the client and back, so no
ETS is needed 
							
						 
						
							2018-12-21 09:55:47 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								2e2030ada8 
								
							 
						 
						
							
							
								
								Merge branch '114_email_confirmation' into 'develop'  
							
							... 
							
							
							
							[#114 ] Email confirmation
See merge request pleroma/pleroma!546  
							
						 
						
							2018-12-20 13:28:36 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									kaniini 
								
							 
						 
						
							
							
							
							
								
							
							
								fda148a9a2 
								
							 
						 
						
							
							
								
								Merge branch 'documentation/copy-pleroma-api' into 'develop'  
							
							... 
							
							
							
							Pleroma-API.md: Import from /wikis/Pleroma-only-api-endpoints
See merge request pleroma/pleroma!571  
							
						 
						
							2018-12-20 04:01:54 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									rinpatch 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								d6b133ec51 
								
							 
						 
						
							
							
								
								Pleroma-API.md: Additionnal endpoints  
							
							
							
						 
						
							2018-12-18 18:33:39 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Haelwenn (lanodan) Monnier 
								
							 
						 
						
							
							
								
								
							
							
							
								
							
							
								6adea5a7b2 
								
							 
						 
						
							
							
								
								Move to docs  
							
							
							
						 
						
							2018-12-18 17:16:26 +01:00