0548099f6c  
						 
						
							
							
								
								
								The config class now makes less database reads.  
							
							 
							
							
							
						 
						
							2017-01-18 21:45:32 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	65226778fe  
						 
						
							
							
								
								
								More standards  
							
							 
							
							
							
						 
						
							2017-01-09 06:40:56 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	fc60e7f5dd  
						 
						
							
							
								
								
								Making Hypolite smile  
							
							 
							
							
							
						 
						
							2017-01-08 22:29:55 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	906c7d528b  
						 
						
							
							
								
								
								Bugfix: Answers to OStatus posts should never reach Diaspora  
							
							 
							
							
							
						 
						
							2017-01-08 20:35:41 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	ad20c5504d  
						 
						
							
							
								
								
								Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static  
							
							 
							
							... 
							
							
							
							Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
	include/diaspora.php
	object/Item.php 
							
						 
						
							2016-12-22 11:33:00 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	6c0c9d542a 
 
						 
						
							
							
								
								
								Continued with coding convention:  
							
							 
							
							... 
							
							
							
							- added curly braces around conditional code blocks
- added space between if/foreach/... and brace
- rewrote a code block so if dbm::is_result() fails it will abort, else the id
  is fetched from INSERT statement
- 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:16:49 +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  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	d72673b162  
						 
						
							
							
								
								
								Only distribute items to active contacts  
							
							 
							
							
							
						 
						
							2016-12-20 16:02:39 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	c1193c9c13  
						 
						
							
							
								
								
								Merge pull request  #3034  from annando/1612-no-archive  
							
							 
							
							... 
							
							
							
							Only distribute items to active contacts 
							
						 
						
							2016-12-20 15:42:41 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	f3529e7dbc  
						 
						
							
							
								
								
								added spaces + curly braces  
							
							 
							
							... 
							
							
							
							Signed-off-by: Roland Häder <roland@mxchange.org> 
							
						 
						
							2016-12-20 11:36:27 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	abff6372dd  
						 
						
							
							
								
								
								Coding convention applied:  
							
							 
							
							... 
							
							
							
							- space between "if" and brace
- curly braces on conditional blocks
Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
	include/lock.php 
							
						 
						
							2016-12-20 10:12:31 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	4c77ae2fe9  
						 
						
							
							
								
								
								Only distribute items to active contacts  
							
							 
							
							
							
						 
						
							2016-12-20 07:13:22 +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  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	307df4ee5c  
						 
						
							
							
								
								
								Also removed this, seems to come in from wrong merging?  #3010  Thanks to @annando  
							
							 
							
							... 
							
							
							
							Signed-off-by: Roland Häder <roland@mxchange.org> 
							
						 
						
							2016-12-14 16:41:23 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	b21a1437f4  
						 
						
							
							
								
								
								Also removed this, seems to come in from wrong merging?  #3010  Thanks to @annando  
							
							 
							
							... 
							
							
							
							Signed-off-by: Roland Häder <roland@mxchange.org> 
							
						 
						
							2016-12-14 16:39:39 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	b5776ab959  
						 
						
							
							
								
								
								Fixes for  #3010 :  
							
							 
							
							... 
							
							
							
							- used static call, still App::get_baseurl() wraps it into an object-referencing
  call which seems to be a bit redundant?
- added spaces around dot (see one line below)
Signed-off-by: Roland Häder <roland@mxchange.org> 
							
						 
						
							2016-12-14 09:49:52 +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  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	63610c7b73  
						 
						
							
							
								
								
								Merge branch 'rewrites/dbm_is_result' of github.com:Quix0r/friendica into rewrites/dbm_is_result  
							
							 
							
							... 
							
							
							
							Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
	include/Photo.php
	include/api.php
	include/cache.php
	include/dbstructure.php
	include/enotify.php
	include/items.php
	include/onepoll.php
	include/queue_fn.php
	include/session.php
	include/text.php
	mod/contacts.php
	mod/dfrn_request.php
	mod/display.php
	mod/events.php
	mod/item.php
	mod/message.php
	mod/msearch.php
	mod/photos.php
	mod/poco.php
	mod/profile.php
	mod/proxy.php
	mod/videos.php
	update.php
	view/theme/diabook/theme.php
	view/theme/vier/theme.php 
							
						 
						
							2016-12-13 11:00:44 +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  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	7bd79c67a7  
						 
						
							
							
								
								
								Avoiding deadlocks and small sql improvements  
							
							 
							
							
							
						 
						
							2016-10-29 20:17:33 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	d632d282cd  
						 
						
							
							
								
								
								We are now having an account type and are publishing it  
							
							 
							
							
							
						 
						
							2016-09-25 20:37:27 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	c825cc8d0d 
 
						 
						
							
							
								
								
								This merge brings back dbm::is_result() where I could find it.  
							
							 
							
							... 
							
							
							
							Merge branch 'develop' of github.com:friendica/friendica into rhaeder-develop
