| 
							
						 | 
						
							
							
								
							
							
	967ecb4205
						 | 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/develop' into 1610-performance
							
							
							
							
							
							
							
							Conflicts:
	include/Core/Config.php
	include/Core/PConfig.php 
							
						 | 
						
							2016-10-25 16:16:01 +00:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hypolite Petovan
								
							 
						 | 
						
							
							
								
							
							
	8da5a23267
						 | 
						
							
							
								
								
								Improved doc formatting
							
							
							
							
							
						 | 
						
							2016-10-24 11:57:25 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	ee5ada6991
						 | 
						
							
							
								
								
								We now use memcache if configured and installed.
							
							
							
							
							
						 | 
						
							2016-10-23 21:59:40 +00:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hypolite Petovan
								
							 
						 | 
						
							
							
								
							
							
	2ecd1f5d09
						 | 
						
							
							
								
								
								Update settings documentation
							
							
							
							
							
						 | 
						
							2016-10-23 07:57:40 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									ben-utzer
								
							 
						 | 
						
							
							
								
							
							
	2040cb4473
						 | 
						
							
							
								
								
								Update htconfig.md
							
							
							
							
							
							
							
							typo, siehe auch https://github.com/friendica/friendica/pull/2754 
							
						 | 
						
							2016-09-05 00:22:39 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	4b29937a74
						 | 
						
							
							
								
								
								Worker: New value for cooldown time after each function call
							
							
							
							
							
						 | 
						
							2016-07-13 19:43:16 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	5420c98ff0
						 | 
						
							
							
								
								
								removed some copy&paste fragments
							
							
							
							
							
						 | 
						
							2016-06-04 12:30:24 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	e33defbe3e
						 | 
						
							
							
								
								
								Added documentation
							
							
							
							
							
						 | 
						
							2016-06-04 12:23:12 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	76b24f61a9
						 | 
						
							
							
								
								
								New (experimental) value to define the maximum level of database connections for the worker
							
							
							
							
							
						 | 
						
							2016-04-23 10:11:09 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	bc21fca345
						 | 
						
							
							
								
								
								Remove the setting description from the documentation since it isn't a hidden one anymore.
							
							
							
							
							
						 | 
						
							2016-03-11 23:44:46 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	902820b30d
						 | 
						
							
							
								
								
								Added documentation
							
							
							
							
							
						 | 
						
							2016-02-10 07:56:49 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	bcf7e673c9
						 | 
						
							
							
								
								
								Issue 1924: New configuration value for permitting crawler access
							
							
							
							
							
						 | 
						
							2015-12-06 22:01:20 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	d808888429
						 | 
						
							
							
								
								
								added some lines to the htconfig config variables
							
							
							
							
							
						 | 
						
							2015-10-07 09:38:47 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	c49a1b1f8d
						 | 
						
							
							
								
								
								Added explanation how to add a parameter to the .htconfig.pgp
							
							
							
							
							
						 | 
						
							2015-10-04 17:37:08 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	fd80e75693
						 | 
						
							
							
								
								
								Documentation of .htconfig.php values
							
							
							
							
							
						 | 
						
							2015-10-04 12:02:44 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |