| 
							
						 | 
						
							
							
								
							
							
	08b69892e8
						 | 
						
							
							
								
								
								Merge pull request #2408 from annando/1603-goaway
							
							
							
							
							
							
							
							Another fix for "goaway". Hopefully now finale. 
							
						 | 
						
							2016-03-12 07:29:32 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	02d14eafda
						 | 
						
							
							
								
								
								Merge pull request #2407 from annando/1603-optimize-table
							
							
							
							
							
							
							
							The table optimisation level calculation is now also using the index size 
							
						 | 
						
							2016-03-12 07:28:44 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	3189f0e23c
						 | 
						
							
							
								
								
								Another fix for "goaway". Hopefully now finale.
							
							
							
							
							
						 | 
						
							2016-03-11 20:43:31 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	2718c8150f
						 | 
						
							
							
								
								
								The table optimisation level calculation is now using the index size as well
							
							
							
							
							
						 | 
						
							2016-03-11 20:32:22 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	a28d44a9ba
						 | 
						
							
							
								
								
								Merge pull request #2405 from annando/1603-ostatus4-bugfix
							
							
							
							
							
							
							
							Bugfix: A parameter was missing for the OStatus author check 
							
						 | 
						
							2016-03-10 06:08:30 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	df312402e4
						 | 
						
							
							
								
								
								Bugfix: A parameter was missing for the OStatus author check
							
							
							
							
							
						 | 
						
							2016-03-09 22:51:17 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	60a01242ea
						 | 
						
							
							
								
								
								Merge pull request #2404 from annando/1603-no-lock
							
							
							
							
							
							
							
							Don't create lock files if the process is called from the poller 
							
						 | 
						
							2016-03-09 22:08:41 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	c0bd7a866d
						 | 
						
							
							
								
								
								Some small addition to the OStatus part. Better check if we follow the actor.
							
							
							
							
							
						 | 
						
							2016-03-09 21:53:30 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	c30b369a1a
						 | 
						
							
							
								
								
								Added documentation
							
							
							
							
							
						 | 
						
							2016-03-08 22:42:37 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	65d6d45f8c
						 | 
						
							
							
								
								
								Changed parameter order
							
							
							
							
							
						 | 
						
							2016-03-08 22:28:49 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	beb2346cfc
						 | 
						
							
							
								
								
								The function to check for maxload and the lockfile is centralized
							
							
							
							
							
						 | 
						
							2016-03-08 20:28:09 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	ec9c9f0be7
						 | 
						
							
							
								
								
								Don't create lock files if the process is called from the poller via the worker
							
							
							
							
							
						 | 
						
							2016-03-08 00:20:06 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	fa652ad1bc
						 | 
						
							
							
								
								
								Merge pull request #2401 from annando/1603-ostatus-completion
							
							
							
							
							
							
							
							New way of fetching the conversation id for thread completion 
							
						 | 
						
							2016-03-06 21:13:05 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	4ef44c67b8
						 | 
						
							
							
								
								
								Added documentation
							
							
							
							
							
						 | 
						
							2016-03-06 21:06:52 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	27905cc21a
						 | 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/develop' into 1603-ostatus-completion
							
							
							
							
							
						 | 
						
							2016-03-06 20:37:51 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	ef2bc47cc6
						 | 
						
							
							
								
								
								New way of fetching the conversation id for thread completion
							
							
							
							
							
						 | 
						
							2016-03-06 20:36:28 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	d30d13959b
						 | 
						
							
							
								
								
								Merge pull request #2328 from rabuzarus/0602_contact_profile
							
							
							
							
							
							
							
							polishing of the contact-edit page 
							
						 | 
						
							2016-03-06 19:56:59 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	bdfd81e723
						 | 
						
							
							
								
								
								Merge pull request #2400 from annando/1603-ostatus-thread
							
							
							
							
							
							
							
							Only import OStatus threads that are started by our contacts 
							
						 | 
						
							2016-03-06 19:40:01 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	9579725d4d
						 | 
						
							
							
								
								
								This should work better ...
							
							
							
							
							
						 | 
						
							2016-03-06 19:27:34 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	279a0453f9
						 | 
						
							
							
								
								
								Or back ...
							
							
							
							
							
						 | 
						
							2016-03-06 15:13:19 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	7f48df63a3
						 | 
						
							
							
								
								
								Relocated the check.
							
							
							
							
							
						 | 
						
							2016-03-06 15:11:04 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	4bd1061a09
						 | 
						
							
							
								
								
								Only import OStatus threads if we follow the thread starter
							
							
							
							
							
						 | 
						
							2016-03-06 14:53:30 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	1127150c79
						 | 
						
							
							
								
								
								Merge pull request #2399 from annando/1603-default-group
							
							
							
							
							
							
							
							Central function for default group, special setting for OStatus 
							
						 | 
						
							2016-03-06 14:42:27 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	bb06026147
						 | 
						
							
							
								
								
								Settings for only importing threads from our ostatus contacts
							
							
							
							
							
						 | 
						
							2016-03-06 14:09:04 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	4ef33b4d5b
						 | 
						
							
							
								
								
								Clarification of description
							
							
							
							
							
						 | 
						
							2016-03-06 13:26:30 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	8752ec11b2
						 | 
						
							
							
								
								
								Central function for default group, special setting for OStatus
							
							
							
							
							
						 | 
						
							2016-03-06 13:15:27 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	6072e17a64
						 | 
						
							
							
								
								
								Merge pull request #2398 from annando/1603-fontawesome4
							
							
							
							
							
							
							
							The Font Awesome library is now updated, the reply button is changed 
							
						 | 
						
							2016-03-06 01:49:46 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	f05cbf9ed8
						 | 
						
							
							
								
								
								Merge pull request #2397 from Quix0r/fixes/poller-warning
							
							
							
							
							
							
							
							No processing if error or empty array 
							
						 | 
						
							2016-03-05 13:35:43 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	996cd8c24e
						 | 
						
							
							
								
								
								The Font Awesome library is now updated, the replxy button is changed
							
							
							
							
							
						 | 
						
							2016-03-05 13:29:01 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	
	
	d5c1ce490b
						 | 
						
							
							
								
								
								No processing if error or empty array
							
							
							
							
							
							
							
							Signed-off-by: Roland Haeder <roland@mxchange.org> 
							
						 | 
						
							2016-03-04 22:38:18 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	3184a6263b
						 | 
						
							
							
								
								
								Merge pull request #2392 from Quix0r/minor/logging
							
							
							
							
							
							
							
							Minor: Some more logging to trace down bugs 
							
						 | 
						
							2016-03-02 12:21:18 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	73f4c3c8da
						 | 
						
							
							
								
								
								Merge pull request #2394 from annando/1603-federation
							
							
							
							
							
							
							
							Small bugfix: Fixes problen when version number contains linebreaks 
							
						 | 
						
							2016-03-02 10:41:02 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	40209b2554
						 | 
						
							
							
								
								
								Merge pull request #2393 from annando/1603-api-speed
							
							
							
							
							
							
							
							API: Some small speed improvement when calling the home timeline. 
							
						 | 
						
							2016-03-02 10:40:23 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	411566f48b
						 | 
						
							
							
								
								
								API: Some small speed improvement when calling the home timeline.
							
							
							
							
							
						 | 
						
							2016-03-01 19:17:01 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	ce5f6fae51
						 | 
						
							
							
								
								
								Small bugfix: Fixes problen when version number contains linebreaks
							
							
							
							
							
						 | 
						
							2016-03-01 19:14:45 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	
	
	7d5166c9fe
						 | 
						
							
							
								
								
								Closed TODO: no .= needed here. #2392
							
							
							
							
							
							
							
							Signed-off-by: Roland Haeder <roland@mxchange.org> 
							
						 | 
						
							2016-03-01 18:28:06 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	04ccd9a776
						 | 
						
							
							
								
								
								Merge pull request #2388 from Quix0r/fixes/prevent-e_notice_boot_php
							
							
							
							
							
							
							
							Prevent some E_NOTICE 
							
						 | 
						
							2016-03-01 15:50:20 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	be3fa8f8b1
						 | 
						
							
							
								
								
								Merge pull request #2391 from Quix0r/fixes/http-security
							
							
							
							
							
							
							
							Missing exit() after header('Location: bla') is bad news
							
						 | 
						
							2016-03-01 15:33:31 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	11310aa93b
						 | 
						
							
							
								
								
								Merge pull request #2389 from Quix0r/rewrites/theme_info_array_init
							
							
							
							
							
							
							
							$a->theme_info = array() should be avoided 
							
						 | 
						
							2016-03-01 15:32:34 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	fd316fe720
						 | 
						
							
							
								
								
								Merge pull request #2387 from Quix0r/fixes/html-errors
							
							
							
							
							
							
							
							Some tags should not be self-closed 
							
						 | 
						
							2016-03-01 15:31:28 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	
	
	08abdfda68
						 | 
						
							
							
								
								
								<form> and <html> or <head> are not self-closing tags.
							
							
							
							
							
							
							
							Signed-off-by: Roland Haeder <roland@mxchange.org> 
							
						 | 
						
							2016-03-01 14:49:56 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	
	
	8616f0cc35
						 | 
						
							
							
								
								
								Don't miss to add exit() after header('Location: bla') as header() does *NOT*
							
							
							
							
							
							
							
							exit the script quickly enough. Always use an explicit exit() or you get real