Signed-off-by: Roland Haeder <roland@mxchange.org> 
							
						 
						
							2016-09-18 23:21:18 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	dad74e9650  
						 
						
							
							
								
								
								pubsubpublish is now split into separate calls per entry.  
							
							 
							
							
							
						 
						
							2016-08-04 15:15:43 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	668da905e2  
						 
						
							
							
								
								
								"proc_run" is now called with priority.  
							
							 
							
							
							
						 
						
							2016-08-01 07:48:43 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	84aa01b377  
						 
						
							
							
								
								
								Bugfix: Diaspora connects to a Soapbox account weren't established correctly  
							
							 
							
							
							
						 
						
							2016-07-10 12:09:58 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	2d72e2d932  
						 
						
							
							
								
								
								Diaspora: Support for new fetch functionality (replacement for /p/)  
							
							 
							
							
							
						 
						
							2016-06-29 22:50:30 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	0b1188b7fe  
						 
						
							
							
								
								
								Imrpoved avatar handling when storing them/partly use of "micro"  
							
							 
							
							
							
						 
						
							2016-06-25 13:56:55 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	6434b5d8ce  
						 
						
							
							
								
								
								Support for comments for the Diaspora relay system  
							
							 
							
							
							
						 
						
							2016-05-13 22:19:31 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	3e701b90ac 
 
						 
						
							
							
								
								
								Continued rewriting:  
							
							 
							
							... 
							
							
							
							- use dba::is_result() everywhere (where I found the old, bad way)
- converted some spaces -> tabs for code
- converted some CRLF -> LF as mixures of both is not good
Signed-off-by: Roland Haeder <roland@mxchange.org> 
							
						 
						
							2016-05-01 14:24:44 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	
	
	5e1652922d 
 
						 
						
							
							
								
								
								OStatus: Salmon now works with "likes"/The alias is stored now as well  
							
							 
							
							
							
						 
						
							2016-05-01 13:47:24 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	
	
	f2ce7f51cd 
 
						 
						
							
							
								
								
								New OStatus implementation  
							
							 
							
							
							
						 
						
							2016-05-01 13:47:24 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	
	
	22c889c319 
 
						 
						
							
							
								
								
								Retraction do work as well  
							
							 
							
							
							
						 
						
							2016-05-01 13:46:08 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	
	
	3e79a19e57 
 
						 
						
							
							
								
								
								Some more function calls changed to the new class  
							
							 
							
							
							
						 
						
							2016-05-01 13:46:08 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	08fb662b4a  
						 
						
							
							
								
								
								OStatus: Salmon now works with "likes"/The alias is stored now as well  
							
							 
							
							
							
						 
						
							2016-04-02 00:24:56 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	b93e1d73a1  
						 
						
							
							
								
								
								New OStatus implementation  
							
							 
							
							
							
						 
						
							2016-03-30 12:43:15 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	16b92af71f  
						 
						
							
							
								
								
								Retraction do work as well  
							
							 
							
							
							
						 
						
							2016-03-17 12:24:23 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	9ae2b2292f  
						 
						
							
							
								
								
								Some more function calls changed to the new class  
							
							 
							
							
							
						 
						
							2016-03-14 08:11:14 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Fabrixxm 
								
							 
						 
						
							
							
								
							
							
	7e83ba090f  
						 
						
							
							
								
								
								Merge branch 'hotfix_diaspora' into develop  
							
							 
							
							
							
						 
						
							2016-01-20 08:50:18 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	c6b0e57aa4  
						 
						
							
							
								
								
								Bugfix: Comments weren't relayed anymore to Diaspora due to a Diaspora change  
							
							 
							
							
							
						 
						
							2016-01-20 08:40:04 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	6c3d0f82c2  
						 
						
							
							
								
								
								Bugfix: The duplicate check for likes wasn't reliable  
							
							 
							
							
							
						 
						
							2016-01-03 00:17:28 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	38ee2def5d  
						 
						
							
							
								
								
								Don't send messages to contacts that are archived  
							
							 
							
							
							
						 
						
							2016-01-01 13:05:05 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	8d8dc2d060  
						 
						
							
							
								
								
								Merge pull request  #2197  from annando/1512-ostatus-comment  
							
							 
							
							... 
							
							
							
							Reworked delivery and notifier process - changed OStatus behaviour 
							
						 
						
							2015-12-27 15:58:32 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	3df5c17124  
						 
						
							
							
								
								
								reformat todo according to doxygen style  
							
							 
							
							
							
						 
						
							2015-12-25 23:17:34 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	b9abfd24f0  
						 
						
							
							
								
								
								Rearrangements  
							
							 
							
							
							
						 
						
							2015-12-14 22:39:52 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	a1a7bce603  
						 
						
							
							
								
								
								Completely reworked delivery process.  
							
							 
							
							
							
						 
						
							2015-12-14 00:39:20 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	15063c8d5b  
						 
						
							
							
								
								
								Code cleanup and first steps for a better comment distribition with DFRN and OStatus  
							
							 
							
							
							
						 
						
							2015-12-13 12:15:45 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	bfc0857953  
						 
						
							
							
								
								
								OStatus: Send even Friendica comments to OStatus  
							
							 
							
							
							
						 
						
							2015-12-07 21:52:42 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	7d7e2e74f4  
						 
						
							
							
								
								
								The generated XML is now valid and it seems to work.  
							
							 
							
							
							
						 
						
							2015-11-23 23:49:14 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	75f1a17f7e  
						 
						
							
							
								
								
								New function for creating the OStatus messages  
							
							 
							
							
							
						 
						
							2015-11-23 18:44:47 +01:00