Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	4931ecafbb  
						 
						
							
							
								
								
								Rewriting of do_like()  
							
							... 
							
							
							
							- Fix behavior where event actions had to be performed twice to switch
from one to another
- Simplify the contact data retrieval
- Make sure contact-id, owner-id and author-id are correctly set 
							
						 
						
							2017-03-06 05:28:01 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	97c507e763 
 
						 
						
							
							
								
								
								Coding convention applied:  
							
							... 
							
							
							
							- space between "if" and brace
- curly braces on conditional blocks
Signed-off-by: Roland Häder <roland@mxchange.org> 
							
						 
						
							2016-12-23 19:49:15 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	c0df692f5f  
						 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/develop' into develop  
							
							... 
							
							
							
							Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
	include/diaspora.php
	object/Item.php 
							
						 
						
							2016-12-22 11:29:56 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	d242e72c65  
						 
						
							
							
								
								
								applied coding convention rule  
							
							... 
							
							
							
							Signed-off-by: Roland Häder <roland@mxchange.org> 
							
						 
						
							2016-12-22 09:09:27 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	536f078ed4 
 
						 
						
							
							
								
								
								Continued with coding convention:  
							
							... 
							
							
							
							- added curly braces around conditional code blocks
- added space between if/foreach/... and brace
- made some SQL keywords upper-cased and added back-ticks to columns/table names
Signed-off-by: Roland Haeder <roland@mxchange.org> 
							
						 
						
							2016-12-20 21:31:05 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	e8e1f9253d  
						 
						
							
							
								
								
								Merge remote-tracking branch 'friendica/develop' into bug/fix-diaspora-people-links  
							
							... 
							
							
							
							# Conflicts:
#	include/follow.php 
							
						 
						
							2016-12-20 12:50:36 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	4a7c3b9eef  
						 
						
							
							
								
								
								Diaspora: Fix class name case + add self  
							
							
							
						 
						
							2016-12-20 12:44:15 -05:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	b9e4b9f274  
						 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/develop' into develop  
							
							... 
							
							
							
							Changes in #3034  were somehow conflicting. :-(
Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
	include/like.php
	mod/photos.php
	mod/subthread.php 
							
						 
						
							2016-12-20 15:44:31 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	cc16369b6f  
						 
						
							
							
								
								
								Merge pull request  #3033  from annando/1612-object-type  
							
							... 
							
							
							
							The object type "photo" is deprecated and was replaced by "image" 
							
						 
						
							2016-12-20 15:44:07 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	fb676335db  
						 
						
							
							
								
								
								Coding convention applied:  
							
							... 
							
							
							
							- space between "if" and brace
- curly braces on conditional blocks
Signed-off-by: Roland Häder <roland@mxchange.org> 
							
						 
						
							2016-12-20 10:10:33 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	6e46987515  
						 
						
							
							
								
								
								The object type "photo" is deprecated and was replaced by "image"  
							
							
							
						 
						
							2016-12-20 07:10:47 +00:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	884f44ce94  
						 
						
							
							
								
								
								*much* more usage of App::get_baseurl() instead of $a->get_baseurl() (coding convention applied)  
							
							... 
							
							
							
							Signed-off-by: Roland Häder <roland@mxchange.org> 
							
						 
						
							2016-12-19 14:27:16 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	a905522eb5  
						 
						
							
							
								
								
								Cleanup for  #3010  - added spaces, thanks to @annando .  
							
							... 
							
							
							
							Signed-off-by: Roland Häder <roland@mxchange.org> 
							
						 
						
							2016-12-14 09:42:36 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	6a8a36f12d  
						 
						
							
							
								
								
								More usage of dbm::is_result($r) instead of count($r):  
							
							... 
							
							
							
							- count() returns very different results and never a boolean (not even false on
  error condition).
- therefore you should NOT use it in boolean expressions. This still *can* be
  done in PHP because of its lazyness. But it is discouraged if it comes to
  more clean code.
Signed-off-by: Roland Häder <roland@mxchange.org> 
							
						 
						
							2016-12-13 10:44:13 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	668da905e2  
						 
						
							
							
								
								
								"proc_run" is now called with priority.  
							
							
							
						 
						
							2016-08-01 07:48:43 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	7be1c83b0c  
						 
						
							
							
								
								
								photo.php: correct misspelling of an array key  
							
							
							
						 
						
							2016-05-15 02:37:18 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	206c26ae30  
						 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/develop' into 1602-diaspora  
							
							
							
						 
						
							2016-03-21 06:47:47 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	8f00836ffb  
						 
						
							
							
								
								
								Add the guid to items that we create locally  
							
							
							
						 
						
							2016-03-20 15:01:50 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	d676ae0f32  
						 
						
							
							
								
								
								The signature creation now moved into the Diaspora class. That's much cleaner.  
							
							
							
						 
						
							2016-03-19 15:49:47 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	16b92af71f  
						 
						
							
							
								
								
								Retraction do work as well  
							
							
							
						 
						
							2016-03-17 12:24:23 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	e1bc0b4ff8  
						 
						
							
							
								
								
								Likes are now federated again through Diaspora  
							
							
							
						 
						
							2016-01-21 16:01:46 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									fabrixxm 
								
							 
						 
						
							
							
								
							
							
	835ad28d83  
						 
						
							
							
								
								
								do_like() return false if verb is invalid  
							
							
							
						 
						
							2015-12-28 10:23:06 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									fabrixxm 
								
							 
						 
						
							
							
								
							
							
	f27fad7b47  
						 
						
							
							
								
								
								Move Like/Dislike/Attend add/remove code to include/like.php  
							
							
							
						 
						
							2015-12-28 10:23:06 +01:00