trouble.
Signed-off-by: Roland Haeder <roland@mxchange.org> 
							
						 | 
						
							2016-03-01 14:49:07 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	
	
	76b042ddee
						 | 
						
							
							
								
								
								More logging in case of errors + logged network type + added TODO (for ugly E_NOTICE).
							
							
							
							
							
							
							
							Signed-off-by: Roland Haeder <roland@mxchange.org> 
							
						 | 
						
							2016-03-01 14:42:55 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	
	
	04eacb6470
						 | 
						
							
							
								
								
								Prevent some E_NOTICE in identity.php
							
							
							
							
							
							
							
							Signed-off-by: Roland Haeder <roland@mxchange.org> 
							
						 | 
						
							2016-03-01 14:36:23 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	
	
	f10d2afca0
						 | 
						
							
							
								
								
								Prevent some E_NOTICE in boot.php
							
							
							
							
							
							
							
							Signed-off-by: Roland Haeder <roland@mxchange.org> 
							
						 | 
						
							2016-03-01 14:32:19 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	
	
	04a7d6384e
						 | 
						
							
							
								
								
								No need to set $a->theme_info = array() everywhere if you can define it in App
							
							
							
							
							
							
							
							itself.
Signed-off-by: Roland Haeder <roland@mxchange.org> 
							
						 | 
						
							2016-03-01 14:27:38 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	066ddada17
						 | 
						
							
							
								
								
								Merge pull request #2386 from tobiasd/20160229-fedcolor
							
							
							
							
							
							
							
							adding some colors to the Federation Statistics page of the admin panel 
							
						 | 
						
							2016-02-29 19:03:31 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	09060c0ed3
						 | 
						
							
							
								
								
								adding some colors to the Federation Statistics page of the admin panel
							
							
							
							
							
						 | 
						
							2016-02-29 17:24:34 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	497c40e674
						 | 
						
							
							
								
								
								Merge pull request #2383 from tobiasd/20160225
							
							
							
							
							
							
							
							a missing break 
							
						 | 
						
							2016-02-29 11:11:54 +01:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	9847083e79
						 | 
						
							
							
								
								
								Merge pull request #2384 from tobiasd/20160228-api
							
							
							
							
							
							
							
							old location might vanish, vinzv moved the GS API docs over here 
							
						 | 
						
							2016-02-29 08:54:36 +01:00 | 
						
						
							
							
							
							
								
							
							
						 |