6f7510550d  
						 
						
							
							
								
								
								NETWORK_MAIL2 was never finished, so remove it as well  
							
							 
							
							
							
						 
						
							2017-12-03 09:19:58 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Adam Magness 
								
							 
						 
						
							
							
								
							
							
	4ca68c7af0  
						 
						
							
							
								
								
								Class file relocations  
							
							 
							
							... 
							
							
							
							Issue #3878  
							
						 
						
							2017-11-08 08:37:03 -05:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Adam Magness 
								
							 
						 
						
							
							
								
							
							
	6189f6c8e7  
						 
						
							
							
								
								
								Relocate class files from /include to /src/  
							
							 
							
							... 
							
							
							
							dbm, Diaspora, dfrn, and NotificationsManager moved to namespace. Includes and references in files updated. 
							
						 
						
							2017-11-08 08:36:48 -05:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	f2d51737eb  
						 
						
							
							
								
								
								fix some HTML violations in frio  
							
							 
							
							
							
						 
						
							2017-10-20 15:21:42 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	fce72cbbc8  
						 
						
							
							
								
								
								Modifed "update" and "insert" function / many changed queries  
							
							 
							
							
							
						 
						
							2017-08-09 21:12:41 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	9c0d2c31e8  
						 
						
							
							
								
								
								Replace AND and OR in PHP conditions by && and ||  
							
							 
							
							
							
						 
						
							2017-06-07 22:00:59 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Roland Häder 
								
							 
						 
						
							
							
								
							
							
	b9d8587f41  
						 
						
							
							
								
								
								Merge branch 'develop' into rewrites/coding-convention-split2-1-2  
							
							 
							
							
							
						 
						
							2017-04-19 23:06:01 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Jens Tautenhahn 
								
							 
						 
						
							
							
								
							
							
	a8c20013c4  
						 
						
							
							
								
								
								displays the correct profile for contacts that have set the default profile  
							
							 
							
							
							
						 
						
							2017-04-19 20:25:25 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	03571f6e74 
 
						 
						
							
							
								
								
								added spaces + some curly braces + some usage of dbm::is_result()  
							
							 
							
							... 
							
							
							
							Signed-off-by: Roland Haeder <roland@mxchange.org> 
							
						 
						
							2017-04-04 19:46:56 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	94f3f0887b  
						 
						
							
							
								
								
								Issue 2957: The avatar problem with mastodon should now finally be solved  
							
							 
							
							
							
						 
						
							2017-04-02 12:37:22 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	54f49169d4  
						 
						
							
							
								
								
								Show real platform names  
							
							 
							
							
							
						 
						
							2017-04-02 07:53:55 +00:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Hypolite Petovan 
								
							 
						 
						
							
							
								
							
							
	7b352f3f74  
						 
						
							
							
								
								
								Revert "Coding convention applied - part 1"  
							
							 
							
							
							
						 
						
							2017-03-21 12:02:59 -04:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	
	
	951006dd10 
 
						 
						
							
							
								
								
								more spaces + some curly spaces added  
							
							 
							
							... 
							
							
							
							Signed-off-by: Roland Häder <roland@mxchange.org> 
							
						 
						
							2017-03-19 00:51:54 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	275a1c6574  
						 
						
							
							
								
								
								Preparation to add the social network "pnut"  
							
							 
							
							
							
						 
						
							2017-02-02 06:06:23 +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  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
						 
						
							
							
								
							
							
	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  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									rabuzarus 
								
							 
						 
						
							
							
								
							
							
	768d10536f  
						 
						
							
							
								
								
								frio: templates for contact_edit and crepair  
							
							 
							
							
							
						 
						
							2016-07-26 09:09:40 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	9ae2b2292f  
						 
						
							
							
								
								
								Some more function calls changed to the new class  
							
							 
							
							
							
						 
						
							2016-03-14 08:11:14 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	21fc3c60d4  
						 
						
							
							
								
								
								We now show the correct platform (redmatrix or hubzilla)  
							
							 
							
							
							
						 
						
							2016-02-14 15:05:43 +01:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	a11833e248  
						 
						
							
							
								
								
								Statusnet is now GNU Social  
							
							 
							
							
							
						 
						
							2015-10-24 20:44:18 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	fca8aecc9b  
						 
						
							
							
								
								
								Show "Redmatrix" as network name.  
							
							 
							
							
							
						 
						
							2015-07-16 10:09:59 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	a41cc6f45f  
						 
						
							
							
								
								
								Added app.net  
							
							 
							
							
							
						 
						
							2014-06-05 17:44:35 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	77986d76fa  
						 
						
							
							
								
								
								Preparations for statusnet connector import  
							
							 
							
							
							
						 
						
							2014-04-04 10:40:46 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	59b64ece25  
						 
						
							
							
								
								
								Preparations for the upcoming bidirectional twitter sync.  
							
							 
							
							
							
						 
						
							2013-10-12 08:29:39 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Michael Vogel 
								
							 
						 
						
							
							
								
							
							
	34e7206ba4  
						 
						
							
							
								
								
								Preparations for the pumpio synchronisation.  
							
							 
							
							
							
						 
						
							2013-08-28 08:56:48 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Zach Prezkuta 
								
							 
						 
						
							
							
								
							
							
	94204d9160  
						 
						
							
							
								
								
								implement features  
							
							 
							
							
							
						 
						
							2012-11-22 09:14:22 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Alexander Kampmann 
								
							 
						 
						
							
							
								
							
							
	355c42cb30  
						 
						
							
							
								
								
								Merge branch 'master' of  https://github.com/friendica/friendica  
							
							 
							
							... 
							
							
							
							Conflicts:
	include/config.php
	update.php 
							
						 
						
							2012-04-05 13:39:15 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	8aa2552372  
						 
						
							
							
								
								
								add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit)  
							
							 
							
							
							
						 
						
							2012-01-18 16:21:30 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	df0f7ef560  
						 
						
							
							
								
								
								make network_to_name extensible  
							
							 
							
							
							
						 
						
							2012-01-08 02:08:20 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									friendica 
								
							 
						 
						
							
							
								
							
							
	358b2a46f5  
						 
						
							
							
								
								
								fix photo top view in testbubble, extend network_to_name  
							
							 
							
							
							
						 
						
							2012-01-07 13:00:06 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	20ca93191f  
						 
						
							
							
								
								
								cleanup and loose ends  
							
							 
							
							
							
						 
						
							2011-11-08 16:54:32 -08:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	99ea045723  
						 
						
							
							
								
								
								some minor work on contact edit page  
							
							 
							
							
							
						 
						
							2011-08-25 18:12:42 -07:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Friendika 
								
							 
						 
						
							
							
								
							
							
	5d47417711  
						 
						
							
							
								
								
								more view cleanup  
							
							 
							
							
							
						 
						
							2010-11-15 21:06:44 -08:00