| 
							
						 | 
						
							
							
								
							
							
	1e2bc1e6cf
						 | 
						
							
							
								
								
								Ensure local delivery of Diaspora comments
							
							
							
							
							
						 | 
						
							2018-04-27 04:11:33 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	e3c9d31088
						 | 
						
							
							
								
								
								Added header
							
							
							
							
							
						 | 
						
							2018-04-27 03:08:13 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	488c6c9b68
						 | 
						
							
							
								
								
								Constants moved
							
							
							
							
							
						 | 
						
							2018-04-27 02:52:12 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	66e34b9357
						 | 
						
							
							
								
								
								Improvements
							
							
							
							
							
						 | 
						
							2018-04-26 22:30:43 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	8c23fea1df
						 | 
						
							
							
								
								
								Added some explanation, beautified code
							
							
							
							
							
						 | 
						
							2018-04-26 21:16:16 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	a785d8c2f9
						 | 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/develop' into reworked-delivery
							
							
							
							
							
						 | 
						
							2018-04-26 20:42:57 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	4957ab8fbb
						 | 
						
							
							
								
								
								Avoid PHP warning with a missing key
							
							
							
							
							
						 | 
						
							2018-04-26 20:41:06 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hypolite Petovan
								
							 
						 | 
						
							
							
								
							
							
	
	
	33a551235e
						 | 
						
							
							
								
								
								Merge pull request #4934 from annando/distribute-precaution
							
							
							
							
							
							
							
							Item distribution: Better don't store these values 
							
						 | 
						
							2018-04-26 16:26:23 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	4a792761d1
						 | 
						
							
							
								
								
								Item distribution: Better don't store these values
							
							
							
							
							
						 | 
						
							2018-04-26 20:11:29 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hypolite Petovan
								
							 
						 | 
						
							
							
								
							
							
	
	
	9e700ba6ea
						 | 
						
							
							
								
								
								Merge pull request #4933 from annando/bugfix-distribute
							
							
							
							
							
							
							
							Bugfix: The Distribition of public items failed with comments 
							
						 | 
						
							2018-04-26 16:02:56 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	da3658c80d
						 | 
						
							
							
								
								
								Bugfix: The Distribition of public items failed with comments# Bitte geben Sie eine Commit-Beschreibung für Ihre Änderungen ein. Zeilen,
							
							
							
							
							
						 | 
						
							2018-04-26 19:47:12 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	
	
	eae86951f5
						 | 
						
							
							
								
								
								Merge pull request #4932 from MrPetovan/bug/4928-fix-php-72-warning-profile
							
							
							
							
							
							
							
							Fix PHP 7.2 warning in Model\Profile 
							
						 | 
						
							2018-04-26 16:36:19 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hypolite Petovan
								
							 
						 | 
						
							
							
								
							
							
	f7f640175a
						 | 
						
							
							
								
								
								Fix PHP 7.2 warning in Model\Profile
							
							
							
							
							
						 | 
						
							2018-04-26 04:56:42 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	a0c5a84ce8
						 | 
						
							
							
								
								
								Better way to fetch items
							
							
							
							
							
						 | 
						
							2018-04-26 07:11:18 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	b70b020490
						 | 
						
							
							
								
								
								Unneeded stuff removed, only fetch needed records
							
							
							
							
							
						 | 
						
							2018-04-26 06:23:01 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	71d4c6e4a0
						 | 
						
							
							
								
								
								Cleaned up
							
							
							
							
							
						 | 
						
							2018-04-26 05:45:05 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	c437dac3a0
						 | 
						
							
							
								
								
								Delivery to non followers
							
							
							
							
							
						 | 
						
							2018-04-25 21:55:24 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	3abd0b54cc
						 | 
						
							
							
								
								
								Reworked delivery
							
							
							
							
							
						 | 
						
							2018-04-25 21:18:21 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hypolite Petovan
								
							 
						 | 
						
							
							
								
							
							
	
	
	a9f1f47be2
						 | 
						
							
							
								
								
								Merge pull request #4931 from annando/no-ignored
							
							
							
							
							
							
							
							Don't distribute for ignored contacts 
							
						 | 
						
							2018-04-25 12:07:00 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	66547e5107
						 | 
						
							
							
								
								
								Don't distribute for ignored contacts
							
							
							
							
							
						 | 
						
							2018-04-25 16:00:21 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hypolite Petovan
								
							 
						 | 
						
							
							
								
							
							
	
	
	801a13aa10
						 | 
						
							
							
								
								
								Merge pull request #4915 from M-arcus/patch-4
							
							
							
							
							
							
							
							[DOCS] Docs: Minor improvements 
							
						 | 
						
							2018-04-25 08:06:04 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marcus Müller
								
							 
						 | 
						
							
							
								
							
							
	ce52f40bdc
						 | 
						
							
							
								
								
								[DOCS] Fix intendation
							
							
							
							
							
						 | 
						
							2018-04-25 11:29:56 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hypolite Petovan
								
							 
						 | 
						
							
							
								
							
							
	
	
	d49df631fb
						 | 
						
							
							
								
								
								Merge pull request #4929 from annando/diaspora-rework
							
							
							
							
							
							
							
							Improvements for the Diaspora protocol 
							
						 | 
						
							2018-04-24 14:56:35 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	ad45a73bf3
						 | 
						
							
							
								
								
								Improvements for the Diaspora protocol
							
							
							
							
							
						 | 
						
							2018-04-24 18:34:35 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hypolite Petovan
								
							 
						 | 
						
							
							
								
							
							
	
	
	c8cc8e57c2
						 | 
						
							
							
								
								
								Merge pull request #4925 from rabuzarus/20180424_-_frio_invite_template
							
							
							
							
							
							
							
							frio - provide a template for invite page 
							
						 | 
						
							2018-04-24 11:37:10 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rabuzarus
								
							 
						 | 
						
							
							
								
							
							
	ac753e3320
						 | 
						
							
							
								
								
								frio - provide a template for invite page
							
							
							
							
							
						 | 
						
							2018-04-24 17:33:48 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hypolite Petovan
								
							 
						 | 
						
							
							
								
							
							
	
	
	8d8aef5624
						 | 
						
							
							
								
								
								Merge pull request #4924 from annando/item-distribution
							
							
							
							
							
							
							
							Item distribution is now done via the public post 
							
						 | 
						
							2018-04-24 11:00:14 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	5019d46071
						 | 
						
							
							
								
								
								We only need the uid
							
							
							
							
							
						 | 
						
							2018-04-24 14:58:39 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	5cf745af44
						 | 
						
							
							
								
								
								Item distribution is now done via the public post
							
							
							
							
							
						 | 
						
							2018-04-24 13:21:25 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marcus Müller
								
							 
						 | 
						
							
							
								
							
							
	008f2a2ec7
						 | 
						
							
							
								
								
								[DOCS] Hooks: Add hooks intendation to german docs
							
							
							
							
							
						 | 
						
							2018-04-24 13:25:06 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marcus Müller
								
							 
						 | 
						
							
							
								
							
							
	7ac4b17c80
						 | 
						
							
							
								
								
								[DOCS] Hooks: Add empty line
							
							
							
							
							
						 | 
						
							2018-04-24 13:21:16 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marcus Müller
								
							 
						 | 
						
							
							
								
							
							
	81d636d05d
						 | 
						
							
							
								
								
								[DOCS] Titles: Fix spaces
							
							
							
							
							
						 | 
						
							2018-04-24 13:20:44 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	
	
	1f48373c51
						 | 
						
							
							
								
								
								Merge pull request #4922 from tobiasd/20180424-lng
							
							
							
							
							
							
							
							update FI translations THX Kris 
							
						 | 
						
							2018-04-24 10:03:04 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	c458a12135
						 | 
						
							
							
								
								
								update FI translations THX Kris
							
							
							
							
							
						 | 
						
							2018-04-24 07:58:31 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	7230cc0bed
						 | 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/develop' into item-distribution
							
							
							
							
							
						 | 
						
							2018-04-24 04:23:38 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	
	
	e51a017d92
						 | 
						
							
							
								
								
								Merge pull request #4917 from annando/show-private-forums
							
							
							
							
							
							
							
							Show private forums in the sidebar 
							
						 | 
						
							2018-04-23 18:47:21 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	c3ee596ff4
						 | 
						
							
							
								
								
								Show private forums in the sidebar
							
							
							
							
							
						 | 
						
							2018-04-23 16:41:00 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marcus Müller
								
							 
						 | 
						
							
							
								
							
							
	
	
	efdb7a3835
						 | 
						
							
							
								
								
								[DOCS] Addons: Restructure hooks
							
							
							
							
							
						 | 
						
							2018-04-23 17:20:16 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hypolite Petovan
								
							 
						 | 
						
							
							
								
							
							
	
	
	a66e9b81ba
						 | 
						
							
							
								
								
								Merge pull request #4873 from astifter/develop
							
							
							
							
							
							
							
							Remove pagination when empty, move new Member Tips and use common widget to find people. 
							
						 | 
						
							2018-04-23 10:23:21 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hypolite Petovan
								
							 
						 | 
						
							
							
								
							
							
	
	
	2f024a3a6d
						 | 
						
							
							
								
								
								Merge pull request #4913 from tobiasd/20180423-phpunit
							
							
							
							
							
							
							
							phpunit compat 5.6 vs 7.x 
							
						 | 
						
							2018-04-23 08:00:13 -04:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	
	
	2f6a898b62
						 | 
						
							
							
								
								
								Merge pull request #4916 from M-arcus/patch-5
							
							
							
							
							
							
							
							[DOCS] Installation: Fix small errors 
							
						 | 
						
							2018-04-23 13:49:24 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	ba35b19af6
						 | 
						
							
							
								
								
								Public federated items now always are having an entry with "uid=0"
							
							
							
							
							
						 | 
						
							2018-04-23 11:14:25 +00:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marcus Müller
								
							 
						 | 
						
							
							
								
							
							
	
	
	78a974ad41
						 | 
						
							
							
								
								
								[DOCS] Installation: Fix multiple sentences
							
							
							
							
							
						 | 
						
							2018-04-23 12:24:47 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marcus Müller
								
							 
						 | 
						
							
							
								
							
							
	
	
	70d11d377b
						 | 
						
							
							
								
								
								[DOCS] Installation: Fix title
							
							
							
							
							
						 | 
						
							2018-04-23 12:22:39 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	
	
	c66c09d5fd
						 | 
						
							
							
								
								
								Merge pull request #4914 from AndyHee/doc20180423
							
							
							
							
							
							
							
							Update Profiles.md 
							
						 | 
						
							2018-04-23 12:03:28 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marcus Müller
								
							 
						 | 
						
							
							
								
							
							
	
	
	6599898774
						 | 
						
							
							
								
								
								[DOCS] Account docs: Fix titles
							
							
							
							
							
						 | 
						
							2018-04-23 11:45:44 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	
	
	3ac43f73c3
						 | 
						
							
							
								
								
								Update Profiles.md
							
							
							
							
							
						 | 
						
							2018-04-23 16:43:52 +07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	bcc298204e
						 | 
						
							
							
								
								
								use strlen instead of count(php7.2 fails)
							
							
							
							
							
						 | 
						
							2018-04-23 09:37:56 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	6e313736f4
						 | 
						
							
							
								
								
								remove comment
							
							
							
							
							
						 | 
						
							2018-04-23 09:37:06 +02:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	f1535c0f01
						 | 
						
							
							
								
								
								use strlen instead of count as above (php7.2 fails)
							
							
							
							
							
						 | 
						
							2018-04-23 09:35:12 +02:00 | 
						
						
							
							
							
							
								
							
							
						 |